Changeset 168263 in webkit

Timestamp:

May 5, 2014 1:01:13 AM (10 years ago)

Author:

abucur@adobe.com

Message:

[CSS Regions] ASSERT when hovering over region
​https://bugs.webkit.org/show_bug.cgi?id=128809

Reviewed by Mihnea Ovidenie.

Source/WebCore:
There's no point in hit-testing a box for a region if it's not contained inside
that region.

Test: fast/regions/hit-test-box-non-containing-region.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::nodeAtPoint):

LayoutTests:
Add a test verifying we're not trying to hit-test a box inside a region
where it's not contained.

• fast/regions/hit-test-box-non-containing-region-expected.txt: Added.
• fast/regions/hit-test-box-non-containing-region.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/hit-test-box-non-containing-region-expected.txt (added)
• LayoutTests/fast/regions/hit-test-box-non-containing-region.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-05-05  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] ASSERT when hovering over region
+        https://bugs.webkit.org/show_bug.cgi?id=128809
+
+        Reviewed by Mihnea Ovidenie.
+
+        Add a test verifying we're not trying to hit-test a box inside a region
+        where it's not contained.
+
+        * fast/regions/hit-test-box-non-containing-region-expected.txt: Added.
+        * fast/regions/hit-test-box-non-containing-region.html: Added.
+
 2014-05-04  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-05  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] ASSERT when hovering over region
+        https://bugs.webkit.org/show_bug.cgi?id=128809
+
+        Reviewed by Mihnea Ovidenie.
+
+        There's no point in hit-testing a box for a region if it's not contained inside
+        that region.
+
+        Test: fast/regions/hit-test-box-non-containing-region.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::nodeAtPoint):
+
 2014-05-04  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1128 +1128 @@
     }
 
+    RenderRegion* regionToUse = locationInContainer.region();
+    if (regionToUse) {
+        RenderFlowThread* flowThread = regionToUse->flowThread();
+
+        // If the box is not contained by this region there's no point in going further.
+        if (!flowThread->objectShouldFragmentInFlowRegion(this, regionToUse))
+            return false;
+    }
+
     // Check our bounds next. For this purpose always assume that we can only be hit in the
     // foreground phase (which is true for replaced elements like images).
-    LayoutRect boundsRect = borderBoxRectInRegion(locationInContainer.region());
+    LayoutRect boundsRect = borderBoxRectInRegion(regionToUse);
     boundsRect.moveBy(adjustedLocation);
     if (visibleToHitTesting() && action == HitTestForeground && locationInContainer.intersects(boundsRect)) {