[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 4ae3337b44dfe483b5dfd803ab53070749038860
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 14 19:46:58 2002 +0000

    	Stop the insanity.  Make sure that a sheet that is disabled
    	while it is still loading is removed from the doc's list
    	of pending sheets (for FOUC checks).
    
    	Fixes zeldman.com.
    
            * khtml/html/html_headimpl.cpp:
            (HTMLLinkElementImpl::parseAttribute):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2316 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9915257..088346c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-10-14  David Hyatt  <hyatt at apple.com>
 
+	Stop the insanity.  Make sure that a sheet that is disabled
+	while it is still loading is removed from the doc's list
+	of pending sheets (for FOUC checks).
+
+	Fixes zeldman.com.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::parseAttribute):
+
+2002-10-14  David Hyatt  <hyatt at apple.com>
+
 	Implementing the ability to individually enable/disable
 	both preferred and alternate stylesheets.  Enabling/disabling
 	sheets via the disabled property of the <link> element overrides
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9915257..088346c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-10-14  David Hyatt  <hyatt at apple.com>
 
+	Stop the insanity.  Make sure that a sheet that is disabled
+	while it is still loading is removed from the doc's list
+	of pending sheets (for FOUC checks).
+
+	Fixes zeldman.com.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::parseAttribute):
+
+2002-10-14  David Hyatt  <hyatt at apple.com>
+
 	Implementing the ability to individually enable/disable
 	both preferred and alternate stylesheets.  Enabling/disabling
 	sheets via the disabled property of the <link> element overrides
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9915257..088346c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-10-14  David Hyatt  <hyatt at apple.com>
 
+	Stop the insanity.  Make sure that a sheet that is disabled
+	while it is still loading is removed from the doc's list
+	of pending sheets (for FOUC checks).
+
+	Fixes zeldman.com.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::parseAttribute):
+
+2002-10-14  David Hyatt  <hyatt at apple.com>
+
 	Implementing the ability to individually enable/disable
 	both preferred and alternate stylesheets.  Enabling/disabling
 	sheets via the disabled property of the <link> element overrides
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index 4878280..823df04 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -149,8 +149,11 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr)
     case ATTR_DISABLED: {
         int oldDisabledState = m_disabledState;
         m_disabledState = (attr->val() != 0) ? 2 : 1;
-        if (oldDisabledState != m_disabledState)
+        if (oldDisabledState != m_disabledState) {
+            if (isLoading() && m_disabledState == 2 && (oldDisabledState == 1 || !isAlternate()))
+                getDocument()->stylesheetLoaded();
             process();
+        }
         break;
     }
     default:

-- 
WebKit Debian packaging