diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-06-08 15:57:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-08 20:36:53 +0000 |
| commit | 27dddae3130c8a6cfaa845195b2fb95cc691dd26 (patch) | |
| tree | 248a7a0b76c427248b8aea1eb6ef203cefe15f33 /tests/GrShapeTest.cpp | |
| parent | a05a31aef4a0dc1af797aa454a2864a36260956b (diff) | |
rebase
This reverts commit 32a4910e57b1fdd3c8671de1ee85e05ca21d079f.
Reason for revert: SkMatrix::toString use has been removed from flutter
and has been picked up in fuchsia
Additionally some bookmaker changes take into account recent
additions of typedef comments and the generated header comment.
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
TBR=bsalomon@google.com,brianosman@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Reviewed-on: https://skia-review.googlesource.com/129623
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@google.com>
Docs-Preview: https://skia.org/?cl=133583
Bug: 830651
Change-Id: If8499e796be63580ad419e150e94d43e8b89de1b
Reviewed-on: https://skia-review.googlesource.com/133583
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'tests/GrShapeTest.cpp')
| -rw-r--r-- | tests/GrShapeTest.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/GrShapeTest.cpp b/tests/GrShapeTest.cpp index 86f007e984..930012c33f 100644 --- a/tests/GrShapeTest.cpp +++ b/tests/GrShapeTest.cpp @@ -1161,7 +1161,6 @@ 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,7 +1243,6 @@ 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() {} }; @@ -1281,7 +1279,6 @@ 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() {} }; @@ -1367,7 +1364,6 @@ 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) {} @@ -1448,7 +1444,6 @@ 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() {} }; |