Changeset 24973 in webkit

Timestamp:

Aug 9, 2007 8:52:11 PM (17 years ago)

Author:

bdash

Message:

2007-08-09 Mitz Pettel <​mitz@webkit.org>

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14742 Document::recalcStyle(Force) called for every updateStyleIgnorePendingStylesheets while waiting for stylesheets <rdar://problem/5376306>

updateStyleSelector() is normally called when something changes that factors
into the style selector. However, updateLayoutIgnorePendingStylesheets() calls it for
a different reason, namely to account for all the preceding changes that were ignored
because of the early return in updateStyleSelector(). After that, the early return
can no longer occur, so changes are accounted for as they happen, and
updateLayoutIgnorePendingStylesheets() does not need to call updateStyleSelector()
again.

• dom/Document.cpp: (WebCore::Document::updateLayoutIgnorePendingStylesheets): Call updateStyleSelector() only before the first layout.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-09  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14742
+          Document::recalcStyle(Force) called for every updateStyleIgnorePendingStylesheets while waiting for stylesheets
+          <rdar://problem/5376306>
+
+        updateStyleSelector() is normally called when something changes that factors
+        into the style selector. However, updateLayoutIgnorePendingStylesheets() calls it for
+        a different reason, namely to account for all the preceding changes that were ignored
+        because of the early return in updateStyleSelector(). After that, the early return
+        can no longer occur, so changes are accounted for as they happen, and
+        updateLayoutIgnorePendingStylesheets() does not need to call updateStyleSelector()
+        again.
+
+        * dom/Document.cpp:
+        (WebCore::Document::updateLayoutIgnorePendingStylesheets): Call updateStyleSelector()
+        only before the first layout.
+
 2007-08-09  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/dom/Document.cpp

@@ -1099 +1099 @@
         // It's worth noting though that this entire method is a hack, since what we really want to do is
         // suspend JS instead of doing a layout with inaccurate information.
-        if (body() && !body()->renderer() && m_pendingSheetLayout == NoLayoutWithPendingSheets)
+        if (body() && !body()->renderer() && m_pendingSheetLayout == NoLayoutWithPendingSheets) {
             m_pendingSheetLayout = DidLayoutWithPendingSheets;
-        updateStyleSelector();    
+            updateStyleSelector();
+        }
     }