- Revision
- 151360
- Author
- [email protected]
- Date
- 2013-06-09 14:22:03 -0700 (Sun, 09 Jun 2013)
Log 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):
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (151359 => 151360)
--- trunk/LayoutTests/ChangeLog 2013-06-09 20:57:49 UTC (rev 151359)
+++ trunk/LayoutTests/ChangeLog 2013-06-09 21:22:03 UTC (rev 151360)
@@ -1,3 +1,13 @@
+2013-06-07 Roger Fong <[email protected]>
+
+ 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 <[email protected]>
before/after generated content is not working with HTMLSummaryElement and HTMLDetailsElement.
Added: trunk/LayoutTests/fast/flexbox/clear-overflow-before-scroll-update-expected.txt (0 => 151360)
--- trunk/LayoutTests/fast/flexbox/clear-overflow-before-scroll-update-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/flexbox/clear-overflow-before-scroll-update-expected.txt 2013-06-09 21:22:03 UTC (rev 151360)
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x43
+ RenderBlock {HTML} at (0,0) size 800x43
+ RenderDeprecatedFlexibleBox {BODY} at (8,8) size 784x27
+ RenderBlock (anonymous) at (0,0) size 33x27
+ RenderText {#text} at (19,4) size 4x18
+ text run at (19,4) width 4: " "
+ RenderBlock {SPAN} at (23,8) size 10x10 [bgcolor=#FF0000]
+ RenderText {#text} at (0,0) size 0x0
+layer at (10,10) size 15x23 clip at (15,15) size 5x13
+ RenderMenuList {SELECT} at (2,2) size 15x23 [bgcolor=#FFFFFF] [border: (5px solid #000000)]
+ RenderBlock (anonymous) at (5,5) size 5x13
+ RenderBR at (-9999,0) size 0x13 [bgcolor=#FFFFFF]
Added: trunk/LayoutTests/fast/flexbox/clear-overflow-before-scroll-update.html (0 => 151360)
--- trunk/LayoutTests/fast/flexbox/clear-overflow-before-scroll-update.html (rev 0)
+++ trunk/LayoutTests/fast/flexbox/clear-overflow-before-scroll-update.html 2013-06-09 21:22:03 UTC (rev 151360)
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+<style type="text/css">
+select {
+ text-indent: -9999px;
+ overflow: hidden;
+ -webkit-appearance: none;
+ border-width: 5px;
+}
+
+span {
+ background-color: red;
+ width: 10px;
+ height: 10px;
+ display: inline-block;
+}
+
+body {
+ display: -webkit-box;
+}
+</style>
+
+</head>
+<body>
+ <select>
+ </select>
+ <span>
+ </span>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (151359 => 151360)
--- trunk/Source/WebCore/ChangeLog 2013-06-09 20:57:49 UTC (rev 151359)
+++ trunk/Source/WebCore/ChangeLog 2013-06-09 21:22:03 UTC (rev 151360)
@@ -1,3 +1,27 @@
+2013-06-09 Roger Fong <[email protected]>
+
+ 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 <[email protected]>
Split the 3 paths of SelectorDataList::execute() into 3 separate functions
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (151359 => 151360)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-06-09 20:57:49 UTC (rev 151359)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-06-09 21:22:03 UTC (rev 151360)
@@ -1391,6 +1391,7 @@
RenderBlock* block = *it;
if (block->hasOverflowClip()) {
block->layer()->updateScrollInfoAfterLayout();
+ block->clearLayoutOverflow();
}
}
}
@@ -1429,7 +1430,7 @@
// 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();
invalidateBackgroundObscurationStatus();
@@ -1818,6 +1819,19 @@
toRenderFlowThread(this)->computeOverflowStateForRegions(oldClientAfterEdge);
}
+void RenderBlock::clearLayoutOverflow()
+{
+ if (!m_overflow)
+ return;
+
+ if (visualOverflowRect() == borderBoxRect()) {
+ m_overflow.clear();
+ return;
+ }
+
+ m_overflow->setLayoutOverflow(borderBoxRect());
+}
+
void RenderBlock::addOverflowFromBlockChildren()
{
for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (151359 => 151360)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2013-06-09 20:57:49 UTC (rev 151359)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2013-06-09 21:22:03 UTC (rev 151360)
@@ -554,6 +554,7 @@
public:
void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false);
+ void clearLayoutOverflow();
protected:
virtual void addOverflowFromChildren();
void addOverflowFromFloats();
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (151359 => 151360)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2013-06-09 20:57:49 UTC (rev 151359)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2013-06-09 21:22:03 UTC (rev 151360)
@@ -4215,19 +4215,6 @@
m_overflow->addVisualOverflow(rect);
}
-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)
{
return RenderBox::percentageLogicalHeightIsResolvableFromBlock(box->containingBlock(), box->isOutOfFlowPositioned());
Modified: trunk/Source/WebCore/rendering/RenderBox.h (151359 => 151360)
--- trunk/Source/WebCore/rendering/RenderBox.h 2013-06-09 20:57:49 UTC (rev 151359)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2013-06-09 21:22:03 UTC (rev 151360)
@@ -191,7 +191,6 @@
void addVisualEffectOverflow();
void addOverflowFromChild(RenderBox* child) { addOverflowFromChild(child, child->locationOffset()); }
void addOverflowFromChild(RenderBox* child, const LayoutSize& delta);
- void clearLayoutOverflow();
void updateLayerTransform();
Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (151359 => 151360)
--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2013-06-09 20:57:49 UTC (rev 151359)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2013-06-09 21:22:03 UTC (rev 151360)
@@ -378,8 +378,7 @@
// 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.
repainter.repaintAfterLayout();
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (151359 => 151360)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2013-06-09 20:57:49 UTC (rev 151359)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2013-06-09 21:22:03 UTC (rev 151360)
@@ -180,8 +180,7 @@
// 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();