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

skia/ext/analysis_canvas_unittest.cc

Index: skia/ext/analysis_canvas_unittest.cc
diff --git a/skia/ext/analysis_canvas_unittest.cc b/skia/ext/analysis_canvas_unittest.cc
index a8a9d0dd611f478aec6b295f2d51f266db8263b2..15692d21fec798856a7e07473143b2464c8fb443 100644
--- a/skia/ext/analysis_canvas_unittest.cc
+++ b/skia/ext/analysis_canvas_unittest.cc
@@ -248,12 +248,21 @@ TEST(AnalysisCanvasTest, SimpleDrawRect) {
   EXPECT_TRUE(canvas.isCheap());
   EXPECT_EQ(color, outputColor);
 
+  // Paint with the same color, tile should remain solid.
   canvas.rotate(50);
   canvas.drawRect(SkRect::MakeWH(255, 255), paint);
 
-  EXPECT_FALSE(canvas.getColorIfSolid(&outputColor));
+  EXPECT_TRUE(canvas.getColorIfSolid(&outputColor));
   EXPECT_FALSE(canvas.isTransparent());
   EXPECT_TRUE(canvas.isCheap());
+  EXPECT_EQ(color, outputColor);
+
+  color = SkColorSetARGB(255, 12, 23, 34);
+  paint.setColor(color);
+  paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
+  canvas.drawRect(SkRect::MakeWH(255, 255), paint);
+  EXPECT_FALSE(canvas.getColorIfSolid(&outputColor));
+  EXPECT_FALSE(canvas.isTransparent());
 }
 
 TEST(AnalysisCanvasTest, ClipPath) {