Fix SkStrokeRec == to report true for all fills

tests/StrokeTest.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 "SkPaint.h"
 #include "SkPath.h"
 #include "SkRect.h"
 #include "SkStroke.h"
+#include "SkStrokeRec.h"
 #include "Test.h"
 
 static bool equal(const SkRect& a, const SkRect& b) {
     return  SkScalarNearlyEqual(a.left(), b.left()) &&
             SkScalarNearlyEqual(a.top(), b.top()) &&
             SkScalarNearlyEqual(a.right(), b.right()) &&
             SkScalarNearlyEqual(a.bottom(), b.bottom());
 }
 
 static void test_strokecubic(skiatest::Reporter* reporter) {
@@ skipping 55 matching lines @@
         REPORTER_ASSERT(reporter, fillPath.isNestedFillRects(nested) == isMiter);
         if (isMiter) {
             SkRect inner(r);
             inner.inset(width/2, width/2);
             REPORTER_ASSERT(reporter, equal(nested[0], outer));
             REPORTER_ASSERT(reporter, equal(nested[1], inner));
         }
     }
 }
 
+static void test_strokerec_equality(skiatest::Reporter* reporter) {
+    {
+        SkStrokeRec s1(SkStrokeRec::kFill_InitStyle);
+        SkStrokeRec s2(SkStrokeRec::kFill_InitStyle);
+        REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+
+        // Test that style mismatch is detected.
+        s2.setHairlineStyle();
+        REPORTER_ASSERT(reporter, !s1.hasEqualEffect(s2));
+
+        s1.setHairlineStyle();
+        REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+
+        // ResScale is not part of equality.
+        s1.setResScale(2.1f);
+        s2.setResScale(1.2f);
+        REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+        s1.setFillStyle();
+        s2.setFillStyle();
+        REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+        s1.setStrokeStyle(1.0f, false);
+        s2.setStrokeStyle(1.0f, false);
+        s1.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kRound_Join, 2.9f);
+        s2.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kRound_Join, 2.9f);
+        REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+    }
+
+    // Stroke parameters on fill or hairline style are not part of equality.
+    {
+        SkStrokeRec s1(SkStrokeRec::kFill_InitStyle);
+        SkStrokeRec s2(SkStrokeRec::kFill_InitStyle);
+        for (int i = 0; i < 2; ++i) {
+            s1.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kRound_Join, 2.9f);
+            s2.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kRound_Join, 2.1f);
+            REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+            s2.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kBevel_Join, 2.9f);
+            REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+            s2.setStrokeParams(SkPaint::kRound_Cap, SkPaint::kRound_Join, 2.9f);
+            REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+            s1.setHairlineStyle();
+            s2.setHairlineStyle();
+        }
+    }
+
+    // Stroke parameters on stroke style are part of equality.
+    {
+        SkStrokeRec s1(SkStrokeRec::kFill_InitStyle);
+        SkStrokeRec s2(SkStrokeRec::kFill_InitStyle);
+        s1.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kRound_Join, 2.9f);
+        s2.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kRound_Join, 2.9f);
+        s1.setStrokeStyle(1.0f, false);
+
+        s2.setStrokeStyle(1.0f, true);
+        REPORTER_ASSERT(reporter, !s1.hasEqualEffect(s2));
+
+        s2.setStrokeStyle(2.1f, false);
+        REPORTER_ASSERT(reporter, !s1.hasEqualEffect(s2));
+
+        s2.setStrokeStyle(1.0f, false);
+        REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+
+        s2.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kRound_Join, 2.1f);
+        REPORTER_ASSERT(reporter, !s1.hasEqualEffect(s2));
+        s2.setStrokeParams(SkPaint::kButt_Cap, SkPaint::kBevel_Join, 2.9f);
+        REPORTER_ASSERT(reporter, !s1.hasEqualEffect(s2));
+        s2.setStrokeParams(SkPaint::kRound_Cap, SkPaint::kRound_Join, 2.9f);
+        REPORTER_ASSERT(reporter, !s1.hasEqualEffect(s2));
+
+        // Sets fill.
+        s1.setStrokeStyle(0.0f, true);
+        s2.setStrokeStyle(0.0f, true);
+        REPORTER_ASSERT(reporter, s1.hasEqualEffect(s2));
+    }
+}
+
 DEF_TEST(Stroke, reporter) {
     test_strokecubic(reporter);
     test_strokerect(reporter);
+    test_strokerec_equality(reporter);
 }