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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayer.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Robert O'Callahan <roc+@cs.cmu.edu> 8 * Robert O'Callahan <roc+@cs.cmu.edu>
9 * David Baron <dbaron@fas.harvard.edu> 9 * David Baron <dbaron@fas.harvard.edu>
10 * Christian Biesinger <cbiesinger@web.de> 10 * Christian Biesinger <cbiesinger@web.de>
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 TransformState transformState(TransformState::ApplyTransformDirection, 911 TransformState transformState(TransformState::ApplyTransformDirection,
912 FloatPoint()); 912 FloatPoint());
913 layoutObject()->mapLocalToAncestor( 913 layoutObject()->mapLocalToAncestor(
914 transformAncestor() ? transformAncestor()->layoutObject() : nullptr, 914 transformAncestor() ? transformAncestor()->layoutObject() : nullptr,
915 transformState, 0); 915 transformState, 0);
916 transformState.flatten(); 916 transformState.flatten();
917 return LayoutPoint(transformState.lastPlanarPoint()); 917 return LayoutPoint(transformState.lastPlanarPoint());
918 } 918 }
919 919
920 PaintLayer* PaintLayer::compositingContainer() const { 920 PaintLayer* PaintLayer::compositingContainer() const {
921 // Floats have special paintinng order. Also, the container does not need 921 // Floats have special painting order, which has complicated semantics.
922 // to be a stacking context, because floats are not stacked. 922 // See the comments around FloatObject::setShouldPaint.
923 if (m_layoutObject->isFloating() && m_layoutObject->parent() && 923 if (m_layoutObject->isFloating() && m_layoutObject->parent() &&
924 !m_layoutObject->parent()->isLayoutBlockFlow()) 924 !m_layoutObject->parent()->isLayoutBlockFlow())
925 return m_layoutObject->containingBlock()->enclosingLayer(); 925 return m_layoutObject->containingBlock()->enclosingLayer();
926 if (!stackingNode()->isStacked()) 926 if (!stackingNode()->isStacked())
927 return parent(); 927 return parent();
928 if (PaintLayerStackingNode* ancestorStackingNode = 928 if (PaintLayerStackingNode* ancestorStackingNode =
929 stackingNode()->ancestorStackingContextNode()) 929 stackingNode()->ancestorStackingContextNode())
930 return ancestorStackingNode->layer(); 930 return ancestorStackingNode->layer();
931 return nullptr; 931 return nullptr;
932 } 932 }
(...skipping 2295 matching lines...) Expand 10 before | Expand all | Expand 10 after
3228 } 3228 }
3229 3229
3230 void showLayerTree(const blink::LayoutObject* layoutObject) { 3230 void showLayerTree(const blink::LayoutObject* layoutObject) {
3231 if (!layoutObject) { 3231 if (!layoutObject) {
3232 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; 3232 LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
3233 return; 3233 return;
3234 } 3234 }
3235 showLayerTree(layoutObject->enclosingLayer()); 3235 showLayerTree(layoutObject->enclosingLayer());
3236 } 3236 }
3237 #endif 3237 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698