Fix paint and rect mapping issues for stacked float under stacked 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 9d6bfa838adc6fa0c13b15775ad49f2fdefa62ca..c4ca7a6164486a67b5f6adc6f092435431ae58b2 100644
--- a/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
+++ b/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
@@ -533,4 +533,46 @@ TEST_P(LayoutGeometryMapTest, FloatUnderInlineLayer) {
             rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
 }
 
+TEST_P(LayoutGeometryMapTest, StackedFloatUnderInlineLayer) {
+  registerMockedHttpURLLoad("rgm_stacked_float_under_inline.html");
+  FrameTestHelpers::WebViewHelper webViewHelper;
+  WebView* webView = webViewHelper.initializeAndLoad(
+      m_baseURL + "rgm_stacked_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());
+  // Includes offsets of span, floating and layerUnderFloat.
+  EXPECT_EQ(FloatRect(253.0f, 154.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, container)));
+  // Includes all offsets.
+  EXPECT_EQ(FloatRect(313.0f, 204.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
+
+  rgm.popMappingsToAncestor(span->layer());
+  // Includes offset of span.
+  EXPECT_EQ(FloatRect(203.0f, 104.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, container)));
+  // Includes offsets of container and span.
+  EXPECT_EQ(FloatRect(263.0f, 154.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
+
+  rgm.pushMappingsToAncestor(floating, span);
+  // Includes offsets of span and floating.
+  EXPECT_EQ(FloatRect(243.0f, 134.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, container)));
+  // Includes offsets of container, span and floating.
+  EXPECT_EQ(FloatRect(303.0f, 184.0f, 10.0f, 8.0f),
+            rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
+}
+
 }  // namespace blink