Changeset 163369 in webkit

Timestamp:

Feb 4, 2014 2:10:42 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Regions] Fix Assert SHOULD NEVER BE REACHED in RenderLayer::enclosingElement()
​https://bugs.webkit.org/show_bug.cgi?id=123329

Patch by Mihai Maerean <Mihai Maerean> on 2014-02-04
Reviewed by Mihnea Ovidenie.

Source/WebCore:

The flowthread doesn't have an enclosing element, so when hitting the layer of the
flowthread (e.g. the descent area of the RootInlineBox for the image flowed alone
inside the flow thread) we're letting the hit testing continue so it will hit the region.

Tests: fast/regions/assert-hit-test-image.html

fast/regions/auto-size/region-same-height-as-div-with-inline-child.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::hitTestContents):

LayoutTests:

• fast/regions/assert-hit-test-image.html: Added.
• fast/regions/assert-hit-test-image-expected.txt: Added.
• fast/regions/auto-size/region-same-height-as-div-with-inline-child.html: Added.
• fast/regions/auto-size/region-same-height-as-div-with-inline-child-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/assert-hit-test-image-expected.txt (added)
• LayoutTests/fast/regions/assert-hit-test-image.html (added)
• LayoutTests/fast/regions/auto-size/region-same-height-as-div-with-inline-child-expected.txt (added)
• LayoutTests/fast/regions/auto-size/region-same-height-as-div-with-inline-child.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-02-04  Mihai Maerean  <mmaerean@adobe.com>
+
+        [CSS Regions] Fix Assert SHOULD NEVER BE REACHED in RenderLayer::enclosingElement()
+        https://bugs.webkit.org/show_bug.cgi?id=123329
+
+        Reviewed by Mihnea Ovidenie.
+
+        * fast/regions/assert-hit-test-image.html: Added.
+        * fast/regions/assert-hit-test-image-expected.txt: Added.
+        * fast/regions/auto-size/region-same-height-as-div-with-inline-child.html: Added.
+        * fast/regions/auto-size/region-same-height-as-div-with-inline-child-expected.txt: Added.
+
 2014-02-04  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-04  Mihai Maerean  <mmaerean@adobe.com>
+
+        [CSS Regions] Fix Assert SHOULD NEVER BE REACHED in RenderLayer::enclosingElement()
+        https://bugs.webkit.org/show_bug.cgi?id=123329
+
+        Reviewed by Mihnea Ovidenie.
+
+        The flowthread doesn't have an enclosing element, so when hitting the layer of the
+        flowthread (e.g. the descent area of the RootInlineBox for the image flowed alone
+        inside the flow thread) we're letting the hit testing continue so it will hit the region.
+
+        Tests: fast/regions/assert-hit-test-image.html
+               fast/regions/auto-size/region-same-height-as-div-with-inline-child.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::hitTestContents):
+
 2014-02-04  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -5042 +5042 @@
     // the tree.
     if (!result.innerNode() || !result.innerNonSharedNode()) {
+        if (isOutOfFlowRenderFlowThread()) {
+            // The flowthread doesn't have an enclosing element, so when hitting the layer of the
+            // flowthread (e.g. the descent area of the RootInlineBox for the image flowed alone
+            // inside the flow thread) we're letting the hit testing continue so it will hit the region.
+            return false;
+        }
+
         Element* e = enclosingElement();
         if (!result.innerNode())