Changeset 16191 in webkit

Timestamp:

Sep 1, 2006 6:43:36 PM (18 years ago)

Author:

hyatt

Message:

Fix for 10682, refine the FOUC paint suppression logic so that it
is only triggered when FOUC would really have occurred.

Reviewed by aroben

• css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::styleForElement):
• dom/Document.cpp: (WebCore::Document::Document): (WebCore::Document::updateLayoutIgnorePendingStylesheets): (WebCore::Document::updateStyleSelector):
• dom/Document.h: (WebCore::Document::haveStylesheetsLoaded): (WebCore::Document::): (WebCore::Document::didLayoutWithPendingStylesheets):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintChildren):
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintLayer):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/cssstyleselector.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (3 diffs)
• dom/Document.h (modified) (3 diffs)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-09-01  David Hyatt  <hyatt@apple.com>
+
+        Fix for 10682, refine the FOUC paint suppression logic so that it
+        is only triggered when FOUC would really have occurred.
+
+        Reviewed by aroben
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::styleForElement):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::updateLayoutIgnorePendingStylesheets):
+        (WebCore::Document::updateStyleSelector):
+        * dom/Document.h:
+        (WebCore::Document::haveStylesheetsLoaded):
+        (WebCore::Document::):
+        (WebCore::Document::didLayoutWithPendingStylesheets):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintChildren):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintLayer):
+
 2006-09-01  MorganL  <morlmor@yahoo.com>
 

trunk/WebCore/css/cssstyleselector.cpp

@@ -768 +768 @@
 RenderStyle* CSSStyleSelector::styleForElement(Element* e, RenderStyle* defaultParent, bool allowSharing, bool resolveForRootDefault)
 {
-    if (allowSharing && !e->document()->haveStylesheetsLoaded()) {
+    // Once an element has a renderer, we don't try to destroy it, since otherwise the renderer
+    // will vanish if a style recalc happens during loading.
+    if (allowSharing && !e->document()->haveStylesheetsLoaded() && !e->renderer()) {
         if (!styleNotYetAvailable) {
             styleNotYetAvailable = ::new RenderStyle();

trunk/WebCore/dom/Document.cpp

@@ -266 +266 @@
     m_pendingStylesheets = 0;
     m_ignorePendingStylesheets = false;
-    m_didLayoutWithPendingStylesheets = false;
+    m_pendingSheetLayout = NoLayoutWithPendingSheets;
 
     m_cssTarget = 0;
@@ -931 +931 @@
     if (!haveStylesheetsLoaded()) {
         m_ignorePendingStylesheets = true;
-        m_didLayoutWithPendingStylesheets = true;
+        // FIXME: We are willing to attempt to suppress painting with outdated style info only once.  Our assumption is that it would be
+        // dangerous to try to stop it a second time, after page content has already been loaded and displayed
+        // with accurate style information.  (Our suppression involves blanking the whole page at the
+        // moment.  If it were more refined, we might be able to do something better.)
+        // 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 (m_pendingSheetLayout == NoLayoutWithPendingSheets)
+            m_pendingSheetLayout = DidLayoutWithPendingSheets;
         updateStyleSelector();    
     }
@@ -1776 +1783 @@
         return;
 
-    if (m_didLayoutWithPendingStylesheets) {
-        m_didLayoutWithPendingStylesheets = false;
+    if (didLayoutWithPendingStylesheets() && m_pendingStylesheets <= 0) {
+        m_pendingSheetLayout = IgnoreLayoutWithPendingSheets;
         if (renderer())
             renderer()->repaint();

trunk/WebCore/dom/Document.h

@@ -241 +241 @@
      * any @imports that they may be loading).
      */
-    bool haveStylesheetsLoaded(bool checkIgnoreFlag = true) const { return m_pendingStylesheets <= 0 || (checkIgnoreFlag && m_ignorePendingStylesheets); }
+    bool haveStylesheetsLoaded() const { return m_pendingStylesheets <= 0 || m_ignorePendingStylesheets; }
 
     /**
@@ -598 +598 @@
 #endif // XPATH_SUPPORT
     
+    enum PendingSheetLayout { NoLayoutWithPendingSheets, DidLayoutWithPendingSheets, IgnoreLayoutWithPendingSheets };
+
+    bool didLayoutWithPendingStylesheets() const { return m_pendingSheetLayout == DidLayoutWithPendingSheets; }
+
 protected:
     CSSStyleSelector* m_styleSelector;
@@ -629 +633 @@
     // to track that this happened so that we can do a full repaint when the stylesheets
     // do eventually load.
-    bool m_didLayoutWithPendingStylesheets;
+    PendingSheetLayout m_pendingSheetLayout;
 
     RefPtr<CSSStyleSheet> m_elemSheet;

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1259 +1259 @@
     // It's ok not to draw, because later on, when all the stylesheets do load, updateStyleSelector on the Document
     // will do a full repaint().
-    if (!document()->haveStylesheetsLoaded(false))
+    if (document()->didLayoutWithPendingStylesheets())
         return;
     

trunk/WebCore/rendering/RenderLayer.cpp

@@ -1274 +1274 @@
     // It's ok not to draw, because later on, when all the stylesheets do load, updateStyleSelector on the Document
     // will do a full repaint().
-    if (!renderer()->document()->haveStylesheetsLoaded(false) && !renderer()->isRenderView() && !renderer()->isRoot())
+    if (renderer()->document()->didLayoutWithPendingStylesheets() && !renderer()->isRenderView() && !renderer()->isRoot())
         return;