Fix geometry mapping issues for float under inline

third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp

Index: third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp b/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
index d4d2dcff4670e8fa5d518b675a6fce3bc47f7d08..9d6bfa838adc6fa0c13b15775ad49f2fdefa62ca 100644
--- a/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
+++ b/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
@@ -77,14 +77,19 @@ class LayoutGeometryMapTest
     return element->layoutBox();
   }
 
-  static LayoutBox* getLayoutBox(WebView* webView,
-                                 const WTF::AtomicString& elementId) {
+  static Element* getElement(WebView* webView,
+                             const WTF::AtomicString& elementId) {
     WebViewImpl* webViewImpl = toWebViewImpl(webView);
     if (!webViewImpl)
       return nullptr;
     LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
     Document* doc = frame->document();
-    Element* element = doc->getElementById(elementId);
+    return doc->getElementById(elementId);
+  }
+
+  static LayoutBox* getLayoutBox(WebView* webView,
+                                 const WTF::AtomicString& elementId) {
+    Element* element = getElement(webView, elementId);
     if (!element)
       return nullptr;
     return element->layoutBox();
@@ -494,4 +499,38 @@ TEST_P(LayoutGeometryMapTest, ColumnTest) {
   EXPECT_EQ(3.0f, rectFromQuad(rgm.mapToAncestor(rect, nullptr)).height());
 }
 
+TEST_P(LayoutGeometryMapTest, FloatUnderInlineLayer) {
+  registerMockedHttpURLLoad("rgm_float_under_inline.html");
+  FrameTestHelpers::WebViewHelper webViewHelper;
+  WebView* webView = webViewHelper.initializeAndLoad(
+      m_baseURL + "rgm_float_under_inline.html", true, 0, 0);
+  webView->resize(WebSize(1000, 1000));
+  webView->updateAllLifecyclePhases();
+
+  LayoutGeometryMap rgm;
+  auto* layerUnderFloat = getLayoutBox(webView, "layer-under-float");
+  auto* span = getElement(webView, "span")->layoutBoxModelObject();
+  auto* floating = getLayoutBox(webView, "float");
+  auto* container = getLayoutBox(webView, "container");
+  FloatRect rect(3.0f, 4.0f, 10.0f, 8.0f);
+
+  rgm.pushMappingsToAncestor(container->layer(), nullptr);
+  rgm.pushMappingsToAncestor(span->layer(), container->layer());
+  rgm.pushMappingsToAncestor(layerUnderFloat->layer(), span->layer());
+  EXPECT_EQ(rect, rectFromQuad(rgm.mapToAncestor(rect, container)));
+  EXPECT_EQ(FloatRect(63.0f, 54.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
+
+  rgm.popMappingsToAncestor(span->layer());
+  EXPECT_EQ(FloatRect(203.0f, 104.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, container)));
+  EXPECT_EQ(FloatRect(263.0f, 154.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
+
+  rgm.pushMappingsToAncestor(floating, span);
+  EXPECT_EQ(rect, rectFromQuad(rgm.mapToAncestor(rect, container)));
+  EXPECT_EQ(FloatRect(63.0f, 54.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
+}
+
 }  // namespace blink