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

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

Issue 2690633002: Fix PaintLayer::compositingContainer for self-painting non-stacked layers (Closed)
Patch Set: Created 3 years, 10 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 903 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 if (!stackingNode()->isStacked()) { 921 if (!stackingNode()->isStacked()) {
922 // Floats have special painting order, which has complicated semantics. 922 // Floats have special painting order, which has complicated semantics.
923 // See the comments around FloatObject::setShouldPaint. 923 // See the comments around FloatObject::setShouldPaint.
924 if (m_layoutObject->isFloating() && m_layoutObject->parent() && 924 if (!isSelfPaintingLayer() && m_layoutObject->isFloating() &&
925 m_layoutObject->parent() &&
925 !m_layoutObject->parent()->isLayoutBlockFlow()) 926 !m_layoutObject->parent()->isLayoutBlockFlow())
926 return m_layoutObject->containingBlock()->enclosingLayer(); 927 return m_layoutObject->containingBlock()->enclosingLayer();
927 928
928 return parent(); 929 return parent();
929 } 930 }
930 if (PaintLayerStackingNode* ancestorStackingNode = 931 if (PaintLayerStackingNode* ancestorStackingNode =
931 stackingNode()->ancestorStackingContextNode()) 932 stackingNode()->ancestorStackingContextNode())
932 return ancestorStackingNode->layer(); 933 return ancestorStackingNode->layer();
933 return nullptr; 934 return nullptr;
934 } 935 }
(...skipping 2284 matching lines...) Expand 10 before | Expand all | Expand 10 after
3219 } 3220 }
3220 3221
3221 void showLayerTree(const blink::LayoutObject* layoutObject) { 3222 void showLayerTree(const blink::LayoutObject* layoutObject) {
3222 if (!layoutObject) { 3223 if (!layoutObject) {
3223 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; 3224 LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
3224 return; 3225 return;
3225 } 3226 }
3226 showLayerTree(layoutObject->enclosingLayer()); 3227 showLayerTree(layoutObject->enclosingLayer());
3227 } 3228 }
3228 #endif 3229 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698