aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
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/core
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/core')
-rw-r--r--include/core/SkBitmap.h7
-rw-r--r--include/core/SkColorFilter.h2
-rw-r--r--include/core/SkDrawLooper.h2
-rw-r--r--include/core/SkImage.h8
-rw-r--r--include/core/SkImageFilter.h3
-rw-r--r--include/core/SkMaskFilter.h2
-rw-r--r--include/core/SkMatrix.h8
-rw-r--r--include/core/SkPaint.h7
-rw-r--r--include/core/SkPathEffect.h2
9 files changed, 0 insertions, 41 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index df0f0f8dd2..215aef1d18 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -1245,13 +1245,6 @@ public:
bool allocPixelRef(SkBitmap* bitmap) override;
};
- /** Creates string representation of SkBitmap. The representation is read by
- internal debugging tools.
-
- @param str storage for string representation
- */
- void toString(SkString* str) const;
-
private:
enum Flags {
kImageIsVolatile_Flag = 0x02,
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index 8d86ce20cb..4a92913896 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -138,8 +138,6 @@ public:
return this->filterColor(SK_ColorTRANSPARENT) != SK_ColorTRANSPARENT;
}
- virtual void toString(SkString* str) const = 0;
-
static void InitializeFlattenables();
static SkFlattenable::Type GetFlattenableType() {
diff --git a/include/core/SkDrawLooper.h b/include/core/SkDrawLooper.h
index 5a4fe78d4f..fb7def7878 100644
--- a/include/core/SkDrawLooper.h
+++ b/include/core/SkDrawLooper.h
@@ -96,8 +96,6 @@ public:
*/
virtual bool asABlurShadow(BlurShadowRec*) const;
- virtual void toString(SkString* str) const = 0;
-
static SkFlattenable::Type GetFlattenableType() {
return kSkDrawLooper_Type;
}
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 28c1be1a2a..9146a350fa 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -710,14 +710,6 @@ public:
*/
sk_sp<SkData> refEncodedData() const;
- /** Appends SkImage description to string, including unique ID, width, height, and
- whether the image is opaque.
-
- @param string storage for description; existing content is preserved
- @return string appended with SkImage description
- */
- const char* toString(SkString* string) const;
-
/** Returns subset of SkImage. subset must be fully contained by SkImage dimensions().
The implementation may share pixels, or may copy them.
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index c95fc432cc..f0ab16017c 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -97,7 +97,6 @@ public:
: fRect(rect), fFlags(flags) {}
uint32_t flags() const { return fFlags; }
const SkRect& rect() const { return fRect; }
- void toString(SkString* str) const;
/**
* Apply this cropRect to the imageBounds. If a given edge of the cropRect is not
@@ -249,8 +248,6 @@ public:
SkFilterQuality quality,
sk_sp<SkImageFilter> input);
- virtual void toString(SkString* str) const = 0;
-
static void InitializeFlattenables();
static SkFlattenable::Type GetFlattenableType() {
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h
index 8158e7a3eb..fbcbc0ff88 100644
--- a/include/core/SkMaskFilter.h
+++ b/include/core/SkMaskFilter.h
@@ -59,8 +59,6 @@ public:
*/
sk_sp<SkMaskFilter> makeWithMatrix(const SkMatrix&) const;
- virtual void toString(SkString* str) const = 0;
-
static SkFlattenable::Type GetFlattenableType() {
return kSkMaskFilter_Type;
}
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index a5873b114e..0de3f038ef 100644
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -1558,14 +1558,6 @@ public:
*/
void dump() const;
- /** Creates string representation of SkMatrix. Floating point values
- are written with limited precision; it may not be possible to reconstruct
- original SkMatrix from output.
-
- @param str storage for string representation of SkMatrix
- */
- void toString(SkString* str) const;
-
/** Returns the minimum scaling factor of SkMatrix by decomposing the scaling and
skewing elements.
Returns -1 if scale factor overflows or SkMatrix contains perspective.
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 883e5c610e..b6ed0759ec 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -1442,13 +1442,6 @@ public:
const SkRect& doComputeFastBounds(const SkRect& orig, SkRect* storage,
Style style) const;
- /** Creates string representation of SkPaint. The representation is read by
- internal debugging tools.
-
- @param str storage for string representation of SkPaint
- */
- void toString(SkString* str) const;
-
private:
typedef const SkGlyph& (*GlyphCacheProc)(SkGlyphCache*, const char**);
diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h
index b734575299..f60dd86274 100644
--- a/include/core/SkPathEffect.h
+++ b/include/core/SkPathEffect.h
@@ -145,8 +145,6 @@ public:
virtual DashType asADash(DashInfo* info) const;
- virtual void toString(SkString* str) const = 0;
-
static void InitializeFlattenables();
static SkFlattenable::Type GetFlattenableType() {