[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 738e097fc5ad5ce3506a34adb9dd0de1f9a69bec
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 3 03:24:58 2003 +0000

    	Fix for 3216650.  Needed an additional check when the disabled
    	attribute is changed on <link> elements for stylesheets to keep
    	the pending sheet count in sync.
    
            Reviewed by gramps
    
            * khtml/html/html_headimpl.cpp:
            (HTMLLinkElementImpl::parseAttribute):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4010 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0ec6e0c..ea5e2dd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-04-02  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3216650.  Needed an additional check when the disabled
+	attribute is changed on <link> elements for stylesheets to keep
+	the pending sheet count in sync.
+	
+        Reviewed by gramps
+
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::parseAttribute):
+
+2003-04-02  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3212011.  Avoid applying a fixup to the minwidth
 	of overflow:hidden table cells, since we don't really have
 	an accurate width to compare against.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0ec6e0c..ea5e2dd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-04-02  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3216650.  Needed an additional check when the disabled
+	attribute is changed on <link> elements for stylesheets to keep
+	the pending sheet count in sync.
+	
+        Reviewed by gramps
+
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::parseAttribute):
+
+2003-04-02  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3212011.  Avoid applying a fixup to the minwidth
 	of overflow:hidden table cells, since we don't really have
 	an accurate width to compare against.
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index d35a80a..e7e91ac 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -152,20 +152,29 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr)
         m_disabledState = (attr->val() != 0) ? 2 : 1;
         if (oldDisabledState != m_disabledState) {
             // If we change the disabled state while the sheet is still loading, then we have to
-            // perform two checks:
-            // Check #1: If the sheet becomes disabled while it was loading, and if it was either
-            // a main sheet or a sheet that was previously enabled via script, then we need
-            // to remove it from the list of pending sheets.
-            if (isLoading() && m_disabledState == 2 && (!m_alternate || oldDisabledState == 1))
-                getDocument()->stylesheetLoaded();
-                
-            // Check #2: An alternate sheet becomes enabled while it is still loading.
-            if (isLoading() && m_alternate && m_disabledState == 1)
-                getDocument()->addPendingSheet();
-                
-            // If the sheet is already loading just bail.
-            if (isLoading())
+            // perform three checks:
+            if (isLoading()) {
+                // Check #1: If the sheet becomes disabled while it was loading, and if it was either
+                // a main sheet or a sheet that was previously enabled via script, then we need
+                // to remove it from the list of pending sheets.
+                if (m_disabledState == 2 && (!m_alternate || oldDisabledState == 1))
+                    getDocument()->stylesheetLoaded();
+                    
+                // Check #2: An alternate sheet becomes enabled while it is still loading.
+                if (m_alternate && m_disabledState == 1)
+                    getDocument()->addPendingSheet();
+    
+                // Check #3: A main sheet becomes enabled while it was still loading and
+                // after it was disabled via script.  It takes really terrible code to make this
+                // happen (a double toggle for no reason essentially).  This happens on
+                // virtualplastic.net, which manages to do about 12 enable/disables on only 3
+                // sheets. :)
+                if (!m_alternate && m_disabledState == 1 && oldDisabledState == 2)
+                    getDocument()->addPendingSheet();
+
+                // If the sheet is already loading just bail.
                 break;
+            }
             
             // Load the sheet, since it's never been loaded before.
             if (!m_sheet && m_disabledState == 1)

-- 
WebKit Debian packaging