diff options
author | Cary Clark <caryclark@google.com> | 2018-05-31 12:27:33 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-31 12:27:44 +0000 |
commit | 89ad31e97cc886dc6417d9ee2ec79998c1a09912 (patch) | |
tree | 631fa1c6554a398d32c6ab2eb6b003dc0e581e0c /gm | |
parent | 92e37b6d79f12ccfaaf7671413316952d182267d (diff) |
Revert "Reland "remove toString""
This reverts commit 92e37b6d79f12ccfaaf7671413316952d182267d.
Reason for revert: toString still used by flutter
Original change's description:
> Reland "remove toString"
>
> This reverts commit 32a4910e57b1fdd3c8671de1ee85e05ca21d079f.
>
> Reason for revert: SkMatrix::toString use has been removed from flutter and has been picked up in fuchsia
>
> Original change's description:
> > Revert "remove toString"
> >
> > This reverts commit 5191880cbf3ee4d122b0d11b4945fbab0784fda7.
> >
> > Reason for revert: broke flutter
> >
> > Original change's description:
> > > remove toString
> > >
> > > toString may have been used by obsolete debugger only
> > > find out if that is so
> > >
> > > R=​brianosman@google.com,bsalomon@google.com
> > >
> > > Docs-Preview: https://skia.org/?cl=119894
> > > Bug:830651
> > > Change-Id: I737f19b7d3fbc869bea2f443fa3b5ed7c1393ffd
> > > Reviewed-on: https://skia-review.googlesource.com/119894
> > > Commit-Queue: Cary Clark <caryclark@google.com>
> > > Reviewed-by: Brian Salomon <bsalomon@google.com>
> >
> > TBR=bsalomon@google.com,brianosman@google.com,caryclark@google.com,caryclark@skia.org
> >
> > Change-Id: I9f81de6c3615ee0608bcea9081b77239b4b8816c
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: 830651
> > Reviewed-on: https://skia-review.googlesource.com/129340
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Cary Clark <caryclark@google.com>
>
> TBR=bsalomon@google.com,brianosman@google.com,caryclark@google.com,caryclark@skia.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 830651
> Change-Id: Ida8725b6051132d8c46faf99358a8fcc1bcabf34
> Reviewed-on: https://skia-review.googlesource.com/129623
> Reviewed-by: Cary Clark <caryclark@skia.org>
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Cary Clark <caryclark@google.com>
TBR=bsalomon@google.com,brianosman@google.com,caryclark@google.com,caryclark@skia.org
Change-Id: Iafc59ffc1b3db67c520ba31bf12d68e1b46c0ea2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 830651
Reviewed-on: https://skia-review.googlesource.com/131082
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/imagefiltersbase.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index 32a5642db8..fc550fb8bc 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -33,6 +33,7 @@ public: return sk_sp<SkImageFilter>(new FailImageFilter); } + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter) protected: @@ -57,6 +58,11 @@ sk_sp<SkFlattenable> FailImageFilter::CreateProc(SkReadBuffer& buffer) { return FailImageFilter::Make(); } +void FailImageFilter::toString(SkString* str) const { + str->appendf("FailImageFilter: ("); + str->append(")"); +} + class IdentityImageFilter : public SkImageFilter { public: class Registrar { @@ -71,6 +77,7 @@ public: return sk_sp<SkImageFilter>(new IdentityImageFilter(std::move(input))); } + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter) protected: @@ -96,6 +103,11 @@ sk_sp<SkFlattenable> IdentityImageFilter::CreateProc(SkReadBuffer& buffer) { return IdentityImageFilter::Make(common.getInput(0)); } +void IdentityImageFilter::toString(SkString* str) const { + str->appendf("IdentityImageFilter: ("); + str->append(")"); +} + /////////////////////////////////////////////////////////////////////////////// static void draw_paint(SkCanvas* canvas, const SkRect& r, sk_sp<SkImageFilter> imf) { |