diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-05-23 08:02:27 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-31 11:43:13 +0000 |
| commit | 92e37b6d79f12ccfaaf7671413316952d182267d (patch) | |
| tree | fdc9043ed7bb25015a2af108510195d5c01ff209 /src/gpu | |
| parent | 53a0298de3de8f7b2f2299675b91ae293724d37d (diff) | |
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>
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrTestUtils.h | 1 | ||||
| -rw-r--r-- | src/gpu/text/GrSDFMaskFilter.cpp | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/gpu/GrTestUtils.h b/src/gpu/GrTestUtils.h index 0cfe6e45a3..7627df4b19 100644 --- a/src/gpu/GrTestUtils.h +++ b/src/gpu/GrTestUtils.h @@ -74,7 +74,6 @@ public: bool filterPath(SkPath* dst, const SkPath&, SkStrokeRec* , const SkRect*) const override; DashType asADash(DashInfo* info) const override; Factory getFactory() const override { return nullptr; } - void toString(SkString*) const override {} private: TestDashPathEffect(const SkScalar* intervals, int count, SkScalar phase); diff --git a/src/gpu/text/GrSDFMaskFilter.cpp b/src/gpu/text/GrSDFMaskFilter.cpp index ff79cdb3f0..82adaaa4ac 100644 --- a/src/gpu/text/GrSDFMaskFilter.cpp +++ b/src/gpu/text/GrSDFMaskFilter.cpp @@ -26,7 +26,6 @@ public: void computeFastBounds(const SkRect&, SkRect*) const override; - void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(GrSDFMaskFilterImpl) protected: @@ -87,10 +86,6 @@ sk_sp<SkFlattenable> GrSDFMaskFilterImpl::CreateProc(SkReadBuffer& buffer) { return GrSDFMaskFilter::Make(); } -void GrSDFMaskFilterImpl::toString(SkString* str) const { - str->append("GrSDFMaskFilterImpl: ()"); -} - void gr_register_sdf_maskfilter_createproc() { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(GrSDFMaskFilterImpl) } |