Changeset 151360 in webkit

Timestamp:

Jun 9, 2013 2:22:03 PM (11 years ago)

Author:

roger_fong@apple.com

Message:

Layout info should never be cleared before delayed scroll information updates.
​https://bugs.webkit.org/show_bug.cgi?id=116689.

Reviewed by Darin Adler.

Test: fast/flexbox/clear-overflow-before-scroll-update.html

Make sure that clearLayoutOverflow only gets called after layer()->updateScrollInfoAfterLayout().
Also move clearLayoutOverflow to RenderBlock so we can keep all the delayed scroll update logic in RenderBlock.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::finishDelayUpdateScrollInfo): Call clearLayoutOverflow here.
(WebCore::RenderBlock::layout): Only call clearLayoutOverflow here if scrolling isn't being delayed.
(WebCore::RenderBlock::clearLayoutOverflow): Remove clearLayoutOverflow, move into RenderBlock to keep delayed scrolling logic in the same file.

• rendering/RenderBlock.h:
• rendering/RenderBox.cpp:
• rendering/RenderBox.h:
• rendering/RenderDeprecatedFlexibleBox.cpp: Should call updateScrollInfoAfterLayout, not layer()->updateScrollInfoAfterLayout(), so that it takes delayed scrolling logic into account.

(WebCore::RenderDeprecatedFlexibleBox::layoutBlock):

• rendering/RenderGrid.cpp: Ditto

(WebCore::RenderGrid::layoutBlock):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/flexbox/clear-overflow-before-scroll-update-expected.txt (added)
• LayoutTests/fast/flexbox/clear-overflow-before-scroll-update.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)
• Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-06-07  Roger Fong  <roger_fong@apple.com>
+
+        Layout info should never be cleared before delayed scroll information updates.
+        https://bugs.webkit.org/show_bug.cgi?id=116689.
+
+        Reviewed by Darin Adler.
+
+        * fast/flexbox/clear-overflow-before-scroll-update-expected.txt: Added.
+        * fast/flexbox/clear-overflow-before-scroll-update.html: Added.
+
 2013-06-08  Igor Oliveira  <igor.o@sisa.samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-09  Roger Fong  <roger_fong@apple.com>
+
+        Layout info should never be cleared before delayed scroll information updates.
+        https://bugs.webkit.org/show_bug.cgi?id=116689.
+
+        Reviewed by Darin Adler.
+
+        Test: fast/flexbox/clear-overflow-before-scroll-update.html
+
+        Make sure that clearLayoutOverflow only gets called after layer()->updateScrollInfoAfterLayout().
+        Also move clearLayoutOverflow to RenderBlock so we can keep all the delayed scroll update logic in RenderBlock.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::finishDelayUpdateScrollInfo): Call clearLayoutOverflow here.
+        (WebCore::RenderBlock::layout): Only call clearLayoutOverflow here if scrolling isn't being delayed.
+        (WebCore::RenderBlock::clearLayoutOverflow): Remove clearLayoutOverflow, move into RenderBlock to keep delayed scrolling logic in the same file.
+        * rendering/RenderBlock.h:
+        * rendering/RenderBox.cpp:
+        * rendering/RenderBox.h:
+        * rendering/RenderDeprecatedFlexibleBox.cpp: Should call updateScrollInfoAfterLayout, not layer()->updateScrollInfoAfterLayout(), so that it takes delayed scrolling logic into account.
+        (WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
+        * rendering/RenderGrid.cpp: Ditto
+        (WebCore::RenderGrid::layoutBlock):
+
 2013-06-09  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1392 +1392 @@
             if (block->hasOverflowClip()) {
                 block->layer()->updateScrollInfoAfterLayout();
+                block->clearLayoutOverflow();
             }
         }
@@ -1430 +1431 @@
     // It's safe to check for control clip here, since controls can never be table cells.
     // If we have a lightweight clip, there can never be any overflow from children.
-    if (hasControlClip() && m_overflow)
+    if (hasControlClip() && m_overflow && !gDelayUpdateScrollInfo)
         clearLayoutOverflow();
 
@@ -1817 +1818 @@
     if (isRenderFlowThread())
         toRenderFlowThread(this)->computeOverflowStateForRegions(oldClientAfterEdge);
+}
+
+void RenderBlock::clearLayoutOverflow()
+{
+    if (!m_overflow)
+        return;
+    
+    if (visualOverflowRect() == borderBoxRect()) {
+        m_overflow.clear();
+        return;
+    }
+    
+    m_overflow->setLayoutOverflow(borderBoxRect());
 }
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -555 +555 @@
 public:
     void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false);
+    void clearLayoutOverflow();
 protected:
     virtual void addOverflowFromChildren();

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -4216 +4216 @@
 }
 
-void RenderBox::clearLayoutOverflow()
-{
-    if (!m_overflow)
-        return;
-    
-    if (visualOverflowRect() == borderBoxRect()) {
-        m_overflow.clear();
-        return;
-    }
-    
-    m_overflow->setLayoutOverflow(borderBoxRect());
-}
-
 inline static bool percentageLogicalHeightIsResolvable(const RenderBox* box)
 {

trunk/Source/WebCore/rendering/RenderBox.h

@@ -192 +192 @@
     void addOverflowFromChild(RenderBox* child) { addOverflowFromChild(child, child->locationOffset()); }
     void addOverflowFromChild(RenderBox* child, const LayoutSize& delta);
-    void clearLayoutOverflow();
     
     void updateLayerTransform();

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -379 +379 @@
     // Update our scrollbars if we're overflow:auto/scroll/hidden now that we know if
     // we overflow or not.
-    if (hasOverflowClip())
-        layer()->updateScrollInfoAfterLayout();
+    updateScrollInfoAfterLayout();
 
     // Repaint with our new bounds if they are different from our old bounds.

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -181 +181 @@
     // Update our scroll information if we're overflow:auto/scroll/hidden now that we know if
     // we overflow or not.
-    if (hasOverflowClip())
-        layer()->updateScrollInfoAfterLayout();
+    updateScrollInfoAfterLayout();
 
     repainter.repaintAfterLayout();