Fix paint and rect mapping issues for stacked float under stacked inline

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

Index: third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
diff --git a/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp b/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
index 4e53b1713158fbef980c3cca954ebf42ed36c961..e61374e10d65d069e2db4f88a362873b74a1aec8 100644
--- a/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
+++ b/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
@@ -134,8 +134,7 @@ PaintInvalidationState::PaintInvalidationState(
     m_paintInvalidationContainerForStackedContents =
         m_paintInvalidationContainer;
   } else if (currentObject.isFloating() &&
-             !currentObject.parent()->isLayoutBlock()) {
-    // See LayoutObject::paintingLayer() for specialty of floating objects.
+             !currentObject.parent()->canContainFloatingObject(currentObject)) {
     m_paintInvalidationContainer =
         &currentObject.containerForPaintInvalidation();
     m_cachedOffsetsEnabled = false;
@@ -231,7 +230,7 @@ PaintLayer& PaintInvalidationState::childPaintingLayer(
   // See LayoutObject::paintingLayer() for the special-cases of floating under
   // inline and multicolumn.
   if (child.isColumnSpanAll() ||
-      (child.isFloating() && !m_currentObject.isLayoutBlock()))
+      (child.isFloating() && !child.parent()->canContainFloatingObject(child)))
     return *child.paintingLayer();
   return m_paintingLayer;
 }