Consider conical shader opaque if it covers entire plane.

tests/GradientTest.cpp

 
 /*
  * Copyright 2011 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 "SkDevice.h"
 #include "SkTemplates.h"
@@ skipping 108 matching lines @@
                                                              rec.fRadius[1],
                                                              rec.fColors,
                                                              rec.fPos,
                                                              rec.fColorCount,
                                                              rec.fTileMode));
 
     SkShader::GradientInfo info;
     rec.gradCheck(reporter, s, &info, SkShader::kConical_GradientType);
     REPORTER_ASSERT(reporter, !memcmp(info.fPoint, rec.fPoint, 2 * sizeof(SkPoint)));
     REPORTER_ASSERT(reporter, !memcmp(info.fRadius, rec.fRadius, 2 * sizeof(SkScalar)));
+    REPORTER_ASSERT(reporter, !s->isOpaque());
+}
+
+// 2-point radial gradient should behave as opaque when it extends to the entire plane
+static void conical_gradproc_opaque(skiatest::Reporter* reporter, const GradRec& rec) {
+    SkAutoTUnref<SkShader> s(SkGradientShader::CreateTwoPointConical(rec.fPoint[0],
+                                                             rec.fRadius[0],
+                                                             rec.fPoint[0],
+                                                             rec.fRadius[1],
+                                                             rec.fColors,
+                                                             rec.fPos,
+                                                             rec.fColorCount,
+                                                             rec.fTileMode));
+    REPORTER_ASSERT(reporter, s->isOpaque());
+}
+
+// 2nd circle center lies on edge of first circle should not be considered opaque
+static void conical_gradproc_not_opaque(skiatest::Reporter* reporter, const GradRec& rec) {
+    SkAutoTUnref<SkShader> s(SkGradientShader::CreateTwoPointConical(rec.fPoint[1],
+                                                             rec.fRadius[1],

[Justin Novosad, 2013/07/04 14:01:47]

Unaligned indentation

+                                                             SkPoint::Make(rec.fPoint[1].x() + rec.fRadius[1], rec.fPoint[1].y()),

[Justin Novosad, 2013/07/04 14:01:47]

In skia we limit lines to 100 columns.

+                                                             rec.fRadius[0],
+                                                             rec.fColors,
+                                                             rec.fPos,
+                                                             rec.fColorCount,
+                                                             rec.fTileMode));
+    REPORTER_ASSERT(reporter, !s->isOpaque());
 }
 
 // Ensure that repeated color gradients behave like drawing a single color
 static void TestConstantGradient(skiatest::Reporter*) {
     const SkPoint pts[] = {
         { 0, 0 },
         { SkIntToScalar(10), 0 }
     };
     SkColor colors[] = { SK_ColorBLUE, SK_ColorBLUE };
     const SkScalar pos[] = { 0, SK_Scalar1 };
@@ skipping 39 matching lines @@
     rec.fTileMode = SkShader::kClamp_TileMode;
 
     static const GradProc gProcs[] = {
         none_gradproc,
         color_gradproc,
         linear_gradproc,
         radial_gradproc,
         radial2_gradproc,
         sweep_gradproc,
         conical_gradproc,
+        conical_gradproc_opaque,
+        conical_gradproc_not_opaque,
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gProcs); ++i) {
         gProcs[i](reporter, rec);
     }
 }
 
 static void TestGradients(skiatest::Reporter* reporter) {
     TestGradientShaders(reporter);
     TestConstantGradient(reporter);
 }
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Gradients", TestGradientsClass, TestGradients)