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

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

Issue 2642763009: Fix paint and rect mapping issues for stacked float under stacked inline (Closed)
Patch Set: 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 903 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 if (!stackingNode()->isStacked()) { 920 if (!stackingNode()->isStacked()) {
921 // Floats have special painting order, which has complicated semantics. 921 // Floats have special painting order, which has complicated semantics.
922 // See the comments around FloatObject::setShouldPaint. 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()->canContainFloatingObject(*m_layoutObject))
925 return m_layoutObject->containingBlock()->enclosingLayer(); 925 return m_layoutObject->container()->enclosingLayer();
926 926
927 return parent(); 927 return parent();
928 } 928 }
929 if (PaintLayerStackingNode* ancestorStackingNode = 929 if (PaintLayerStackingNode* ancestorStackingNode =
930 stackingNode()->ancestorStackingContextNode()) 930 stackingNode()->ancestorStackingContextNode())
931 return ancestorStackingNode->layer(); 931 return ancestorStackingNode->layer();
932 return nullptr; 932 return nullptr;
933 } 933 }
934 934
935 bool PaintLayer::isPaintInvalidationContainer() const { 935 bool PaintLayer::isPaintInvalidationContainer() const {
(...skipping 2284 matching lines...) Expand 10 before | Expand all | Expand 10 after
3220 } 3220 }
3221 3221
3222 void showLayerTree(const blink::LayoutObject* layoutObject) { 3222 void showLayerTree(const blink::LayoutObject* layoutObject) {
3223 if (!layoutObject) { 3223 if (!layoutObject) {
3224 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; 3224 LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
3225 return; 3225 return;
3226 } 3226 }
3227 showLayerTree(layoutObject->enclosingLayer()); 3227 showLayerTree(layoutObject->enclosingLayer());
3228 } 3228 }
3229 #endif 3229 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698