Revert of cc: Combine analysis and raster

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 {
 
 void SolidColorFill(skia::AnalysisCanvas& canvas) {
   canvas.clear(SkColorSetARGB(255, 255, 255, 255));
 }
 
 void TransparentFill(skia::AnalysisCanvas& canvas) {
   canvas.clear(SkColorSetARGB(0, 0, 0, 0));
 }
 
 } // namespace
-
 namespace skia {
 
 TEST(AnalysisCanvasTest, EmptyCanvas) {
   SkBitmap emptyBitmap;
   emptyBitmap.setConfig(SkBitmap::kNo_Config, 255, 255);
   skia::AnalysisDevice device(emptyBitmap);
   skia::AnalysisCanvas canvas(&device);
 
   SkColor color;
   EXPECT_TRUE(canvas.GetColorIfSolid(&color));
@@ skipping 304 matching lines @@
     EXPECT_TRUE(canvas.HasText());
   }
   {
     // Test SkCanvas::drawTextOnPath.
     skia::AnalysisDevice device(bitmap);
     skia::AnalysisCanvas canvas(&device);
     canvas.drawTextOnPath(text, byteLength, path, NULL, paint);
     EXPECT_TRUE(canvas.HasText());
   }
   {
+    // Text under opaque rect.
+    skia::AnalysisDevice device(bitmap);
+    skia::AnalysisCanvas canvas(&device);
+    canvas.drawText(text, byteLength, point.fX, point.fY, paint);
+    EXPECT_TRUE(canvas.HasText());
+    canvas.drawRect(SkRect::MakeWH(width, height), paint);
+    EXPECT_FALSE(canvas.HasText());
+  }
+  {
     // Text under translucent rect.
     skia::AnalysisDevice device(bitmap);
     skia::AnalysisCanvas canvas(&device);
     canvas.drawText(text, byteLength, point.fX, point.fY, paint);
     EXPECT_TRUE(canvas.HasText());
     SkPaint translucentPaint;
     translucentPaint.setColor(0x88FFFFFF);
     canvas.drawRect(SkRect::MakeWH(width, height), translucentPaint);
     EXPECT_TRUE(canvas.HasText());
   }
   {
+    // Text under rect in clear mode.
+    skia::AnalysisDevice device(bitmap);
+    skia::AnalysisCanvas canvas(&device);
+    canvas.drawText(text, byteLength, point.fX, point.fY, paint);
+    EXPECT_TRUE(canvas.HasText());
+    SkPaint clearModePaint;
+    clearModePaint.setXfermodeMode(SkXfermode::kClear_Mode);
+    canvas.drawRect(SkRect::MakeWH(width, height), clearModePaint);
+    EXPECT_FALSE(canvas.HasText());
+  }
+  {
     // Clear.
     skia::AnalysisDevice device(bitmap);
     skia::AnalysisCanvas canvas(&device);
     canvas.drawText(text, byteLength, point.fX, point.fY, paint);
     EXPECT_TRUE(canvas.HasText());
     canvas.clear(SK_ColorGRAY);
     EXPECT_FALSE(canvas.HasText());
   }
   {
     // Text inside clip region.
@@ skipping 11 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