Changeset 25308 in webkit

Timestamp:

Aug 29, 2007, 3:46:41 PM (17 years ago)

Author:

antti

Message:

WebCore:

Reviewed by Mitz.

Fix <rdar://problem/5425951>
REGRESSION: change to updateLayoutIgnorePendingStylesheets causes SAP Portal page to render wrong

If new nodes have been added or style recalc has been done with style sheets still pending, some nodes
may not have had their real style calculated yet. Normally this state gets cleaned when style sheets arrive
but in updateLayoutIgnorePendingStylesheets() we need to do full style recalc to get up-to-date style immediatly.

Added a document flag to track if there are any nodes that did not have their real style calculated due to
pending stylesheets.

Test: fast/dynamic/style-access-late-stylesheet-load.html

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::styleForElement):
• dom/Document.cpp: (WebCore::Document::Document): (WebCore::Document::recalcStyle): (WebCore::Document::updateLayoutIgnorePendingStylesheets):
• dom/Document.h: (WebCore::Document::setHasNodesWithPlaceholderStyle):

LayoutTests:

Reviewed by Mitz.

Test for <rdar://problem/5425951>
REGRESSION: change to updateLayoutIgnorePendingStylesheets causes SAP Portal page to render wrong

• fast/dynamic/style-access-late-stylesheet-load-expected.txt: Added.
• fast/dynamic/style-access-late-stylesheet-load.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/style-access-late-stylesheet-load-expected.txt (added)
• LayoutTests/fast/dynamic/style-access-late-stylesheet-load.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (3 diffs)
• WebCore/dom/Document.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-08-29  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Mitz.
+        
+        Test for <rdar://problem/5425951>
+        REGRESSION: change to updateLayoutIgnorePendingStylesheets causes SAP Portal page to render wrong
+
+        * fast/dynamic/style-access-late-stylesheet-load-expected.txt: Added.
+        * fast/dynamic/style-access-late-stylesheet-load.html: Added.
+
 2007-08-28  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-29  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Mitz.
+        
+        Fix <rdar://problem/5425951>
+        REGRESSION: change to updateLayoutIgnorePendingStylesheets causes SAP Portal page to render wrong
+        
+        If new nodes have been added or style recalc has been done with style sheets still pending, some nodes 
+        may not have had their real style calculated yet. Normally this state gets cleaned when style sheets arrive 
+        but in updateLayoutIgnorePendingStylesheets() we need to do full style recalc to get up-to-date style immediatly.
+        
+        Added a document flag to track if there are any nodes that did not have their real style calculated due to
+        pending stylesheets.
+
+        Test: fast/dynamic/style-access-late-stylesheet-load.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::styleForElement):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::recalcStyle):
+        (WebCore::Document::updateLayoutIgnorePendingStylesheets):
+        * dom/Document.h:
+        (WebCore::Document::setHasNodesWithPlaceholderStyle):
+
 2007-08-29  Alice Liu  <alice.liu@apple.com>
 

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -794 +794 @@
         }
         styleNotYetAvailable->ref();
+        e->document()->setHasNodesWithPlaceholderStyle();
         return styleNotYetAvailable;
     }

trunk/WebCore/dom/Document.cpp

@@ -319 +319 @@
     m_pendingStylesheets = 0;
     m_ignorePendingStylesheets = false;
+    m_hasNodesWithPlaceholderStyle = false;
     m_pendingSheetLayout = NoLayoutWithPendingSheets;
 
@@ -987 +988 @@
 
     if (change == Force) {
+        // style selector may set this again during recalc
+        m_hasNodesWithPlaceholderStyle = false;
+        
         RenderStyle* oldStyle = renderer()->style();
         if (oldStyle)
@@ -1099 +1103 @@
             m_pendingSheetLayout = DidLayoutWithPendingSheets;
             updateStyleSelector();
-        }
+        } else if (m_hasNodesWithPlaceholderStyle)
+            // If new nodes have been added or style recalc has been done with style sheets still pending, some nodes 
+            // may not have had their real style calculated yet. Normally this gets cleaned when style sheets arrive 
+            // but here we need up-to-date style immediatly.
+            recalcStyle(Force);
     }
 

trunk/WebCore/dom/Document.h

@@ -641 +641 @@
 
     bool didLayoutWithPendingStylesheets() const { return m_pendingSheetLayout == DidLayoutWithPendingSheets; }
+    
+    void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }
 
     String iconURL();
@@ -696 +698 @@
     // do eventually load.
     PendingSheetLayout m_pendingSheetLayout;
+    
+    bool m_hasNodesWithPlaceholderStyle;
 
     RefPtr<CSSStyleSheet> m_elemSheet;