aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/SkPaint.cpp9
-rw-r--r--src/views/animated/SkStaticTextView.cpp9
2 files changed, 3 insertions, 15 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 372e68051e..328836624c 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -161,15 +161,6 @@ SkPaint& SkPaint::operator=(const SkPaint& src) {
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;
diff --git a/src/views/animated/SkStaticTextView.cpp b/src/views/animated/SkStaticTextView.cpp
index 0e4cad63e5..bbef63dff3 100644
--- a/src/views/animated/SkStaticTextView.cpp
+++ b/src/views/animated/SkStaticTextView.cpp
@@ -125,12 +125,9 @@ void SkStaticTextView::getPaint(SkPaint* paint) const
void SkStaticTextView::setPaint(const SkPaint& paint)
{
- if (fPaint != paint)
- {
- fPaint = paint;
- this->computeSize();
- this->inval(NULL);
- }
+ fPaint = paint;
+ this->computeSize();
+ this->inval(NULL);
}
void SkStaticTextView::onDraw(SkCanvas* canvas)