aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/views/animated
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-07 22:36:29 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-07 22:36:29 +0000
commitb265741cc17f897b349caacdb890119e4111a415 (patch)
tree781ce30aaba7c0aba969dbf5f70b7a6eb468c0b9 /src/views/animated
parent3484df6ff22d2786283dd7fb7ebcef5788d77532 (diff)
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
Diffstat (limited to 'src/views/animated')
-rw-r--r--src/views/animated/SkStaticTextView.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/views/animated/SkStaticTextView.cpp b/src/views/animated/SkStaticTextView.cpp
index bbef63dff3..0e4cad63e5 100644
--- a/src/views/animated/SkStaticTextView.cpp
+++ b/src/views/animated/SkStaticTextView.cpp
@@ -125,9 +125,12 @@ void SkStaticTextView::getPaint(SkPaint* paint) const
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)