| commit | fac8db2df8b5cf6fd62189315bad0726d8e51f6d | [log] [tgz] |
|---|---|---|
| author | Heather Miller <hcm@google.com> | Thu Nov 10 21:21:55 2016 +0000 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Thu Nov 10 21:22:07 2016 +0000 |
| tree | 85630e1d3687e1447bc3612c0c76a6405522d0c1 | |
| parent | 9c2249f51c861f3d0db089fbba38b8ac1d63d160 [diff] |
Revert "Fix BUG=chromium:664036" This reverts commit 805eb6c7779eb855a26d0f1e821d58ce2bf5ffd2. Reason for revert: Backing up to original change causing issues w/ WebView (chromium:663959) Original change's description: > Fix BUG=chromium:664036 > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4659 > > Change-Id: Idac00fef9cac023649a50d9c70d107f988fd2510 > Reviewed-on: https://skia-review.googlesource.com/4659 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Hal Canary <halcanary@google.com> > TBR=halcanary@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I1c3258a3d46a713e9fa60fef829b8b6c6d73b2c4 Reviewed-on: https://skia-review.googlesource.com/4686 Commit-Queue: Heather Miller <hcm@google.com> Reviewed-by: Heather Miller <hcm@google.com>
diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h index 46a0093..a440790 100644 --- a/include/core/SkPictureRecorder.h +++ b/include/core/SkPictureRecorder.h
@@ -115,11 +115,7 @@ uint32_t fFlags; SkRect fCullRect; sk_sp<SkBBoxHierarchy> fBBH; -#ifdef SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT - sk_sp<SkRecorder> fRecorder; -#else std::unique_ptr<SkRecorder> fRecorder; -#endif sk_sp<SkRecord> fRecord; SkMiniRecorder fMiniRecorder;