Fix geometry mapping issues for float under inline

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

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 59 matching lines @@
     if (!iframe)
       return nullptr;
     LocalFrame* frame = iframe->frame();
     Document* doc = frame->document();
     Element* element = doc->getElementById(elementId);
     if (!element)
       return nullptr;
     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();
   }
 
   static const LayoutBoxModelObject* getLayoutContainer(
       WebView* webView,
       const WTF::AtomicString& elementId) {
     LayoutBox* rb = getLayoutBox(webView, elementId);
     if (!rb)
@@ skipping 389 matching lines @@
 
   rgm.popMappingsToAncestor(static_cast<PaintLayer*>(nullptr));
   rgm.pushMappingsToAncestor(getLayoutBox(webView, "Col3"), nullptr);
   EXPECT_NEAR(8.0f + offset * 2.0f,
               rectFromQuad(rgm.mapToAncestor(rect, nullptr)).x(), 0.1f);
   EXPECT_NEAR(8.0f, rectFromQuad(rgm.mapToAncestor(rect, nullptr)).y(), 0.1f);
   EXPECT_EQ(5.0f, rectFromQuad(rgm.mapToAncestor(rect, nullptr)).width());
   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