Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp |
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
index 8778e090b49c6ce94ff53a238e98e37b4aabf8c0..e02b48d3b0a5663e1a278fa803cbf79210457d43 100644 |
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
@@ -921,8 +921,8 @@ PaintLayer* PaintLayer::compositingContainer() const { |
// Floats have special painting order, which has complicated semantics. |
// See the comments around FloatObject::setShouldPaint. |
if (m_layoutObject->isFloating() && m_layoutObject->parent() && |
- !m_layoutObject->parent()->isLayoutBlockFlow()) |
- return m_layoutObject->containingBlock()->enclosingLayer(); |
+ !m_layoutObject->parent()->canContainFloatingObject(*m_layoutObject)) |
+ return m_layoutObject->container()->enclosingLayer(); |
return parent(); |
} |