Changeset 73117 in webkit

Timestamp:

Dec 2, 2010 2:12:27 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-02 Mike Lawther <​mikelawther@chromium.org>

Reviewed by David Hyatt.

Clean up of iframe scrollbar mode code
​https://bugs.webkit.org/show_bug.cgi?id=47797

Pull setChildNeedsLayout/setNeedsLayout calls out of scrollbar mode
calculation method and put back into main layout function.
Early exit from the scrollbar calc when scrollbars are turned off.

• page/FrameView.cpp: (WebCore::FrameView::calculateScrollbarModesForLayout): (WebCore::FrameView::layout):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-02  Mike Lawther  <mikelawther@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Clean up of iframe scrollbar mode code
+        https://bugs.webkit.org/show_bug.cgi?id=47797
+
+        Pull setChildNeedsLayout/setNeedsLayout calls out of scrollbar mode
+        calculation method and put back into main layout function. 
+        Early exit from the scrollbar calc when scrollbars are turned off. 
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::calculateScrollbarModesForLayout):
+        (WebCore::FrameView::layout):
+
 2010-12-02  Hironori Bono  <hbono@chromium.org>
 

trunk/WebCore/page/FrameView.cpp

@@ -484 +484 @@
 void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, ScrollbarMode& vMode)
 {
+    const HTMLFrameOwnerElement* owner = m_frame->ownerElement();
+    if (owner && (owner->scrollingMode() == ScrollbarAlwaysOff)) {
+        hMode = ScrollbarAlwaysOff;
+        vMode = ScrollbarAlwaysOff;
+        return;
+    }  
+    
     if (m_canHaveScrollbars) {
         hMode = ScrollbarAuto;
@@ -499 +506 @@
         if (body && body->renderer()) {
             if (body->hasTagName(framesetTag) && m_frame->settings() && !m_frame->settings()->frameFlatteningEnabled()) {
-                body->renderer()->setChildNeedsLayout(true);
                 vMode = ScrollbarAlwaysOff;
                 hMode = ScrollbarAlwaysOff;
@@ -510 +516 @@
         } else if (rootRenderer) {
 #if ENABLE(SVG)
-            if (documentElement->isSVGElement()) {
-                if (!m_firstLayout && (m_size.width() != layoutWidth() || m_size.height() != layoutHeight()))
-                    rootRenderer->setChildNeedsLayout(true);
-            } else
+            if (!documentElement->isSVGElement()) {
                 applyOverflowToViewport(rootRenderer, hMode, vMode);
 #else
@@ -519 +522 @@
 #endif
         }
-#ifdef INSTRUMENT_LAYOUT_SCHEDULING
-        if (m_firstLayout && !document->ownerElement())
-            printf("Elapsed time before first layout: %d\n", document->elapsedTime());
-#endif
-    }
-    
-    HTMLFrameOwnerElement* owner = m_frame->ownerElement();
-    if (owner && (owner->scrollingMode() == ScrollbarAlwaysOff)) {
-        hMode = ScrollbarAlwaysOff;
-        vMode = ScrollbarAlwaysOff;
-    }     
+    }    
+}
 }
     
@@ -755 +749 @@
     m_nestedLayoutCount++;
 
+    if (!m_layoutRoot) {
+        Document* document = m_frame->document();
+        Node* documentElement = document->documentElement();
+        RenderObject* rootRenderer = documentElement ? documentElement->renderer() : 0;
+        Node* body = document->body();
+        if (body && body->renderer()) {
+            if (body->hasTagName(framesetTag) && m_frame->settings() && !m_frame->settings()->frameFlatteningEnabled()) {
+                body->renderer()->setChildNeedsLayout(true);
+            } else if (body->hasTagName(bodyTag)) {
+                if (!m_firstLayout && m_size.height() != layoutHeight() && body->renderer()->enclosingBox()->stretchesToViewport())
+                    body->renderer()->setChildNeedsLayout(true);
+            }
+        } else if (rootRenderer) {
+#if ENABLE(SVG)
+            if (documentElement->isSVGElement()) {
+                if (!m_firstLayout && (m_size.width() != layoutWidth() || m_size.height() != layoutHeight()))
+                    rootRenderer->setChildNeedsLayout(true);
+            }
+#endif
+        }
+        
+#ifdef INSTRUMENT_LAYOUT_SCHEDULING
+        if (m_firstLayout && !document->ownerElement())
+            printf("Elapsed time before first layout: %d\n", document->elapsedTime());
+#endif        
+    }
+    
     ScrollbarMode hMode;
-    ScrollbarMode vMode;
-    
+    ScrollbarMode vMode;    
     calculateScrollbarModesForLayout(hMode, vMode);