From f1ec3918534fb35290eb347a434060199319fccb Mon Sep 17 00:00:00 2001 From: skia-bookmaker Date: Sat, 3 Nov 2018 05:34:02 +0000 Subject: [PATCH] Update markdown files Automatic commit by the Housekeeper-Nightly-Bookmaker bot. TBR=rmistry@google.com NO_MERGE_BUILDS Change-Id: I4cf4db316b2d1a483957a885d9929e3c8f3f06bd Reviewed-on: https://skia-review.googlesource.com/c/168051 Reviewed-by: Commit-Queue: --- site/user/api/SkCanvas_Reference.md | 10 +- site/user/api/SkPaint_Reference.md | 107 ++----------------- site/user/api/SkTextBlobBuilder_Reference.md | 12 +-- site/user/api/SkTextBlob_Reference.md | 4 +- 4 files changed, 19 insertions(+), 114 deletions(-) diff --git a/site/user/api/SkCanvas_Reference.md b/site/user/api/SkCanvas_Reference.md index af24d32ecae99..c737820083656 100644 --- a/site/user/api/SkCanvas_Reference.md +++ b/site/user/api/SkCanvas_Reference.md @@ -5275,7 +5275,7 @@ Draws text, with origin at (text meaning depends on SkPaint::TextEncoding; by default, text is encoded as UTF-8. -x and y meaning depends on SkPaint::Align and SkPaint vertical text; by default +x and y meaning depends on SkPaint::Align and SkPaint vertical text; by default text draws left to right, positioning the first glyph left side bearing at x and its baseline at y. Text size is affected by SkMatrix and SkPaint text size. @@ -5327,7 +5327,7 @@ Draws null terminated string, with ori as UTF-8. Other values of SkPaint::TextEncoding are unlikely to produce the desired results, since zero bytes may be embedded in the string. -x and y meaning depends on SkPaint::Align and SkPaint vertical text; by default +x and y meaning depends on SkPaint::Align and SkPaint vertical text; by default string draws left to right, positioning the first glyph left side bearing at x and its baseline at y. Text size is affected by SkMatrix and SkPaint text size. @@ -5380,7 +5380,7 @@ Draws null terminated string, with o as UTF-8. Other values of SkPaint::TextEncoding are unlikely to produce the desired results, since zero bytes may be embedded in the string. -x and y meaning depends on SkPaint::Align and SkPaint vertical text; by default +x and y meaning depends on SkPaint::Align and SkPaint vertical text; by default string draws left to right, positioning the first glyph left side bearing at x and its baseline at y. Text size is affected by SkMatrix and SkPaint text size. @@ -5580,7 +5580,7 @@ void drawTextBlob(const Text Blob blob at (x, y), using Clip, Matrix, and Paint paint. blob contains Glyphs, their positions, and paint attributes specific to text: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. @@ -5627,7 +5627,7 @@ void drawTextBlob(const Text Blob blob at (x, y), using Clip, Matrix, and Paint paint. blob contains Glyphs, their positions, and paint attributes specific to text: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. diff --git a/site/user/api/SkPaint_Reference.md b/site/user/api/SkPaint_Reference.md index 0871d448260d8..bbc12050d70ba 100644 --- a/site/user/api/SkPaint_Reference.md +++ b/site/user/api/SkPaint_Reference.md @@ -145,17 +145,6 @@ public: SkDrawLooper* getLooper() const; void setDrawLooper(sk_sp<SkDrawLooper> drawLooper); void setLooper(sk_sp<SkDrawLooper> drawLooper); - - enum Align { - kLeft_Align, - kCenter_Align, - kRight_Align, - }; - - static constexpr int kAlignCount = 3; - - Align getTextAlign() const; - void setTextAlign(Align align); SkScalar getTextSize() const; void setTextSize(SkScalar textSize); SkScalar getTextScaleX() const; @@ -3633,90 +3622,6 @@ void setLooper(sk Deprecated. - - - - ---- - -
-    enum Align {
-        kLeft_Align,
-        kCenter_Align,
-        kRight_Align,
-    };
-
- -### Constants - - - - - - - - - - - - - - - - - - - - -
ConstValueDescription
SkPaint::kLeft_Align1 -Deprecated. - -
SkPaint::kCenter_Align2 -Deprecated. - -
SkPaint::kRight_Align3 -Deprecated. - -
- -Deprecated. - -### Constants - - - - - - - - - - -
ConstValueDescription
SkPaint::kAlignCount0 -Deprecated. - -
- - - ---- - -
-Align getTextAlign() const
-
- -Deprecated. - - - ---- - -
-void    setTextAlign(Align align)
-
- -Deprecated. - --- @@ -4821,7 +4726,7 @@ Returns the geometry as SkPath equivalent Uses SkPaint::TextEncoding to decode text, SkTypeface to get the glyph paths, and text size, fake bold, and SkPathEffect to scale and modify the glyph paths. All of the glyph paths are stored in path. -Uses x, y, and SkPaint::Align to position path. +Uses x, y, to position path. ### Parameters @@ -4860,7 +4765,7 @@ Returns the geometry as SkPath equivalent Uses SkPaint::TextEncoding to decode text, SkTypeface to get the glyph paths, and text size, fake bold, and SkPathEffect to scale and modify the glyph paths. All of the glyph paths are stored in path. -Uses pos array and SkPaint::Align to position path. +Uses pos array to position path. pos contains a position for each glyph. ### Parameters @@ -4905,7 +4810,7 @@ The return count is zero or a multiple of two, and is at most twice the number o the string. Uses SkPaint::TextEncoding to decode text, SkTypeface to get the glyph paths, and text size, fake bold, and SkPathEffect to scale and modify the glyph paths. -Uses x, y, and SkPaint::Align to position intervals. +Uses x, y to position intervals. Pass nullptr for intervals to determine the size of the interval array. @@ -4957,7 +4862,7 @@ The return count is zero or a multiple of two, and is at most twice the number o the string. Uses SkPaint::TextEncoding to decode text, SkTypeface to get the glyph paths, and text size, fake bold, and SkPathEffect to scale and modify the glyph paths. -Uses pos array and SkPaint::Align to position intervals. +Uses pos array to position intervals. Pass nullptr for intervals to determine the size of the interval array. @@ -5006,7 +4911,7 @@ The return count is zero or a multiple of two, and is at most twice the number o the string. Uses SkPaint::TextEncoding to decode text, SkTypeface to get the glyph paths, and text size, fake bold, and SkPathEffect to scale and modify the glyph paths. -Uses xpos array, constY, and SkPaint::Align to position intervals. +Uses xpos array, constY to position intervals. Pass nullptr for intervals to determine the size of the interval array. @@ -5057,7 +4962,7 @@ The return count is zero or a multiple of two, and is at most twice the number o the string. Uses SkTypeface to get the glyph paths, and text size, fake bold, and SkPathEffect to scale and modify the glyph paths. -Uses run array and SkPaint::Align to position intervals. +Uses run array to position intervals. SkPaint::TextEncoding must be set to SkPaint::kGlyphID_TextEncoding. diff --git a/site/user/api/SkTextBlobBuilder_Reference.md b/site/user/api/SkTextBlobBuilder_Reference.md index 4800c6f96aa5d..cf8b9b745c8d6 100644 --- a/site/user/api/SkTextBlobBuilder_Reference.md +++ b/site/user/api/SkTextBlobBuilder_Reference.md @@ -195,7 +195,7 @@ Returns run with storage for Glyphs. Caller mus RunBuffer.utf8text, and RunBuffer.clusters should be ignored. Glyphs share Paint Font Metrics in font, including: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. @@ -252,7 +252,7 @@ Returns run with storage for Glyphs. Caller mus RunBuffer.utf8text, and RunBuffer.clusters should be ignored. Glyphs share Paint Font Metrics in font, including: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. @@ -310,7 +310,7 @@ before next call to FontBlobBuilder. RunBuffer.utf8text, and RunBuffer.clusters should be ignored. Glyphs share Paint Font Metrics in font, including: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. @@ -365,7 +365,7 @@ before next call to FontBlobBuilder. RunBuffer.utf8text, and RunBuffer.clusters should be ignored. Glyphs share Paint Font Metrics in font, including: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. @@ -419,7 +419,7 @@ before next call to FontBlobBuilder. RunBuffer.utf8text, and RunBuffer.clusters should be ignored. Glyphs share Paint Font Metrics in font, including: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. @@ -470,7 +470,7 @@ before next call to FontBlobBuilder. RunBuffer.utf8text, and RunBuffer.clusters should be ignored. Glyphs share Paint Font Metrics in font, including: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. diff --git a/site/user/api/SkTextBlob_Reference.md b/site/user/api/SkTextBlob_Reference.md index 7baa09ce95da0..28a33190c478e 100644 --- a/site/user/api/SkTextBlob_Reference.md +++ b/site/user/api/SkTextBlob_Reference.md @@ -85,7 +85,7 @@ Creates Text Blob with a single run. text is encoded as UTF-8. font contains attributes used to define the run text: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text. @@ -131,7 +131,7 @@ Creates Text Blob with a single run. string is encoded as UTF-8. font contains Paint Font Metrics used to define the run text: Typeface, Paint Text Size, Paint Text Scale X, -Paint Text Skew X, Paint Text Align, Paint Hinting, Anti Alias, Paint Fake Bold, +Paint Text Skew X, Paint Hinting, Anti Alias, Paint Fake Bold, Font Embedded Bitmaps, Full Hinting Spacing, LCD Text, Linear Text, and Subpixel Text.