commit 6f6457a7e6b357390a540a8ee78178e3f54addad
author Chet Haase <chet@google.com> Wed Dec 15 13:03:56 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 15 13:03:56 2010 -0800
tree 3ff11d559890dda48a961a61e1c0cb9cb3a1ffc8
parent bdc1207aa05f2f1b013e937f9cbe4795768eaa74
parent 9f523ea27ec892a176817dc3a46179c0a910beb4

Merge "Fix issue with SkPaint references being out of date."

include/core/SkPaint.h

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index ea21ceb..f2df226 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -93,7 +93,10 @@
 
     void setHinting(Hinting hintingLevel)
     {
-        fHinting = hintingLevel;
+        if ((unsigned) hintingLevel != fHinting) {
+            fGenerationID++;
+            fHinting = hintingLevel;
+        }
     }
 
     /** Specifies the bit values that are stored in the paint's flags.

src/core/SkPaint.cpp

diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 23aca78..f203d35 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -114,8 +114,9 @@
     fRasterizer->safeUnref();
     fLooper->safeUnref();
 
+    uint32_t oldGenerationID = fGenerationID;
     memcpy(this, &src, sizeof(src));
-    fGenerationID++;
+    fGenerationID = oldGenerationID + 1;
 
     return *this;
 }
@@ -129,8 +130,9 @@
 {
     SkPaint init;
 
+    uint32_t oldGenerationID = fGenerationID;
     *this = init;
-    fGenerationID++;
+    fGenerationID = oldGenerationID + 1;
 }
 
 uint32_t SkPaint::getGenerationID() const {