diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-18 16:03:59 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-18 16:03:59 +0000 |
| commit | e61a86cfa00ea393ecc4a71fca94e1d476a37ecc (patch) | |
| tree | f6ec6c793f279f8226ea40283e707cf3c716e12b /src/core/SkDraw.cpp | |
| parent | 8bf4c0ab7b4acd25566459fc464027c5760d0e5e (diff) | |
Guard against most unintentionally ephemeral SkAutoFoo instantiations.
I think I applied the trick everywhere possible. Limitations:
- can't be used with templated classes
- all constructors and destructors must be defined inline
A couple of the SkAutoFoo were unused in Skia, Chromium, and Android, so I
deleted them. This change caught the same bugs Cary found in SkPath, plus one
more in SampleApp.
BUG=
R=reed@google.com, caryclark@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/72603005
git-svn-id: http://skia.googlecode.com/svn/trunk@12301 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkDraw.cpp')
| -rw-r--r-- | src/core/SkDraw.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 112451920f..aa91df3df5 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -65,7 +65,13 @@ public: fStorage, sizeof(fStorage), drawCoverage); } - ~SkAutoBlitterChoose(); + ~SkAutoBlitterChoose() { + if ((void*)fBlitter == (void*)fStorage) { + fBlitter->~SkBlitter(); + } else { + SkDELETE(fBlitter); + } + } SkBlitter* operator->() { return fBlitter; } SkBlitter* get() const { return fBlitter; } @@ -81,14 +87,7 @@ private: SkBlitter* fBlitter; uint32_t fStorage[kBlitterStorageLongCount]; }; - -SkAutoBlitterChoose::~SkAutoBlitterChoose() { - if ((void*)fBlitter == (void*)fStorage) { - fBlitter->~SkBlitter(); - } else { - SkDELETE(fBlitter); - } -} +#define SkAutoBlitterChoose(...) SK_REQUIRE_LOCAL_VAR(SkAutoBlitterChoose) /** * Since we are providing the storage for the shader (to avoid the perf cost @@ -128,6 +127,7 @@ private: SkPaint fPaint; // copy of caller's paint (which we then modify) uint32_t fStorage[kBlitterStorageLongCount]; }; +#define SkAutoBitmapShaderInstall(...) SK_REQUIRE_LOCAL_VAR(SkAutoBitmapShaderInstall) /////////////////////////////////////////////////////////////////////////////// |