Consider conical shader opaque if it covers entire plane.

tests/GradientTest.cpp

Index: tests/GradientTest.cpp
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index cf8fbee20635614d275c9ae93c07298dd3bcdee1..b8524dad82b7ad9030b2a80c3d908ae287780fa7 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -126,6 +126,33 @@ static void conical_gradproc(skiatest::Reporter* reporter, const GradRec& rec) {
     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
@@ -185,6 +212,8 @@ static void TestGradientShaders(skiatest::Reporter* reporter) {
         radial2_gradproc,
         sweep_gradproc,
         conical_gradproc,
+        conical_gradproc_opaque,
+        conical_gradproc_not_opaque,
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gProcs); ++i) {