Fixing deferred canvas bug caused by SkTwoPointConicalGradient declaring itself as opaque.

tests/DeferredCanvasTest.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkBitmap.h"
 #include "SkBitmapProcShader.h"
 #include "SkDeferredCanvas.h"
 #include "SkDevice.h"
+#include "SkGradientShader.h"
 #include "SkShader.h"
 
 static const int gWidth = 2;
 static const int gHeight = 2;
 
 static void create(SkBitmap* bm, SkBitmap::Config config, SkColor color) {
     bm->setConfig(config, gWidth, gHeight);
     bm->allocPixels();
     bm->eraseColor(color);
 }
@@ skipping 67 matching lines @@
     canvas.save(SkCanvas::kMatrixClip_SaveFlag);
     canvas.clipRect(partialRect, SkRegion::kIntersect_Op, false);
     canvas.clear(0x00000000);
     canvas.restore();
     REPORTER_ASSERT(reporter, canvas.isFreshFrame());
 
     // Verify that full frame rects with different forms of opaque paint
     // trigger frames to be marked as fresh
     {
         SkPaint paint;
-        paint.setStyle( SkPaint::kFill_Style );
-        paint.setAlpha( 255 );
+        paint.setStyle(SkPaint::kFill_Style);
+        paint.setAlpha(255);
         canvas.drawRect(fullRect, paint);
         REPORTER_ASSERT(reporter, canvas.isFreshFrame());
     }
     {
         SkPaint paint;
-        paint.setStyle( SkPaint::kFill_Style );
-        paint.setAlpha( 255 );
+        paint.setStyle(SkPaint::kFill_Style);
+        paint.setAlpha(255);
         paint.setXfermodeMode(SkXfermode::kSrcIn_Mode);
         canvas.drawRect(fullRect, paint);
         REPORTER_ASSERT(reporter, !canvas.isFreshFrame());
     }
     {
         SkPaint paint;
-        paint.setStyle( SkPaint::kFill_Style );
+        paint.setStyle(SkPaint::kFill_Style);
         SkBitmap bmp;
         create(&bmp, SkBitmap::kARGB_8888_Config, 0xFFFFFFFF);
         bmp.setIsOpaque(true);
         SkShader* shader = SkShader::CreateBitmapShader(bmp,
             SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
         paint.setShader(shader)->unref();
         canvas.drawRect(fullRect, paint);
         REPORTER_ASSERT(reporter, canvas.isFreshFrame());
     }
 
     // Verify that full frame rects with different forms of non-opaque paint
     // do not trigger frames to be marked as fresh
     {
         SkPaint paint;
-        paint.setStyle( SkPaint::kFill_Style );
-        paint.setAlpha( 254 );
+        paint.setStyle(SkPaint::kFill_Style);
+        paint.setAlpha(254);
         canvas.drawRect(fullRect, paint);
         REPORTER_ASSERT(reporter, !canvas.isFreshFrame());
     }
     {
         SkPaint paint;
-        paint.setStyle( SkPaint::kFill_Style );
+        paint.setStyle(SkPaint::kFill_Style);
+        // Defining a cone that partially overlaps the canvas
+        const SkPoint pt1 = SkPoint::Make(SkIntToScalar(0), SkIntToScalar(0));
+        const SkScalar r1 = SkIntToScalar(1);
+        const SkPoint pt2 = SkPoint::Make(SkIntToScalar(10), SkIntToScalar(0));
+        const SkScalar r2 = SkIntToScalar(5);
+        const SkColor colors[2] = {SK_ColorWHITE, SK_ColorWHITE};
+        const SkScalar pos[2] = {0, SK_Scalar1};
+        SkShader* shader = SkGradientShader::CreateTwoPointConical(
+            pt1, r1, pt2, r2, colors, pos, 2, SkShader::kClamp_TileMode, NULL);
+        paint.setShader(shader)->unref();
+        canvas.drawRect(fullRect, paint);
+        REPORTER_ASSERT(reporter, !canvas.isFreshFrame());
+    }
+    {
+        SkPaint paint;
+        paint.setStyle(SkPaint::kFill_Style);
         SkBitmap bmp;
         create(&bmp, SkBitmap::kARGB_8888_Config, 0xFFFFFFFF);
         bmp.setIsOpaque(false);
         SkShader* shader = SkShader::CreateBitmapShader(bmp,
             SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
         paint.setShader(shader)->unref();
         canvas.drawRect(fullRect, paint);
         REPORTER_ASSERT(reporter, !canvas.isFreshFrame());
     }
 
@@ skipping 14 matching lines @@
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
         paint.setAlpha(255);
         canvas.drawRect(fullRect, paint);
         canvas.restore();
         REPORTER_ASSERT(reporter, !canvas.isFreshFrame());
     }
     {
         canvas.save(SkCanvas::kMatrixClip_SaveFlag);
         SkPaint paint;
-        paint.setStyle( SkPaint::kFill_Style );
-        paint.setAlpha( 255 );
+        paint.setStyle(SkPaint::kFill_Style);
+        paint.setAlpha(255);
         SkPath path;
         path.addCircle(SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(2));
         canvas.clipPath(path, SkRegion::kIntersect_Op, false);
         canvas.drawRect(fullRect, paint);
         canvas.restore();
         REPORTER_ASSERT(reporter, !canvas.isFreshFrame());
     }
 
     // Verify that stroked rect does not trigger a fresh frame
     {
         SkPaint paint;
-        paint.setStyle( SkPaint::kStroke_Style );
-        paint.setAlpha( 255 );
+        paint.setStyle(SkPaint::kStroke_Style);
+        paint.setAlpha(255);
         canvas.drawRect(fullRect, paint);
         REPORTER_ASSERT(reporter, !canvas.isFreshFrame());
     }
 
     // Verify kSrcMode triggers a fresh frame even with transparent color
     {
         SkPaint paint;
-        paint.setStyle( SkPaint::kFill_Style );
-        paint.setAlpha( 100 );
+        paint.setStyle(SkPaint::kFill_Style);
+        paint.setAlpha(100);
         paint.setXfermodeMode(SkXfermode::kSrc_Mode);
         canvas.drawRect(fullRect, paint);
         REPORTER_ASSERT(reporter, canvas.isFreshFrame());
     }
 }
 
 class MockDevice : public SkDevice {
 public:
     MockDevice(const SkBitmap& bm) : SkDevice(bm) {
         fDrawBitmapCallCount = 0;
@@ skipping 248 matching lines @@
     TestDeferredCanvasFreshFrame(reporter);
     TestDeferredCanvasMemoryLimit(reporter);
     TestDeferredCanvasBitmapCaching(reporter);
     TestDeferredCanvasSkip(reporter);
     TestDeferredCanvasBitmapShaderNoLeak(reporter);
     TestDeferredCanvasBitmapSizeThreshold(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("DeferredCanvas", TestDeferredCanvasClass, TestDeferredCanvas)