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

skia/ext/analysis_canvas_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/compiler_specific.h"
 #include "skia/ext/analysis_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace {
@@ skipping 230 matching lines @@
   color = SkColorSetARGB(255, 11, 22, 33);
   paint.setColor(color);
   paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
   canvas.drawRect(SkRect::MakeWH(255, 255), paint);
 
   EXPECT_TRUE(canvas.getColorIfSolid(&outputColor));
   EXPECT_FALSE(canvas.isTransparent());
   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_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());
-  EXPECT_TRUE(canvas.isCheap());
 }
 
 TEST(AnalysisCanvasTest, ClipPath) {
   SkBitmap emptyBitmap;
   emptyBitmap.setConfig(SkBitmap::kNo_Config, 255, 255);
   skia::AnalysisDevice device(emptyBitmap);
   skia::AnalysisCanvas canvas(&device);
 
   SkPath path;
   path.moveTo(0, 0);
@@ skipping 306 matching lines @@
     canvas.drawText(text, byteLength, point.fX, point.fY, paint);
     // Analysis device does not do any clipping.
     // So even when text is outside the clip region,
     // it is marked as having the text.
     // TODO(alokp): We may be able to do some trivial rejection.
     EXPECT_TRUE(canvas.hasText());
   }
 }
 
 }  // namespace skia