Revert "cc: Move canvas clear from picture to picture_pile_impl"

skia/ext/analysis_canvas.cc

Index: skia/ext/analysis_canvas.cc
diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc
index 467f62c421360a0ecdc2f78fbc730949452396e0..cf13127d87dc4ef113415ffa7a0b58dc0a697086 100644
--- a/skia/ext/analysis_canvas.cc
+++ b/skia/ext/analysis_canvas.cc
@@ -122,8 +122,7 @@ void AnalysisDevice::clear(SkColor color) {
 }
 
 void AnalysisDevice::drawPaint(const SkDraw&, const SkPaint& paint) {
-  isSolidColor_ =
-      (isSolidColor_ && isSolidColorPaint(paint) && paint.getColor() == color_);
+  isSolidColor_ = false;
   isTransparent_ = false;
 }
 
@@ -168,12 +167,9 @@ void AnalysisDevice::drawRect(const SkDraw& draw, const SkRect& rect,
   // - 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;