Changeset 164290 in webkit

Timestamp:

Feb 18, 2014 7:11:00 AM (10 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions] Compute region ranges for inline replaced elements
​https://bugs.webkit.org/show_bug.cgi?id=128800

Reviewed by Andrei Bucur.

Source/WebCore:

Tests: fast/regions/hover-content-inside-iframe-in-region.html

fast/regions/select-multiple-in-region.html

When asking for the range of regions for an inline replaced box,
use the region cached on the root inline box for the inline replaced
box as the range of regions is computed only for blocks.
A future patch will extend the computation of region ranges
for inline blocks too.

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint):
Remove the restriction set during ​https://bugs.webkit.org/show_bug.cgi?id=113703
and enable the code path for boxes not only for blocks.
Method RenderFlowThread::getRegionRangeForBox returns a null region when it is unable
to get the region range and we already check for null region case.

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::getRegionRangeForBox):

LayoutTests:

• fast/regions/hover-content-inside-iframe-in-region-expected.html: Added.
• fast/regions/hover-content-inside-iframe-in-region.html: Added.
• fast/regions/resources/iframe-in-region-source.html: Added.
• fast/regions/select-multiple-in-region-expected.txt: Added.
• fast/regions/select-multiple-in-region.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/hover-content-inside-iframe-in-region-expected.html (added)
• LayoutTests/fast/regions/hover-content-inside-iframe-in-region.html (added)
• LayoutTests/fast/regions/resources/iframe-in-region-source.html (added)
• LayoutTests/fast/regions/select-multiple-in-region-expected.txt (added)
• LayoutTests/fast/regions/select-multiple-in-region.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-02-18  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Compute region ranges for inline replaced elements
+        https://bugs.webkit.org/show_bug.cgi?id=128800
+
+        Reviewed by Andrei Bucur.
+
+        * fast/regions/hover-content-inside-iframe-in-region-expected.html: Added.
+        * fast/regions/hover-content-inside-iframe-in-region.html: Added.
+        * fast/regions/resources/iframe-in-region-source.html: Added.
+        * fast/regions/select-multiple-in-region-expected.txt: Added.
+        * fast/regions/select-multiple-in-region.html: Added.
+
 2014-02-17  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-18  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Compute region ranges for inline replaced elements
+        https://bugs.webkit.org/show_bug.cgi?id=128800
+
+        Reviewed by Andrei Bucur.
+
+        Tests: fast/regions/hover-content-inside-iframe-in-region.html
+               fast/regions/select-multiple-in-region.html
+
+        When asking for the range of regions for an inline replaced box,
+        use the region cached on the root inline box for the inline replaced
+        box as the range of regions is computed only for blocks.
+        A future patch will extend the computation of region ranges
+        for inline blocks too.
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint):
+        Remove the restriction set during https://bugs.webkit.org/show_bug.cgi?id=113703
+        and enable the code path for boxes not only for blocks.
+        Method RenderFlowThread::getRegionRangeForBox returns a null region when it is unable
+        to get the region range and we already check for null region case.
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::getRegionRangeForBox):
+
 2014-02-18  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2750 +2750 @@
     // The point inside a box that's inside a region has its coordinates relative to the region,
     // not the FlowThread that is its container in the RenderObject tree.
-    if (o->isRenderFlowThread() && isRenderBlock()) {
-        // FIXME (CSSREGIONS): switch to Box instead of Block when we'll have range information
-        // for boxes as well, not just for blocks.
+    if (o->isRenderFlowThread() && isBox()) {
         RenderRegion* startRegion;
         RenderRegion* endRegion;
-        toRenderFlowThread(o)->getRegionRangeForBox(toRenderBlock(this), startRegion, endRegion);
+        toRenderFlowThread(o)->getRegionRangeForBox(toRenderBox(this), startRegion, endRegion);
         if (startRegion)
             o = startRegion;

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -34 +34 @@
 #include "HitTestRequest.h"
 #include "HitTestResult.h"
+#include "InlineElementBox.h"
 #include "Node.h"
 #include "PODIntervalTree.h"
@@ -785 +786 @@
 void RenderFlowThread::getRegionRangeForBox(const RenderBox* box, RenderRegion*& startRegion, RenderRegion*& endRegion) const
 {
-    startRegion = 0;
-    endRegion = 0;
+    startRegion = endRegion = 0;
     auto it = m_regionRangeMap.find(box);
-    if (it == m_regionRangeMap.end())
-        return;
-
-    const RenderRegionRange& range = it->value;
-    startRegion = range.startRegion();
-    endRegion = range.endRegion();
-    ASSERT(m_regionList.contains(startRegion) && m_regionList.contains(endRegion));
+
+    if (it != m_regionRangeMap.end()) {
+        const RenderRegionRange& range = it->value;
+        startRegion = range.startRegion();
+        endRegion = range.endRegion();
+        ASSERT(m_regionList.contains(startRegion) && m_regionList.contains(endRegion));
+        return;
+    }
+
+    InlineElementBox* boxWrapper = box->inlineBoxWrapper();
+    if (boxWrapper) {
+        const RootInlineBox& boxWrapperRootInlineBox =  boxWrapper->root();
+        startRegion = endRegion = boxWrapperRootInlineBox.containingRegion();
+        return;
+    }
 }