Changeset 165388 in webkit

Timestamp:

Mar 10, 2014 11:48:49 AM (10 years ago)

Author:

stavila@adobe.com

Message:

[CSS Regions] Hit-testing is not working properly inside scrollable regions
​https://bugs.webkit.org/show_bug.cgi?id=130015

Reviewed by Antti Koivisto.

Source/WebCore:

When hit-testing inside the flow thread's layer, the scrolled offset
of the current region must be taken into consideration.

Test: fast/regions/scrollable-regions-hit-testing-inside.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects):

LayoutTests:

Added test for hit-testing inside scrollable regions.

• fast/regions/scrollable-regions-hit-testing-inside-expected.html: Added.
• fast/regions/scrollable-regions-hit-testing-inside.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/scrollable-regions-hit-testing-inside-expected.html (added)
• LayoutTests/fast/regions/scrollable-regions-hit-testing-inside.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-10  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] Hit-testing is not working properly inside scrollable regions
+        https://bugs.webkit.org/show_bug.cgi?id=130015
+
+        Reviewed by Antti Koivisto.
+
+        Added test for hit-testing inside scrollable regions.
+
+        * fast/regions/scrollable-regions-hit-testing-inside-expected.html: Added.
+        * fast/regions/scrollable-regions-hit-testing-inside.html: Added.
+
 2014-03-10  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-10  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] Hit-testing is not working properly inside scrollable regions
+        https://bugs.webkit.org/show_bug.cgi?id=130015
+
+        Reviewed by Antti Koivisto.
+
+        When hit-testing inside the flow thread's layer, the scrolled offset
+        of the current region must be taken into consideration.
+
+        Test: fast/regions/scrollable-regions-hit-testing-inside.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+
 2014-03-10  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6877 +6877 @@
 
     LayoutRect regionContentBox = toRenderBlockFlow(&renderer())->contentBoxRect();
+    IntSize scrolledContentOffset = region->fragmentContainer().hasOverflowClip() ? region->fragmentContainer().scrolledContentOffset() : IntSize();
 
     RenderLayer* resultLayer = 0;
@@ -6885 +6886 @@
             continue;
 
-        LayoutSize hitTestOffset = portionLocation - (fragment.layerBounds.location() + regionContentBox.location());
+        LayoutSize hitTestOffset = portionLocation - (fragment.layerBounds.location() + regionContentBox.location()) + scrolledContentOffset;
 
         // Always ignore clipping, since the RenderFlowThread has nothing to do with the bounds of the FrameView.