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

Unified Diff: skia/ext/analysis_canvas.cc

Issue 16667017: Revert 198272 "cc: Move canvas clear from picture to picture_pil..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/picture_pile_impl.cc ('k') | skia/ext/analysis_canvas_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/analysis_canvas.cc
===================================================================
--- skia/ext/analysis_canvas.cc (revision 205297)
+++ skia/ext/analysis_canvas.cc (working copy)
@@ -122,8 +122,7 @@
}
void AnalysisDevice::drawPaint(const SkDraw&, const SkPaint& paint) {
- isSolidColor_ =
- (isSolidColor_ && isSolidColorPaint(paint) && paint.getColor() == color_);
+ isSolidColor_ = false;
isTransparent_ = false;
}
@@ -168,12 +167,9 @@
// - We're not in "forced not solid" mode
// - Paint is solid color
// - The quad is a full tile quad
- // - The exception is if the tile is already solid tile,
- // and we're drawing the same solid color paint then
- // the tile remains solid.
if (!isForcedNotSolid_ &&
isSolidColorPaint(paint) &&
- (doesCoverCanvas || (isSolidColor_ && paint.getColor() == color_))) {
+ doesCoverCanvas) {
isSolidColor_ = true;
color_ = paint.getColor();
hasText_ = false;
« no previous file with comments | « cc/resources/picture_pile_impl.cc ('k') | skia/ext/analysis_canvas_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698