Fix geometry mapping issues for float under inline

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

 // Copyright 2014 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/PaintInvalidationState.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 80 matching lines @@
       m_paintInvalidationContainer(parentState.m_paintInvalidationContainer),
       m_paintInvalidationContainerForStackedContents(
           parentState.m_paintInvalidationContainerForStackedContents),
       m_containerForAbsolutePosition(
           currentObject.canContainAbsolutePositionObjects()
               ? currentObject
               : parentState.m_containerForAbsolutePosition),
       m_svgTransform(parentState.m_svgTransform),
       m_pendingDelayedPaintInvalidations(
           parentState.m_pendingDelayedPaintInvalidations),
-      m_paintingLayer(
-          currentObject.hasLayer() &&
-                  toLayoutBoxModelObject(currentObject).hasSelfPaintingLayer()
-              ? *toLayoutBoxModelObject(currentObject).layer()
-              : parentState.m_paintingLayer)
+      m_paintingLayer(parentState.childPaintingLayer(currentObject))
 #if ENABLE(ASSERT)
       ,
       m_didUpdateForChildren(false)
 #endif
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
       ,
       m_canCheckFastPathSlowPathEquality(
           parentState.m_canCheckFastPathSlowPathEquality)
 #endif
 {
@@ skipping 22 matching lines @@
       m_paintInvalidationContainerForStackedContents =
           toLayoutBoxModelObject(&currentObject);
   } else if (currentObject.isLayoutView()) {
     // m_paintInvalidationContainerForStackedContents is only for stacked
     // descendants in its own frame, because it doesn't establish stacking
     // context for stacked contents in sub-frames. Contents stacked in the root
     // stacking context in this frame should use this frame's
     // paintInvalidationContainer.
     m_paintInvalidationContainerForStackedContents =
         m_paintInvalidationContainer;
+  } else if (currentObject.isFloating() &&
+             !currentObject.parent()->isLayoutBlock()) {
+    // See LayoutObject::paintingLayer() for specialty of floating objects.
+    m_paintInvalidationContainer =
+        &currentObject.containerForPaintInvalidation();
+    m_cachedOffsetsEnabled = false;
   } else if (currentObject.styleRef().isStacked() &&
              // This is to exclude some objects (e.g. LayoutText) inheriting
              // stacked style from parent but aren't actually stacked.
              currentObject.hasLayer() &&
              m_paintInvalidationContainer !=
                  m_paintInvalidationContainerForStackedContents) {
     // The current object is stacked, so we should use
     // m_paintInvalidationContainerForStackedContents as its paint invalidation
     // container on which the current object is painted.
     m_paintInvalidationContainer =
@@ skipping 65 matching lines @@
     m_paintOffset = LayoutSize();
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
     m_canCheckFastPathSlowPathEquality = true;
 #endif
     return;
   }
 
   updateForCurrentObject(parentState);
 }
 
+PaintLayer& PaintInvalidationState::childPaintingLayer(
+    const LayoutObject& child) const {
+  if (child.hasLayer() && toLayoutBoxModelObject(child).hasSelfPaintingLayer())
+    return *toLayoutBoxModelObject(child).layer();
+  // See LayoutObject::paintingLayer() for specialty of floating objects.
+  if (child.isFloating() && !m_currentObject.isLayoutBlock())
+    return *child.paintingLayer();
+  return m_paintingLayer;
+}
+
 void PaintInvalidationState::updateForCurrentObject(
     const PaintInvalidationState& parentState) {
   if (!m_cachedOffsetsEnabled)
     return;
 
   if (m_currentObject.isLayoutView()) {
     DCHECK(&parentState.m_currentObject ==
            LayoutAPIShim::layoutObjectFrom(
                toLayoutView(m_currentObject).frame()->ownerLayoutItem()));
     m_paintOffset +=
@@ skipping 385 matching lines @@
 }
 
 void PaintInvalidatorContextAdapter::mapLocalRectToPaintInvalidationBacking(
     const LayoutObject& object,
     LayoutRect& rect) const {
   DCHECK(&object == &m_paintInvalidationState.currentObject());
   m_paintInvalidationState.mapLocalRectToPaintInvalidationBacking(rect);
 }
 
 }  // namespace blink