diff options
author | Cary Clark <caryclark@google.com> | 2018-05-20 23:15:43 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-20 23:15:48 +0000 |
commit | 32a4910e57b1fdd3c8671de1ee85e05ca21d079f (patch) | |
tree | 9ae07529b8f56406fa5890827782b592895245a0 /tests | |
parent | 5191880cbf3ee4d122b0d11b4945fbab0784fda7 (diff) |
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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CanvasTest.cpp | 5 | ||||
-rw-r--r-- | tests/GrShapeTest.cpp | 5 | ||||
-rw-r--r-- | tests/ImageFilterTest.cpp | 15 | ||||
-rw-r--r-- | tests/PDFPrimitivesTest.cpp | 6 | ||||
-rw-r--r-- | tests/QuickRejectTest.cpp | 4 |
5 files changed, 35 insertions, 0 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index e809dfb114..aee1d405be 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -838,6 +838,7 @@ class ZeroBoundsImageFilter : public SkImageFilter { public: static sk_sp<SkImageFilter> Make() { return sk_sp<SkImageFilter>(new ZeroBoundsImageFilter); } + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(ZeroBoundsImageFilter) protected: @@ -861,6 +862,10 @@ sk_sp<SkFlattenable> ZeroBoundsImageFilter::CreateProc(SkReadBuffer& buffer) { return nullptr; } +void ZeroBoundsImageFilter::toString(SkString* str) const { + str->appendf("ZeroBoundsImageFilter: ()"); +} + } // anonymous namespace DEF_TEST(Canvas_SaveLayerWithNullBoundsAndZeroBoundsImageFilter, r) { diff --git a/tests/GrShapeTest.cpp b/tests/GrShapeTest.cpp index 1481139e1d..a53dad8517 100644 --- a/tests/GrShapeTest.cpp +++ b/tests/GrShapeTest.cpp @@ -1162,6 +1162,7 @@ void test_path_effect_makes_rrect(skiatest::Reporter* reporter, const Geo& geo) } static sk_sp<SkPathEffect> Make() { return sk_sp<SkPathEffect>(new RRectPathEffect); } Factory getFactory() const override { return nullptr; } + void toString(SkString*) const override {} private: RRectPathEffect() {} }; @@ -1244,6 +1245,7 @@ void test_unknown_path_effect(skiatest::Reporter* reporter, const Geo& geo) { } static sk_sp<SkPathEffect> Make() { return sk_sp<SkPathEffect>(new AddLineTosPathEffect); } Factory getFactory() const override { return nullptr; } + void toString(SkString*) const override {} private: AddLineTosPathEffect() {} }; @@ -1280,6 +1282,7 @@ void test_make_hairline_path_effect(skiatest::Reporter* reporter, const Geo& geo return sk_sp<SkPathEffect>(new MakeHairlinePathEffect); } Factory getFactory() const override { return nullptr; } + void toString(SkString*) const override {} private: MakeHairlinePathEffect() {} }; @@ -1365,6 +1368,7 @@ void test_path_effect_makes_empty_shape(skiatest::Reporter* reporter, const Geo& return sk_sp<SkPathEffect>(new EmptyPathEffect(invert)); } Factory getFactory() const override { return nullptr; } + void toString(SkString*) const override {} private: bool fInvert; EmptyPathEffect(bool invert) : fInvert(invert) {} @@ -1445,6 +1449,7 @@ void test_path_effect_fails(skiatest::Reporter* reporter, const Geo& geo) { } static sk_sp<SkPathEffect> Make() { return sk_sp<SkPathEffect>(new FailurePathEffect); } Factory getFactory() const override { return nullptr; } + void toString(SkString*) const override {} private: FailurePathEffect() {} }; diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index b57af7f30b..8e46715fbb 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -59,6 +59,7 @@ public: return sk_sp<SkImageFilter>(new MatrixTestImageFilter(reporter, expectedMatrix)); } + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(MatrixTestImageFilter) protected: @@ -102,6 +103,7 @@ public: return nullptr; } + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter) private: @@ -113,6 +115,11 @@ sk_sp<SkFlattenable> FailImageFilter::CreateProc(SkReadBuffer& buffer) { return sk_sp<SkFlattenable>(new FailImageFilter()); } +void FailImageFilter::toString(SkString* str) const { + str->appendf("FailImageFilter: ("); + str->append(")"); +} + void draw_gradient_circle(SkCanvas* canvas, int width, int height) { SkScalar x = SkIntToScalar(width / 2); SkScalar y = SkIntToScalar(height / 2); @@ -290,6 +297,7 @@ public: : SkImageFilter(nullptr, 0, nullptr), fBounds(bounds) {} private: + void toString(SkString*) const override {} Factory getFactory() const override { return nullptr; } sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* src, const Context&, @@ -312,6 +320,11 @@ sk_sp<SkFlattenable> MatrixTestImageFilter::CreateProc(SkReadBuffer& buffer) { return nullptr; } +void MatrixTestImageFilter::toString(SkString* str) const { + str->appendf("MatrixTestImageFilter: ("); + str->append(")"); +} + static sk_sp<SkImage> make_small_image() { auto surface(SkSurface::MakeRasterN32Premul(kBitmapSize, kBitmapSize)); SkCanvas* canvas = surface->getCanvas(); @@ -1863,6 +1876,8 @@ DEF_TEST(ImageFilterColorSpaceDAG, reporter) { public: TestFilter() : INHERITED(nullptr, 0, nullptr) {} + void toString(SkString*) const override {} + Factory getFactory() const override { return nullptr; } size_t cloneCount() const { return fCloneCount; } diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp index d25adea16f..b9f8a05a80 100644 --- a/tests/PDFPrimitivesTest.cpp +++ b/tests/PDFPrimitivesTest.cpp @@ -357,6 +357,7 @@ public: return sk_sp<DummyImageFilter>(new DummyImageFilter(visited)); } + void toString(SkString* str) const override; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(DummyImageFilter) bool visited() const { return fVisited; } @@ -385,6 +386,11 @@ sk_sp<SkFlattenable> DummyImageFilter::CreateProc(SkReadBuffer& buffer) { return DummyImageFilter::Make(visited); } +void DummyImageFilter::toString(SkString* str) const { + str->appendf("DummyImageFilter: ("); + str->append(")"); +} + }; // Check that PDF rendering of image filters successfully falls back to diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp index 42e145b3bc..103a31d936 100644 --- a/tests/QuickRejectTest.cpp +++ b/tests/QuickRejectTest.cpp @@ -29,6 +29,10 @@ public: return nullptr; } + void toString(SkString* str) const override { + str->append("TestLooper:"); + } + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestLooper) private: |