Changeset 13371 in webkit

Timestamp:

Mar 17, 2006 7:22:49 PM (18 years ago)

Author:

aliceli1

Message:

Reviewed by Hyatt.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6999 "Dynamically added link-tag disables the use of change styles

dynamically"

• khtml/html/html_headimpl.cpp: (WebCore::HTMLLinkElementImpl::process):
• dynamically added link-tags for stylesheets were messing up the counting of pending stylesheets. If a head link element specifies a new stylesheet but the previously specified stylesheet is still loading, tell the document that stylesheets are loaded so that there are no remaining requests for it to be loaded.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/html/html_headimpl.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-03-17  Alice Liu  <alice.liu@apple.com>
+
+        Reviewed by Hyatt.
+
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=6999
+          "Dynamically added link-tag disables the use of change styles 
+           dynamically"
+
+        * khtml/html/html_headimpl.cpp:
+        (WebCore::HTMLLinkElementImpl::process):
+        - dynamically added link-tags for stylesheets were messing up the
+          counting of pending stylesheets.  If a head link element 
+          specifies a new stylesheet but the previously specified 
+          stylesheet is still loading, tell the document that stylesheets 
+          are loaded so that there are no remaining requests for it to be 
+          loaded.
+
 2006-03-17  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/khtml/html/html_headimpl.cpp

@@ -232 +232 @@
         // also, don't load style sheets for standalone documents
         if (m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print")) {
-            m_loading = true;
 
             // Add ourselves as a pending sheet, but only if we aren't an alternate 
@@ -240 +239 @@
             
             QString chset = getAttribute(charsetAttr).qstring();
-            if (m_cachedSheet)
+            if (m_cachedSheet) {
+                if (m_loading) {
+                    getDocument()->stylesheetLoaded();
+                }
                 m_cachedSheet->deref(this);
+            }
+            m_loading = true;
             m_cachedSheet = getDocument()->docLoader()->requestStyleSheet(m_url, chset);
             if (m_cachedSheet)