Remove operator== from SkPaint

tests/PaintTest.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 "SkPath.h"
 #include "SkPaint.h"
@@ skipping 115 matching lines @@
         REPORTER_ASSERT(reporter, gLevels[i] == p0.getFilterLevel());
         p1 = p0;
         REPORTER_ASSERT(reporter, gLevels[i] == p1.getFilterLevel());
 
         p0.reset();
         REPORTER_ASSERT(reporter,
                         SkPaint::kNone_FilterLevel == p0.getFilterLevel());
     }
 }
 
+// Helper to test equality between paints when we know nothing has mutated.
+class PaintEqualityHelper {
+public:
+    static bool PaintEquals(const SkPaint& a, const SkPaint &b) {

[mtklein, 2013/08/05 18:18:14]

I think we can ditch the class and just have a free function?

e.g. SkPaintShallowEqual(const SkPaint& a, const SkPaint& b) ?

+    #ifdef SK_BUILD_FOR_ANDROID
+        return !memcmp(&a, &b, SK_OFFSETOF(SkPaint, fGenerationID));
+    #else
+        return !memcmp(&a, &b, sizeof(a));
+    #endif
+}
+
+};
+
 static void test_copy(skiatest::Reporter* reporter) {
     SkPaint paint;
     // set a few member variables
     paint.setStyle(SkPaint::kStrokeAndFill_Style);
     paint.setTextAlign(SkPaint::kLeft_Align);
     paint.setStrokeWidth(SkIntToScalar(2));
     // set a few pointers
     SkLayerDrawLooper* looper = new SkLayerDrawLooper();
     paint.setLooper(looper)->unref();
     SkMaskFilter* mask = SkBlurMaskFilter::Create(1, SkBlurMaskFilter::kNormal_BlurStyle);
     paint.setMaskFilter(mask)->unref();
 
     // copy the paint using the copy constructor and check they are the same
     SkPaint copiedPaint = paint;
-    REPORTER_ASSERT(reporter, paint == copiedPaint);
+    REPORTER_ASSERT(reporter, PaintEqualityHelper::PaintEquals(paint, copiedPaint));
 
 #ifdef SK_BUILD_FOR_ANDROID
     // the copy constructor should preserve the Generation ID
     uint32_t paintGenID = paint.getGenerationID();
     uint32_t copiedPaintGenID = copiedPaint.getGenerationID();
     REPORTER_ASSERT(reporter, paintGenID == copiedPaintGenID);
-    REPORTER_ASSERT(reporter, !memcmp(&paint, &copiedPaint, sizeof(paint)));
+    REPORTER_ASSERT(reporter, PaintEqualityHelper::PaintEquals(paint, copiedPaint));
 #endif
 
     // copy the paint using the equal operator and check they are the same
     copiedPaint = paint;
-    REPORTER_ASSERT(reporter, paint == copiedPaint);
+    REPORTER_ASSERT(reporter, PaintEqualityHelper::PaintEquals(paint, copiedPaint));
 
 #ifdef SK_BUILD_FOR_ANDROID
     // the equals operator should increment the Generation ID
     REPORTER_ASSERT(reporter, paint.getGenerationID() == paintGenID);
     REPORTER_ASSERT(reporter, copiedPaint.getGenerationID() != copiedPaintGenID);
     copiedPaintGenID = copiedPaint.getGenerationID(); // reset to the new value
     REPORTER_ASSERT(reporter, memcmp(&paint, &copiedPaint, sizeof(paint)));
 #endif
 
     // clean the paint and check they are back to their initial states
     SkPaint cleanPaint;
     paint.reset();
     copiedPaint.reset();
-    REPORTER_ASSERT(reporter, cleanPaint == paint);
-    REPORTER_ASSERT(reporter, cleanPaint == copiedPaint);
+    REPORTER_ASSERT(reporter, PaintEqualityHelper::PaintEquals(cleanPaint, paint));
+    REPORTER_ASSERT(reporter, PaintEqualityHelper::PaintEquals(cleanPaint, copiedPaint));
 
 #ifdef SK_BUILD_FOR_ANDROID
     // the reset function should increment the Generation ID
     REPORTER_ASSERT(reporter, paint.getGenerationID() != paintGenID);
     REPORTER_ASSERT(reporter, copiedPaint.getGenerationID() != copiedPaintGenID);
-    REPORTER_ASSERT(reporter, memcmp(&cleanPaint, &paint, sizeof(cleanPaint)));
-    REPORTER_ASSERT(reporter, memcmp(&cleanPaint, &copiedPaint, sizeof(cleanPaint)));
+    REPORTER_ASSERT(reporter, !PaintEqualityHelper::PaintEquals(cleanPaint, paint));
+    REPORTER_ASSERT(reporter, !PaintEqualityHelper::PaintEquals(cleanPaint, copiedPaint));
 #endif
 }
 
 // found and fixed for webkit: mishandling when we hit recursion limit on
 // mostly degenerate cubic flatness test
 static void regression_cubic(skiatest::Reporter* reporter) {
     SkPath path, stroke;
     SkPaint paint;
 
     path.moveTo(SkFloatToScalar(460.2881309415525f),
@@ skipping 50 matching lines @@
 
     // need to implement charsToGlyphs on other backends (e.g. linux, win)
     // before we can run this tests everywhere
     if (false) {
        test_cmap(reporter);
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Paint", TestPaintClass, TestPaint)