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

Side by Side Diff: sky/engine/core/rendering/RenderLayer.cpp

Issue 756183004: Get rid of background-clip:text and PaintBehaviorForceBlackText. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove forceBlackText Created 6 years 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 reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 } 1129 }
1130 1130
1131 // If this layer's renderer is a child of the paintingRoot, we render uncond itionally, which 1131 // If this layer's renderer is a child of the paintingRoot, we render uncond itionally, which
1132 // is done by passing a nil paintingRoot down to our renderer (as if no pain tingRoot was ever set). 1132 // is done by passing a nil paintingRoot down to our renderer (as if no pain tingRoot was ever set).
1133 // Else, our renderer tree may or may not contain the painting root, so we p ass that root along 1133 // Else, our renderer tree may or may not contain the painting root, so we p ass that root along
1134 // so it will be tested against as we descend through the renderers. 1134 // so it will be tested against as we descend through the renderers.
1135 RenderObject* paintingRootForRenderer = 0; 1135 RenderObject* paintingRootForRenderer = 0;
1136 if (localPaintingInfo.paintingRoot && !renderer()->isDescendantOf(localPaint ingInfo.paintingRoot)) 1136 if (localPaintingInfo.paintingRoot && !renderer()->isDescendantOf(localPaint ingInfo.paintingRoot))
1137 paintingRootForRenderer = localPaintingInfo.paintingRoot; 1137 paintingRootForRenderer = localPaintingInfo.paintingRoot;
1138 1138
1139 ASSERT(!(localPaintingInfo.paintBehavior & PaintBehaviorForceBlackText));
1140
1141 bool shouldPaintBackground = isPaintingCompositedBackground && shouldPaintCo ntent; 1139 bool shouldPaintBackground = isPaintingCompositedBackground && shouldPaintCo ntent;
1142 bool shouldPaintNegZOrderList = !isPaintingScrollingContent && isPaintingCom positedBackground; 1140 bool shouldPaintNegZOrderList = !isPaintingScrollingContent && isPaintingCom positedBackground;
1143 bool shouldPaintOwnContents = isPaintingCompositedForeground && shouldPaintC ontent; 1141 bool shouldPaintOwnContents = isPaintingCompositedForeground && shouldPaintC ontent;
1144 bool shouldPaintNormalFlowAndPosZOrderLists = isPaintingCompositedForeground ; 1142 bool shouldPaintNormalFlowAndPosZOrderLists = isPaintingCompositedForeground ;
1145 bool shouldPaintOverlayScrollbars = isPaintingOverlayScrollbars; 1143 bool shouldPaintOverlayScrollbars = isPaintingOverlayScrollbars;
1146 bool shouldPaintMask = (paintFlags & PaintLayerPaintingCompositingMaskPhase) && shouldPaintContent && renderer()->hasMask(); 1144 bool shouldPaintMask = (paintFlags & PaintLayerPaintingCompositingMaskPhase) && shouldPaintContent && renderer()->hasMask();
1147 1145
1148 // FIXME(sky): Get rid of PaintBehavior argument now that it's always Normal . 1146 // FIXME(sky): Get rid of PaintBehavior argument now that it's always Normal .
1149 PaintBehavior paintBehavior = PaintBehaviorNormal; 1147 PaintBehavior paintBehavior = PaintBehaviorNormal;
1150 1148
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
2188 } 2186 }
2189 } 2187 }
2190 2188
2191 void showLayerTree(const blink::RenderObject* renderer) 2189 void showLayerTree(const blink::RenderObject* renderer)
2192 { 2190 {
2193 if (!renderer) 2191 if (!renderer)
2194 return; 2192 return;
2195 showLayerTree(renderer->enclosingLayer()); 2193 showLayerTree(renderer->enclosingLayer());
2196 } 2194 }
2197 #endif 2195 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBoxModelObject.cpp ('k') | sky/engine/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698