remove experimental from some APIs (that are no longer experiments)
Change-Id: I614dc116307cbeefb26768e2fff423bb50603eaf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209168
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index f67b299..bcf0f3c 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1922,9 +1922,7 @@
void drawSimpleText(const void* text, size_t byteLength, SkTextEncoding encoding,
SkScalar x, SkScalar y, const SkFont& font, const SkPaint& paint);
- /** Experimental.
-
- Draws null terminated string, with origin at (x, y), using clip, SkMatrix,
+ /** Draws null terminated string, with origin at (x, y), using clip, SkMatrix,
SkFont font, and SkPaint paint.
This function uses the default character-to-glyph mapping from the
@@ -1953,9 +1951,7 @@
this->drawSimpleText(str, strlen(str), kUTF8_SkTextEncoding, x, y, font, paint);
}
- /** Experimental.
-
- Draws SkString, with origin at (x, y), using clip, SkMatrix, SkFont font,
+ /** Draws SkString, with origin at (x, y), using clip, SkMatrix, SkFont font,
and SkPaint paint.
This function uses the default character-to-glyph mapping from the
diff --git a/include/core/SkFont.h b/include/core/SkFont.h
index a64c4bb..71be71ff 100644
--- a/include/core/SkFont.h
+++ b/include/core/SkFont.h
@@ -479,8 +479,7 @@
*/
SkScalar getSpacing() const { return this->getMetrics(nullptr); }
- /** Experimental.
- * Dumps fields of the font to SkDebugf. May change its output over time, so clients should
+ /** Dumps fields of the font to SkDebugf. May change its output over time, so clients should
* not rely on this for anything specific. Used to aid in debugging.
*/
void dump() const;
diff --git a/include/core/SkTextBlob.h b/include/core/SkTextBlob.h
index 2962986..6b61ba3 100644
--- a/include/core/SkTextBlob.h
+++ b/include/core/SkTextBlob.h
@@ -104,8 +104,7 @@
return MakeFromText(string, strlen(string), font, encoding);
}
- /** Experimental.
- Returns a textblob built from a single run of text with x-positions and a single y value.
+ /** Returns a textblob built from a single run of text with x-positions and a single y value.
This is equivalent to using SkTextBlobBuilder and calling allocRunPosH().
Returns nullptr if byteLength is zero.
@@ -121,8 +120,7 @@
const SkScalar xpos[], SkScalar constY, const SkFont& font,
SkTextEncoding encoding = kUTF8_SkTextEncoding);
- /** Experimental.
- Returns a textblob built from a single run of text with positions.
+ /** Returns a textblob built from a single run of text with positions.
This is equivalent to using SkTextBlobBuilder and calling allocRunPos().
Returns nullptr if byteLength is zero.
@@ -137,7 +135,6 @@
const SkPoint pos[], const SkFont& font,
SkTextEncoding encoding = kUTF8_SkTextEncoding);
- // Experimental
static sk_sp<SkTextBlob> MakeFromRSXform(const void* text, size_t byteLength,
const SkRSXform xform[], const SkFont& font,
SkTextEncoding encoding = kUTF8_SkTextEncoding);
@@ -274,9 +271,8 @@
char* utf8text; //!< reserved for future use
uint32_t* clusters; //!< reserved for future use
- // experimental
+ // Helpers, since the "pos" field can be different types (always some number of floats).
SkPoint* points() const { return reinterpret_cast<SkPoint*>(pos); }
- // experimental
SkRSXform* xforms() const { return reinterpret_cast<SkRSXform*>(pos); }
};
@@ -351,7 +347,7 @@
const RunBuffer& allocRunPos(const SkFont& font, int count,
const SkRect* bounds = nullptr);
- // Experimental, RunBuffer.pos points to SkRSXform array
+ // RunBuffer.pos points to SkRSXform array
const RunBuffer& allocRunRSXform(const SkFont& font, int count);
private:
