Changeset 166259 in webkit

Timestamp:

Mar 25, 2014 3:01:25 PM (10 years ago)

Author:

stavila@adobe.com

Message:

[CSS Regions] The background of children of scrollable elements flowed into regions is not properly scrolled
​https://bugs.webkit.org/show_bug.cgi?id=130574

Reviewed by David Hyatt.

Source/WebCore:

When computing the clip rect for painting the box decorations, the scrolled content offset
must be computed by going up the containing block tree, up to the region.

Tests: fast/regions/scrollable-region-scrollable-absolute-content-background.html

fast/regions/scrollable-region-scrollable-content-background.html

• rendering/RenderNamedFlowThread.cpp:

(WebCore::RenderNamedFlowThread::decorationsClipRectForBoxInNamedFlowFragment):

LayoutTests:

Added tests for properly painting background of children of scrollable elements flowed into regions.

• fast/regions/scrollable-region-scrollable-absolute-content-background-expected.html: Added.
• fast/regions/scrollable-region-scrollable-absolute-content-background.html: Added.
• fast/regions/scrollable-region-scrollable-content-background-expected.html: Added.
• fast/regions/scrollable-region-scrollable-content-background.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/scrollable-region-scrollable-absolute-content-background-expected.html (added)
• LayoutTests/fast/regions/scrollable-region-scrollable-absolute-content-background.html (added)
• LayoutTests/fast/regions/scrollable-region-scrollable-content-background-expected.html (added)
• LayoutTests/fast/regions/scrollable-region-scrollable-content-background.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderNamedFlowThread.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-25  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] The background of children of scrollable elements flowed into regions is not properly scrolled
+        https://bugs.webkit.org/show_bug.cgi?id=130574
+
+        Reviewed by David Hyatt.
+
+        Added tests for properly painting background of children of scrollable elements flowed into regions.
+
+        * fast/regions/scrollable-region-scrollable-absolute-content-background-expected.html: Added.
+        * fast/regions/scrollable-region-scrollable-absolute-content-background.html: Added.
+        * fast/regions/scrollable-region-scrollable-content-background-expected.html: Added.
+        * fast/regions/scrollable-region-scrollable-content-background.html: Added.
+
 2014-03-25  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-25  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] The background of children of scrollable elements flowed into regions is not properly scrolled
+        https://bugs.webkit.org/show_bug.cgi?id=130574
+
+        Reviewed by David Hyatt.
+
+        When computing the clip rect for painting the box decorations, the scrolled content offset
+        must be computed by going up the containing block tree, up to the region.
+
+        Tests: fast/regions/scrollable-region-scrollable-absolute-content-background.html
+               fast/regions/scrollable-region-scrollable-content-background.html
+
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore::RenderNamedFlowThread::decorationsClipRectForBoxInNamedFlowFragment):
+
 2014-03-25  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp

@@ -298 +298 @@
     // Now flip it again.
     flipForWritingModeLocalCoordinates(visualOverflowRect);
-    
-    // Take the scrolled offset of the region into consideration.
-    IntSize scrolledContentOffset = fragment.fragmentContainer().scrolledContentOffset();
+
+    // Take the scrolled offset of this object's parents into consideration.
+    IntSize scrolledContentOffset;
+    RenderBlock* containingBlock = box.containingBlock();
+    while (containingBlock) {
+        if (containingBlock->isRenderNamedFlowThread()) {
+            // We've reached the flow thread, take the scrolled offset of the region into consideration.
+            ASSERT(containingBlock == this);
+            scrolledContentOffset += fragment.fragmentContainer().scrolledContentOffset();
+            break;
+        }
+        
+        scrolledContentOffset += containingBlock->scrolledContentOffset();
+        containingBlock = containingBlock->containingBlock();
+    }
+
     if (!scrolledContentOffset.isZero()) {
         if (style().isFlippedBlocksWritingMode())