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

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

Issue 735033003: Remove a bunch of dead code from RenderLayer (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cr comments 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) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 1198
1199 // Move x/y to our coordinates. 1199 // Move x/y to our coordinates.
1200 LayoutRect localRect(frameRect); 1200 LayoutRect localRect(frameRect);
1201 LayoutPoint adjustedPaintOffset = paintOffset + localRect.location(); 1201 LayoutPoint adjustedPaintOffset = paintOffset + localRect.location();
1202 1202
1203 const NinePieceImage& maskNinePieceImage = renderer().style()->maskBoxImage( ); 1203 const NinePieceImage& maskNinePieceImage = renderer().style()->maskBoxImage( );
1204 StyleImage* maskBoxImage = renderer().style()->maskBoxImage().image(); 1204 StyleImage* maskBoxImage = renderer().style()->maskBoxImage().image();
1205 1205
1206 // Figure out if we need to push a transparency layer to render our mask. 1206 // Figure out if we need to push a transparency layer to render our mask.
1207 bool pushTransparencyLayer = false; 1207 bool pushTransparencyLayer = false;
1208 bool compositedMask = renderer().hasLayer() && boxModelObject()->layer()->ha sCompositedMask();
1209 bool flattenCompositingLayers = renderer().view()->frameView() && renderer() .view()->frameView()->paintBehavior() & PaintBehaviorFlattenCompositingLayers; 1208 bool flattenCompositingLayers = renderer().view()->frameView() && renderer() .view()->frameView()->paintBehavior() & PaintBehaviorFlattenCompositingLayers;
1210 CompositeOperator compositeOp = CompositeSourceOver; 1209 CompositeOperator compositeOp = CompositeSourceOver;
1211 if (!compositedMask || flattenCompositingLayers) { 1210 if (flattenCompositingLayers) {
1212 if ((maskBoxImage && renderer().style()->maskLayers().hasImage()) || ren derer().style()->maskLayers().next()) 1211 if ((maskBoxImage && renderer().style()->maskLayers().hasImage()) || ren derer().style()->maskLayers().next())
1213 pushTransparencyLayer = true; 1212 pushTransparencyLayer = true;
1214 1213
1215 compositeOp = CompositeDestinationIn; 1214 compositeOp = CompositeDestinationIn;
1216 if (pushTransparencyLayer) { 1215 if (pushTransparencyLayer) {
1217 paintInfo.context->setCompositeOperation(CompositeDestinationIn); 1216 paintInfo.context->setCompositeOperation(CompositeDestinationIn);
1218 paintInfo.context->beginTransparencyLayer(1.0f); 1217 paintInfo.context->beginTransparencyLayer(1.0f);
1219 compositeOp = CompositeSourceOver; 1218 compositeOp = CompositeSourceOver;
1220 } 1219 }
1221 } 1220 }
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 ASSERT(child->prevOnLine() == prev); 1446 ASSERT(child->prevOnLine() == prev);
1448 prev = child; 1447 prev = child;
1449 } 1448 }
1450 ASSERT(prev == m_lastChild); 1449 ASSERT(prev == m_lastChild);
1451 #endif 1450 #endif
1452 } 1451 }
1453 1452
1454 #endif 1453 #endif
1455 1454
1456 } // namespace blink 1455 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/html/canvas/WebGLRenderingContextBase.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698