Changeset 169586 in webkit

Timestamp:

Jun 4, 2014 5:41:27 AM (10 years ago)

Author:

stavila@adobe.com

Message:

REGRESSION: [CSS Regions] Regions with overflow:auto generate scrollbars even if the content flows into the following regions and as such, should not be scrolled
​https://bugs.webkit.org/show_bug.cgi?id=133481

Reviewed by Antti Koivisto.

Source/WebCore:
When enlarging the layout overflow of a scrollable region, the portion of the content that flows
in the region must be taken into consideration. If the content continues to flow into the next
region, the layout overflow of the current region must not be enlarged.

Test: fast/regions/scrollable-first-region.html

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::addRegionsOverflowFromChild):

LayoutTests:
Added test for a large item flowed through two regions with the first region having overflow:auto.
The region must NOT scroll.

• fast/regions/scrollable-first-region-expected.html: Added.
• fast/regions/scrollable-first-region.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/scrollable-first-region-expected.html (added)
• LayoutTests/fast/regions/scrollable-first-region.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-06-04  Radu Stavila  <stavila@adobe.com>
+
+        REGRESSION: [CSS Regions] Regions with overflow:auto generate scrollbars even if the content flows into the following regions and as such, should not be scrolled
+        https://bugs.webkit.org/show_bug.cgi?id=133481
+
+        Reviewed by Antti Koivisto.
+
+        Added test for a large item flowed through two regions with the first region having overflow:auto.
+        The region must NOT scroll.
+
+        * fast/regions/scrollable-first-region-expected.html: Added.
+        * fast/regions/scrollable-first-region.html: Added.
+
 2014-06-03  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-04  Radu Stavila  <stavila@adobe.com>
+
+        REGRESSION: [CSS Regions] Regions with overflow:auto generate scrollbars even if the content flows into the following regions and as such, should not be scrolled
+        https://bugs.webkit.org/show_bug.cgi?id=133481
+
+        Reviewed by Antti Koivisto.
+
+        When enlarging the layout overflow of a scrollable region, the portion of the content that flows
+        in the region must be taken into consideration. If the content continues to flow into the next
+        region, the layout overflow of the current region must not be enlarged.
+
+        Test: fast/regions/scrollable-first-region.html
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::addRegionsOverflowFromChild):
+
 2014-06-03  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -1425 +1425 @@
             if (isHorizontalWritingMode()) {
                 if (fragmentContainer.scrollsOverflowY()) {
-                    LayoutUnit layoutMaxLogicalY = child->frameRect().maxY() + spacingAfterLayout;
+                    LayoutUnit layoutMaxLogicalY = region->rectFlowPortionForBox(child, child->frameRect()).maxY() + spacingAfterLayout;
                     LayoutUnit maxYDiff = layoutMaxLogicalY - childLayoutOverflowRect.maxY();
                     if (maxYDiff > 0)
@@ -1432 +1432 @@
             } else {
                 if (fragmentContainer.scrollsOverflowX()) {
-                    LayoutUnit layoutMaxLogicalY = child->frameRect().maxX() + spacingAfterLayout;
+                    LayoutUnit layoutMaxLogicalY = region->rectFlowPortionForBox(child, child->frameRect()).maxX() + spacingAfterLayout;
                     LayoutUnit maxYDiff = layoutMaxLogicalY - childLayoutOverflowRect.maxX();
                     if (maxYDiff > 0)