diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 15:22:05 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 15:22:05 +0000 |
| commit | 37ffe8a5a38606b2099f6a93e82bf121cab92cc7 (patch) | |
| tree | 678304cadf0ed98b891457708b3cac459ba602b3 /src | |
| parent | a4eb459fd1aeeef338d804a474d198318ac6b722 (diff) | |
Remove operator== from SkPaint
R=mtklein@google.com, reed@google.com
Author: sglez@google.com
Review URL: https://chromiumcodereview.appspot.com/21949007
git-svn-id: http://skia.googlecode.com/svn/trunk@10603 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkPaint.cpp | 9 | ||||
| -rw-r--r-- | src/views/animated/SkStaticTextView.cpp | 9 |
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) |