aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-05-23 08:02:27 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-31 11:43:13 +0000
commit92e37b6d79f12ccfaaf7671413316952d182267d (patch)
treefdc9043ed7bb25015a2af108510195d5c01ff209 /include/effects
parent53a0298de3de8f7b2f2299675b91ae293724d37d (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 'include/effects')
-rw-r--r--include/effects/Sk1DPathEffect.h2
-rw-r--r--include/effects/Sk2DPathEffect.h6
-rw-r--r--include/effects/SkColorFilterImageFilter.h2
-rw-r--r--include/effects/SkComposeImageFilter.h2
-rw-r--r--include/effects/SkCornerPathEffect.h2
-rw-r--r--include/effects/SkDiscretePathEffect.h2
-rw-r--r--include/effects/SkDisplacementMapEffect.h2
-rw-r--r--include/effects/SkDropShadowImageFilter.h1
-rw-r--r--include/effects/SkImageSource.h2
-rw-r--r--include/effects/SkLayerDrawLooper.h2
-rw-r--r--include/effects/SkLumaColorFilter.h2
-rw-r--r--include/effects/SkMagnifierImageFilter.h2
-rw-r--r--include/effects/SkMatrixConvolutionImageFilter.h2
-rw-r--r--include/effects/SkMergeImageFilter.h2
-rw-r--r--include/effects/SkMorphologyImageFilter.h4
-rw-r--r--include/effects/SkOffsetImageFilter.h2
-rw-r--r--include/effects/SkOverdrawColorFilter.h2
-rw-r--r--include/effects/SkPaintImageFilter.h2
-rw-r--r--include/effects/SkPictureImageFilter.h1
-rw-r--r--include/effects/SkTileImageFilter.h2
-rw-r--r--include/effects/SkToSRGBColorFilter.h2
21 files changed, 0 insertions, 46 deletions
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h
index a78aded601..022505f313 100644
--- a/include/effects/Sk1DPathEffect.h
+++ b/include/effects/Sk1DPathEffect.h
@@ -62,8 +62,6 @@ public:
virtual bool filterPath(SkPath*, const SkPath&,
SkStrokeRec*, const SkRect*) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h
index 841e5b8ab2..3bdf5ded30 100644
--- a/include/effects/Sk2DPathEffect.h
+++ b/include/effects/Sk2DPathEffect.h
@@ -40,8 +40,6 @@ protected:
explicit Sk2DPathEffect(const SkMatrix& mat);
void flatten(SkWriteBuffer&) const override;
- void toString(SkString* str) const override;
-
private:
SkMatrix fMatrix, fInverse;
bool fMatrixIsInvertible;
@@ -66,8 +64,6 @@ public:
virtual bool filterPath(SkPath* dst, const SkPath& src,
SkStrokeRec*, const SkRect*) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
@@ -98,8 +94,6 @@ public:
return sk_sp<SkPathEffect>(new SkPath2DPathEffect(matrix, path));
}
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h
index f422b0901a..a664490b48 100644
--- a/include/effects/SkColorFilterImageFilter.h
+++ b/include/effects/SkColorFilterImageFilter.h
@@ -19,8 +19,6 @@ public:
sk_sp<SkImageFilter> input,
const CropRect* cropRect = nullptr);
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h
index 7c86126638..acde1d65aa 100644
--- a/include/effects/SkComposeImageFilter.h
+++ b/include/effects/SkComposeImageFilter.h
@@ -17,8 +17,6 @@ public:
SkRect computeFastBounds(const SkRect& src) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h
index 0f052b880d..e1c57e73b6 100644
--- a/include/effects/SkCornerPathEffect.h
+++ b/include/effects/SkCornerPathEffect.h
@@ -28,8 +28,6 @@ public:
virtual bool filterPath(SkPath* dst, const SkPath& src,
SkStrokeRec*, const SkRect*) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h
index 252e6de8a3..fc53f2a607 100644
--- a/include/effects/SkDiscretePathEffect.h
+++ b/include/effects/SkDiscretePathEffect.h
@@ -35,8 +35,6 @@ public:
virtual bool filterPath(SkPath* dst, const SkPath& src,
SkStrokeRec*, const SkRect*) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h
index 929086cabd..1790e4735d 100644
--- a/include/effects/SkDisplacementMapEffect.h
+++ b/include/effects/SkDisplacementMapEffect.h
@@ -39,8 +39,6 @@ public:
SkIRect onFilterNodeBounds(const SkIRect&, const SkMatrix& ctm,
MapDirection, const SkIRect* inputRect) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h
index e8c5740f9d..c86550d178 100644
--- a/include/effects/SkDropShadowImageFilter.h
+++ b/include/effects/SkDropShadowImageFilter.h
@@ -30,7 +30,6 @@ public:
const CropRect* cropRect = nullptr);
SkRect computeFastBounds(const SkRect&) const override;
- void toString(SkString* str) const override;
Factory getFactory() const override { return CreateProc; }
diff --git a/include/effects/SkImageSource.h b/include/effects/SkImageSource.h
index d25cb6dc36..11bc7ed690 100644
--- a/include/effects/SkImageSource.h
+++ b/include/effects/SkImageSource.h
@@ -22,8 +22,6 @@ public:
SkRect computeFastBounds(const SkRect& src) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h
index 10a7274394..18a9b93991 100644
--- a/include/effects/SkLayerDrawLooper.h
+++ b/include/effects/SkLayerDrawLooper.h
@@ -75,8 +75,6 @@ public:
bool asABlurShadow(BlurShadowRec* rec) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
static sk_sp<SkFlattenable> CreateProc(SkReadBuffer& buffer);
diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h
index 14f2d4f773..38886f80c2 100644
--- a/include/effects/SkLumaColorFilter.h
+++ b/include/effects/SkLumaColorFilter.h
@@ -36,8 +36,6 @@ public:
GrContext*, const GrColorSpaceInfo&) const override;
#endif
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h
index 382f62bc52..5a383dc140 100644
--- a/include/effects/SkMagnifierImageFilter.h
+++ b/include/effects/SkMagnifierImageFilter.h
@@ -18,8 +18,6 @@ public:
sk_sp<SkImageFilter> input,
const CropRect* cropRect = nullptr);
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h
index cb4f087a75..ccee2fd2f3 100644
--- a/include/effects/SkMatrixConvolutionImageFilter.h
+++ b/include/effects/SkMatrixConvolutionImageFilter.h
@@ -68,8 +68,6 @@ public:
sk_sp<SkImageFilter> input,
const CropRect* cropRect = nullptr);
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index 5fc6bcb010..978c07ecbe 100644
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -25,8 +25,6 @@ public:
return Make(array, 2, cropRect);
}
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index ceb4867a79..aa9edfd155 100644
--- a/include/effects/SkMorphologyImageFilter.h
+++ b/include/effects/SkMorphologyImageFilter.h
@@ -62,8 +62,6 @@ public:
sk_sp<SkImageFilter> input,
const CropRect* cropRect = nullptr);
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
@@ -87,8 +85,6 @@ public:
sk_sp<SkImageFilter> input,
const CropRect* cropRect = nullptr);
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h
index f352a76e07..bbf19a9199 100644
--- a/include/effects/SkOffsetImageFilter.h
+++ b/include/effects/SkOffsetImageFilter.h
@@ -20,8 +20,6 @@ public:
SkRect computeFastBounds(const SkRect& src) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkOverdrawColorFilter.h b/include/effects/SkOverdrawColorFilter.h
index 33eb27fcc2..37aa81332b 100644
--- a/include/effects/SkOverdrawColorFilter.h
+++ b/include/effects/SkOverdrawColorFilter.h
@@ -32,8 +32,6 @@ public:
GrContext*, const GrColorSpaceInfo&) const override;
#endif
- void toString(SkString* str) const override;
-
static sk_sp<SkFlattenable> CreateProc(SkReadBuffer& buffer);
Factory getFactory() const override { return CreateProc; }
static void InitializeFlattenables();
diff --git a/include/effects/SkPaintImageFilter.h b/include/effects/SkPaintImageFilter.h
index bf7c51b50e..8765665fbf 100644
--- a/include/effects/SkPaintImageFilter.h
+++ b/include/effects/SkPaintImageFilter.h
@@ -27,8 +27,6 @@ public:
bool affectsTransparentBlack() const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h
index 0cde3988c5..f3011ad274 100644
--- a/include/effects/SkPictureImageFilter.h
+++ b/include/effects/SkPictureImageFilter.h
@@ -25,7 +25,6 @@ public:
*/
static sk_sp<SkImageFilter> Make(sk_sp<SkPicture> picture, const SkRect& cropRect);
- void toString(SkString* str) const override;
Factory getFactory() const override { return CreateProc; }
diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h
index c2e38823d0..2310da3881 100644
--- a/include/effects/SkTileImageFilter.h
+++ b/include/effects/SkTileImageFilter.h
@@ -28,8 +28,6 @@ public:
MapDirection, const SkIRect* inputRect) const override;
SkRect computeFastBounds(const SkRect& src) const override;
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
protected:
diff --git a/include/effects/SkToSRGBColorFilter.h b/include/effects/SkToSRGBColorFilter.h
index 797e9d81dc..20264aa3e5 100644
--- a/include/effects/SkToSRGBColorFilter.h
+++ b/include/effects/SkToSRGBColorFilter.h
@@ -27,8 +27,6 @@ public:
GrContext*, const GrColorSpaceInfo&) const override;
#endif
- void toString(SkString* str) const override;
-
Factory getFactory() const override { return CreateProc; }
private: