diff options
| author |  reed <reed@google.com> | 2016-03-21 13:25:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-21 13:25:16 -0700 |
| commit | 7b380d0d0e91ae6967c52bfa14853a77b9551de4 (patch) | |
| tree | e76ea25f431624e01b51ca605761438fd4560120 /tools | |
| parent | dc6c9bf91c158e89cd9d5ef19dfbf1da98c598a6 (diff) | |
guard rasterizer and drawlooper setters
Need to land https://codereview.chromium.org/1823513002/ first
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1821533002
Review URL: https://codereview.chromium.org/1821533002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/SkAndroidSDKCanvas.cpp | 1 | ||||
| -rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp index 1deb97cbc6..35b1581fda 100644 --- a/tools/android/SkAndroidSDKCanvas.cpp +++ b/tools/android/SkAndroidSDKCanvas.cpp @@ -8,6 +8,7 @@ #include "SkAndroidSDKCanvas.h" #include "SkColorFilter.h" +#include "SkDrawLooper.h" #include "SkPaint.h" #include "SkPathEffect.h" #include "SkShader.h" diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index 5941a5d0e3..5bacf02b1a 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -1184,10 +1184,9 @@ static void extract_json_paint_looper(Json::Value& jsonPaint, UrlDataManager& ur SkPaint* target) { if (jsonPaint.isMember(SKDEBUGCANVAS_ATTRIBUTE_LOOPER)) { Json::Value jsonLooper = jsonPaint[SKDEBUGCANVAS_ATTRIBUTE_LOOPER]; - SkDrawLooper* looper = (SkDrawLooper*) load_flattenable(jsonLooper, urlDataManager); + sk_sp<SkDrawLooper> looper((SkDrawLooper*) load_flattenable(jsonLooper, urlDataManager)); if (looper != nullptr) { - target->setLooper(looper); - looper->unref(); + target->setLooper(std::move(looper)); } } } |