Fix geometry mapping issues for float under inline

third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/LayoutObject.h"
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "platform/json/JSONValues.h"
@@ skipping 107 matching lines @@
       "hidden'></div>"
       "  </div>"
       "</div>");
 
   LayoutObject* overflowClipObject =
       getLayoutObjectByElementId("overflow-clip-layer");
   LayoutBlock* columns = toLayoutBlock(getLayoutObjectByElementId("columns"));
   EXPECT_EQ(columns->layer(), overflowClipObject->paintingLayer());
 }
 
+TEST_F(LayoutObjectTest, FloatUnderBlock) {
+  setBodyInnerHTML(
+      "<div id='layered-div' style='position: absolute'>"
+      "  <div id='container'>"
+      "    <div id='floating' style='float: left'>FLOAT</div>"
+      "  </div>"
+      "</div>");
+
+  LayoutBoxModelObject* layeredDiv =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("layered-div"));
+  LayoutBoxModelObject* container =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("container"));
+  LayoutObject* floating = getLayoutObjectByElementId("floating");
+
+  EXPECT_EQ(layeredDiv->layer(), layeredDiv->paintingLayer());
+  EXPECT_EQ(layeredDiv->layer(), floating->paintingLayer());
+  EXPECT_EQ(container, floating->container());
+  EXPECT_EQ(container, floating->containingBlock());
+}
+
+TEST_F(LayoutObjectTest, FloatUnderInline) {
+  setBodyInnerHTML(
+      "<div id='layered-div' style='position: absolute'>"
+      "  <div id='container'>"
+      "    <span id='layered-span' style='position: relative'>"
+      "      <div id='floating' style='float: left'>FLOAT</div>"
+      "    </span>"
+      "  </div>"
+      "</div>");
+
+  LayoutBoxModelObject* layeredDiv =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("layered-div"));
+  LayoutBoxModelObject* container =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("container"));
+  LayoutBoxModelObject* layeredSpan =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("layered-span"));
+  LayoutObject* floating = getLayoutObjectByElementId("floating");
+
+  EXPECT_EQ(layeredDiv->layer(), layeredDiv->paintingLayer());
+  EXPECT_EQ(layeredSpan->layer(), layeredSpan->paintingLayer());
+  EXPECT_EQ(layeredDiv->layer(), floating->paintingLayer());
+  EXPECT_EQ(container, floating->container());
+  EXPECT_EQ(container, floating->containingBlock());
+
+  bool ancestorSkipped = false;
+  EXPECT_EQ(container, floating->container(layeredSpan, &ancestorSkipped));
+  EXPECT_TRUE(ancestorSkipped);
+
+  ancestorSkipped = false;
+  EXPECT_EQ(container, floating->container(container, &ancestorSkipped));
+  EXPECT_FALSE(ancestorSkipped);
+}
+
 TEST_F(LayoutObjectTest, MutableForPaintingClearPaintFlags) {
   LayoutObject* object = document().body()->layoutObject();
   object->setShouldDoFullPaintInvalidation();
   EXPECT_TRUE(object->shouldDoFullPaintInvalidation());
   object->m_bitfields.setChildShouldCheckForPaintInvalidation(true);
   EXPECT_TRUE(object->m_bitfields.childShouldCheckForPaintInvalidation());
   object->setMayNeedPaintInvalidation();
   EXPECT_TRUE(object->mayNeedPaintInvalidation());
   object->setMayNeedPaintInvalidationSubtree();
   EXPECT_TRUE(object->mayNeedPaintInvalidationSubtree());
@@ skipping 17 matching lines @@
   EXPECT_FALSE(object->mayNeedPaintInvalidation());
   EXPECT_FALSE(object->mayNeedPaintInvalidationSubtree());
   EXPECT_FALSE(object->mayNeedPaintInvalidationAnimatedBackgroundImage());
   EXPECT_FALSE(object->shouldInvalidateSelection());
   EXPECT_FALSE(object->backgroundChangedSinceLastPaintInvalidation());
   EXPECT_FALSE(object->needsPaintPropertyUpdate());
   EXPECT_FALSE(object->descendantNeedsPaintPropertyUpdate());
 }
 
 }  // namespace blink