Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: third_party/WebKit/Source/core/layout/compositing/GraphicsLayerUpdater.cpp

Issue 2624843002: Return the enclosing composited PaintLayer rather than containingBlock for floats. (Closed)
Patch Set: none Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/PaintLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/compositing/GraphicsLayerUpdater.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/GraphicsLayerUpdater.cpp b/third_party/WebKit/Source/core/layout/compositing/GraphicsLayerUpdater.cpp
index 855f5175449b065ce7e74c8c996b20c9eca7369b..001c0fbda6b7918ff442713eb9e9c4ead9e0c85b 100644
--- a/third_party/WebKit/Source/core/layout/compositing/GraphicsLayerUpdater.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/GraphicsLayerUpdater.cpp
@@ -57,8 +57,9 @@ class GraphicsLayerUpdater::UpdateContext {
// TODO(chrishtr) this is not very performant for floats, but they should
// be uncommon enough, and SPv2 will remove this code.
if (layer.layoutObject()->isFloating() && layer.layoutObject()->parent() &&
- !layer.layoutObject()->parent()->isLayoutBlockFlow())
- return layer.layoutObject()->containingBlock()->enclosingLayer();
+ !layer.layoutObject()->parent()->isLayoutBlockFlow()) {
+ return layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf);
+ }
return layer.stackingNode()->isStacked() ? m_compositingStackingContext
: m_compositingAncestor;
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/PaintLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698