commit b265741cc17f897b349caacdb890119e4111a415
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 07 22:36:29 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 07 22:36:29 2013 +0000
tree 781ce30aaba7c0aba969dbf5f70b7a6eb468c0b9
parent 3484df6ff22d2786283dd7fb7ebcef5788d77532

Revert r10603 (Remove operator== from SkPaint) due to Chrome failures



git-svn-id: http://skia.googlecode.com/svn/trunk@10632 2bbb7eff-a529-9590-31e7-b0007b416f81

include/core/SkPaint.h

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index ac46760..fa0c61e 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -67,6 +67,11 @@
 
     SkPaint& operator=(const SkPaint&);
 
+    SK_API friend bool operator==(const SkPaint& a, const SkPaint& b);
+    friend bool operator!=(const SkPaint& a, const SkPaint& b) {
+        return !(a == b);
+    }
+
     void flatten(SkFlattenableWriteBuffer&) const;
     void unflatten(SkFlattenableReadBuffer&);
 

src/core/SkPaint.cpp

diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 3288366..372e680 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -161,6 +161,15 @@
     return *this;
 }
 
+bool operator==(const SkPaint& a, const SkPaint& b) {
+#ifdef SK_BUILD_FOR_ANDROID
+    //assumes that fGenerationID is the last field in the struct
+    return !memcmp(&a, &b, SK_OFFSETOF(SkPaint, fGenerationID));
+#else
+    return !memcmp(&a, &b, sizeof(a));
+#endif
+}
+
 void SkPaint::reset() {
     SkPaint init;
 

src/views/animated/SkStaticTextView.cpp

diff --git a/src/views/animated/SkStaticTextView.cpp b/src/views/animated/SkStaticTextView.cpp
index bbef63d..0e4cad6 100644
--- a/src/views/animated/SkStaticTextView.cpp
+++ b/src/views/animated/SkStaticTextView.cpp
@@ -125,9 +125,12 @@
 
 void SkStaticTextView::setPaint(const SkPaint& paint)
 {
-    fPaint = paint;
-    this->computeSize();
-    this->inval(NULL);
+    if (fPaint != paint)
+    {
+        fPaint = paint;
+        this->computeSize();
+        this->inval(NULL);
+    }
 }
 
 void SkStaticTextView::onDraw(SkCanvas* canvas)

tests/PaintTest.cpp

diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index d71d12f..e25c7c3 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -133,15 +133,6 @@
     }
 }
 
-// Only useful for test_copy. Checks the fields that are set.
-static bool check_equal(const SkPaint& a, const SkPaint &b) {
-    return a.getLooper() == b.getLooper() &&
-           a.getMaskFilter() == b.getMaskFilter() &&
-           a.getStrokeWidth() == b.getStrokeWidth() &&
-           a.getStyle() == b.getStyle() &&
-           a.getTextAlign() == b.getTextAlign();
-}
-
 static void test_copy(skiatest::Reporter* reporter) {
     SkPaint paint;
     // set a few member variables
@@ -156,19 +147,19 @@
 
     // copy the paint using the copy constructor and check they are the same
     SkPaint copiedPaint = paint;
-    REPORTER_ASSERT(reporter, check_equal(paint, copiedPaint));
+    REPORTER_ASSERT(reporter, 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, check_equal(paint, copiedPaint));
+    REPORTER_ASSERT(reporter, !memcmp(&paint, &copiedPaint, sizeof(paint)));
 #endif
 
     // copy the paint using the equal operator and check they are the same
     copiedPaint = paint;
-    REPORTER_ASSERT(reporter, check_equal(paint, copiedPaint));
+    REPORTER_ASSERT(reporter, paint == copiedPaint);
 
 #ifdef SK_BUILD_FOR_ANDROID
     // the equals operator should increment the Generation ID
@@ -182,8 +173,8 @@
     SkPaint cleanPaint;
     paint.reset();
     copiedPaint.reset();
-    REPORTER_ASSERT(reporter, check_equal(cleanPaint, paint));
-    REPORTER_ASSERT(reporter, check_equal(cleanPaint, copiedPaint));
+    REPORTER_ASSERT(reporter, cleanPaint == paint);
+    REPORTER_ASSERT(reporter, cleanPaint == copiedPaint);
 
 #ifdef SK_BUILD_FOR_ANDROID
     // the reset function should increment the Generation ID