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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayer.cpp

Issue 2640053004: Fix compositingContainer for stacked inlines. (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 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 TransformState transformState(TransformState::ApplyTransformDirection, 910 TransformState transformState(TransformState::ApplyTransformDirection,
911 FloatPoint()); 911 FloatPoint());
912 layoutObject()->mapLocalToAncestor( 912 layoutObject()->mapLocalToAncestor(
913 transformAncestor() ? transformAncestor()->layoutObject() : nullptr, 913 transformAncestor() ? transformAncestor()->layoutObject() : nullptr,
914 transformState, 0); 914 transformState, 0);
915 transformState.flatten(); 915 transformState.flatten();
916 return LayoutPoint(transformState.lastPlanarPoint()); 916 return LayoutPoint(transformState.lastPlanarPoint());
917 } 917 }
918 918
919 PaintLayer* PaintLayer::compositingContainer() const { 919 PaintLayer* PaintLayer::compositingContainer() const {
920 // Floats have special painting order, which has complicated semantics. 920 if (!stackingNode()->isStacked()) {
921 // See the comments around FloatObject::setShouldPaint. 921 // Floats have special painting order, which has complicated semantics.
922 if (m_layoutObject->isFloating() && m_layoutObject->parent() && 922 // See the comments around FloatObject::setShouldPaint.
923 !m_layoutObject->parent()->isLayoutBlockFlow()) 923 if (m_layoutObject->isFloating() && m_layoutObject->parent() &&
924 return m_layoutObject->containingBlock()->enclosingLayer(); 924 !m_layoutObject->parent()->isLayoutBlockFlow())
925 if (!stackingNode()->isStacked()) 925 return m_layoutObject->containingBlock()->enclosingLayer();
926
926 return parent(); 927 return parent();
928 }
927 if (PaintLayerStackingNode* ancestorStackingNode = 929 if (PaintLayerStackingNode* ancestorStackingNode =
928 stackingNode()->ancestorStackingContextNode()) 930 stackingNode()->ancestorStackingContextNode())
929 return ancestorStackingNode->layer(); 931 return ancestorStackingNode->layer();
930 return nullptr; 932 return nullptr;
931 } 933 }
932 934
933 bool PaintLayer::isPaintInvalidationContainer() const { 935 bool PaintLayer::isPaintInvalidationContainer() const {
934 return compositingState() == PaintsIntoOwnBacking || 936 return compositingState() == PaintsIntoOwnBacking ||
935 compositingState() == PaintsIntoGroupedBacking; 937 compositingState() == PaintsIntoGroupedBacking;
936 } 938 }
(...skipping 2284 matching lines...) Expand 10 before | Expand all | Expand 10 after
3221 } 3223 }
3222 3224
3223 void showLayerTree(const blink::LayoutObject* layoutObject) { 3225 void showLayerTree(const blink::LayoutObject* layoutObject) {
3224 if (!layoutObject) { 3226 if (!layoutObject) {
3225 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; 3227 LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
3226 return; 3228 return;
3227 } 3229 }
3228 showLayerTree(layoutObject->enclosingLayer()); 3230 showLayerTree(layoutObject->enclosingLayer());
3229 } 3231 }
3230 #endif 3232 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698