aboutsummaryrefslogtreecommitdiffhomepage
path: root/site
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-06-14 12:28:14 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-14 16:54:47 +0000
commit5538c1390649811eb6498eeca53cc1db00877503 (patch)
tree5a7b4d580393f32f9774f00c19a0e01bdd4c23f4 /site
parentab17347df32807cabd9f2a518d22c3bd420e482f (diff)
docs fix external substitutions
explict substitutions are required to distiguish words that preserve underscores R=caryclark@google.com Docs-Preview: https://skia.org/?cl=134841 Bug: skia:6898 Change-Id: Id1a5669c180e03e048de3c0251882bd06b297283 Reviewed-on: https://skia-review.googlesource.com/134841 Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org> Auto-Submit: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'site')
-rw-r--r--site/user/api/SkBitmap_Reference.md8
-rw-r--r--site/user/api/SkCanvas_Reference.md95
-rw-r--r--site/user/api/SkColor_Reference.md16
-rw-r--r--site/user/api/SkIRect_Reference.md34
-rw-r--r--site/user/api/SkImageInfo_Reference.md12
-rw-r--r--site/user/api/SkImage_Reference.md34
-rw-r--r--site/user/api/SkMatrix_Reference.md98
-rw-r--r--site/user/api/SkPaint_Reference.md18
-rw-r--r--site/user/api/SkPath_Reference.md116
-rw-r--r--site/user/api/SkPoint_Reference.md10
-rw-r--r--site/user/api/SkRect_Reference.md26
-rw-r--r--site/user/api/SkSurface_Reference.md30
-rw-r--r--site/user/api/undocumented.md45
13 files changed, 294 insertions, 248 deletions
diff --git a/site/user/api/SkBitmap_Reference.md b/site/user/api/SkBitmap_Reference.md
index eafec8d384..c0dee66aa6 100644
--- a/site/user/api/SkBitmap_Reference.md
+++ b/site/user/api/SkBitmap_Reference.md
@@ -323,7 +323,7 @@ SkBitmap member functions read and modify the structure properties.
</tr>
<tr>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkBitmap_hasHardwareMipMap'>hasHardwareMipMap</a></td>
- <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>returns Mip_Map support present; Android only</td>
+ <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>returns <a href='undocumented#Mip_Map'>Mip Map</a> support present; Android only</td>
</tr>
<tr style='background-color: #f0f0f0; '>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkBitmap_height'>height</a></td>
@@ -403,7 +403,7 @@ SkBitmap member functions read and modify the structure properties.
</tr>
<tr>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkBitmap_setHasHardwareMipMap'>setHasHardwareMipMap</a></td>
- <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>sets Mip_Map support present; Android only</td>
+ <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>sets <a href='undocumented#Mip_Map'>Mip Map</a> support present; Android only</td>
</tr>
<tr style='background-color: #f0f0f0; '>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkBitmap_setImmutable'>setImmutable</a></td>
@@ -907,7 +907,7 @@ two width:1 height:1 colorType:kRGBA_8888_SkColorType alphaType:kOpaque_SkAlphaT
</tr>
<tr style='background-color: #f0f0f0; '>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkBitmap_hasHardwareMipMap'>hasHardwareMipMap</a></td>
- <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>returns Mip_Map support present; Android only</td>
+ <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>returns <a href='undocumented#Mip_Map'>Mip Map</a> support present; Android only</td>
</tr>
<tr>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkBitmap_height'>height</a></td>
@@ -2994,7 +2994,7 @@ subset origin: 32, 64
</tr>
<tr>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkBitmap_setHasHardwareMipMap'>setHasHardwareMipMap</a></td>
- <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>sets Mip_Map support present; Android only</td>
+ <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>sets <a href='undocumented#Mip_Map'>Mip Map</a> support present; Android only</td>
</tr>
<tr style='background-color: #f0f0f0; '>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkBitmap_setImmutable'>setImmutable</a></td>
diff --git a/site/user/api/SkCanvas_Reference.md b/site/user/api/SkCanvas_Reference.md
index eb82724346..b2b0f9362f 100644
--- a/site/user/api/SkCanvas_Reference.md
+++ b/site/user/api/SkCanvas_Reference.md
@@ -387,7 +387,7 @@ SkCanvas member functions read and modify the structure properties.
</tr>
<tr>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkCanvas_drawPatch'>drawPatch</a></td>
- <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>draws Coons_Patch</td>
+ <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>draws <a href='undocumented#Coons_Patch'>Coons Patch</a></td>
</tr>
<tr style='background-color: #f0f0f0; '>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkCanvas_drawPath'>drawPath</a></td>
@@ -1521,10 +1521,10 @@ Does not copy, and returns false if:
<td>size of one destination row; <a href='#SkCanvas_readPixels_dstInfo'>dstInfo</a>.width() times pixel size, or larger</td>
</tr>
<tr> <td><a name='SkCanvas_readPixels_srcX'><code><strong>srcX</strong></code></a></td>
- <td>offset into readable pixels in x; may be negative</td>
+ <td>offset into readable pixels on x-axis; may be negative</td>
</tr>
<tr> <td><a name='SkCanvas_readPixels_srcY'><code><strong>srcY</strong></code></a></td>
- <td>offset into readable pixels in y; may be negative</td>
+ <td>offset into readable pixels on y-axis; may be negative</td>
</tr>
</table>
@@ -1611,10 +1611,10 @@ Does not copy, and returns false if:
<td>storage for pixels copied from <a href='#Canvas'>Canvas</a></td>
</tr>
<tr> <td><a name='SkCanvas_readPixels_2_srcX'><code><strong>srcX</strong></code></a></td>
- <td>offset into readable pixels in x; may be negative</td>
+ <td>offset into readable pixels on x-axis; may be negative</td>
</tr>
<tr> <td><a name='SkCanvas_readPixels_2_srcY'><code><strong>srcY</strong></code></a></td>
- <td>offset into readable pixels in y; may be negative</td>
+ <td>offset into readable pixels on y-axis; may be negative</td>
</tr>
</table>
@@ -1691,10 +1691,10 @@ Does not copy, and returns false if:
<td>storage for pixels copied from <a href='#Canvas'>Canvas</a></td>
</tr>
<tr> <td><a name='SkCanvas_readPixels_3_srcX'><code><strong>srcX</strong></code></a></td>
- <td>offset into readable pixels in x; may be negative</td>
+ <td>offset into readable pixels on x-axis; may be negative</td>
</tr>
<tr> <td><a name='SkCanvas_readPixels_3_srcY'><code><strong>srcY</strong></code></a></td>
- <td>offset into readable pixels in y; may be negative</td>
+ <td>offset into readable pixels on y-axis; may be negative</td>
</tr>
</table>
@@ -1776,10 +1776,10 @@ Does not copy, and returns false if:
<td>size of one row of <a href='#SkCanvas_writePixels_pixels'>pixels</a>; <a href='#SkCanvas_writePixels_info'>info</a>.width() times pixel size, or larger</td>
</tr>
<tr> <td><a name='SkCanvas_writePixels_x'><code><strong>x</strong></code></a></td>
- <td>offset into <a href='#Canvas'>Canvas</a> writable <a href='#SkCanvas_writePixels_pixels'>pixels</a> in <a href='#SkCanvas_writePixels_x'>x</a>; may be negative</td>
+ <td>offset into <a href='#Canvas'>Canvas</a> writable <a href='#SkCanvas_writePixels_pixels'>pixels</a> on <a href='#SkCanvas_writePixels_x'>x</a>-axis; may be negative</td>
</tr>
<tr> <td><a name='SkCanvas_writePixels_y'><code><strong>y</strong></code></a></td>
- <td>offset into <a href='#Canvas'>Canvas</a> writable <a href='#SkCanvas_writePixels_pixels'>pixels</a> in <a href='#SkCanvas_writePixels_y'>y</a>; may be negative</td>
+ <td>offset into <a href='#Canvas'>Canvas</a> writable <a href='#SkCanvas_writePixels_pixels'>pixels</a> on <a href='#SkCanvas_writePixels_y'>y</a>-axis; may be negative</td>
</tr>
</table>
@@ -2800,10 +2800,10 @@ transforming the result with <a href='#Matrix'>Matrix</a>.
<td>amount to rotate, in <a href='#SkCanvas_rotate_2_degrees'>degrees</a></td>
</tr>
<tr> <td><a name='SkCanvas_rotate_2_px'><code><strong>px</strong></code></a></td>
- <td>x-coordinate of the point to rotate about</td>
+ <td>x-axis value of the point to rotate about</td>
</tr>
<tr> <td><a name='SkCanvas_rotate_2_py'><code><strong>py</strong></code></a></td>
- <td>y-coordinate of the point to rotate about</td>
+ <td>y-axis value of the point to rotate about</td>
</tr>
</table>
@@ -2825,8 +2825,8 @@ void <a href='#SkCanvas_skew'>skew</a>(<a href='undocumented#SkScalar'>SkScalar<
</pre>
Skew <a href='#Matrix'>Matrix</a> by <a href='#SkCanvas_skew_sx'>sx</a> on the x-axis and <a href='#SkCanvas_skew_sy'>sy</a> on the y-axis. A positive value of <a href='#SkCanvas_skew_sx'>sx</a>
-skews the drawing right as y increases; a positive value of <a href='#SkCanvas_skew_sy'>sy</a> skews the drawing
-down as x increases.
+skews the drawing right as y-axis values increase; a positive value of <a href='#SkCanvas_skew_sy'>sy</a> skews
+the drawing down as x-axis values increase.
Mathematically, replace <a href='#Matrix'>Matrix</a> with a skew matrix <a href='undocumented#Premultiply'>Premultiplied</a> with <a href='#Matrix'>Matrix</a>.
@@ -2836,20 +2836,20 @@ the result with <a href='#Matrix'>Matrix</a>.
### Parameters
<table> <tr> <td><a name='SkCanvas_skew_sx'><code><strong>sx</strong></code></a></td>
- <td>amount to skew in x</td>
+ <td>amount to skew on x-axis</td>
</tr>
<tr> <td><a name='SkCanvas_skew_sy'><code><strong>sy</strong></code></a></td>
- <td>amount to skew in y</td>
+ <td>amount to skew on y-axis</td>
</tr>
</table>
### Example
-<div><fiddle-embed name="2e2acc21d7774df7e0940a30ad2ca99e"><div>Black text mimics an oblique text style by using a negative skew in x that
-shifts the geometry to the right as the y values decrease.
-Red text uses a positive skew in y to shift the geometry down as the x values
-increase.
-Blue text combines x and y skew to rotate and scale.
+<div><fiddle-embed name="2e2acc21d7774df7e0940a30ad2ca99e"><div>Black text mimics an oblique text style by using a negative skew on x-axis
+that shifts the geometry to the right as the y-axis values decrease.
+Red text uses a positive skew on y-axis to shift the geometry down
+as the x-axis values increase.
+Blue text combines <a href='#SkCanvas_skew_sx'>sx</a> and <a href='#SkCanvas_skew_sy'>sy</a> skew to rotate and scale.
</div></fiddle-embed></div>
### See Also
@@ -3486,7 +3486,8 @@ bounds of <a href='#Clip'>Clip</a> in local coordinates
<div><fiddle-embed name="7f60cb030d3f9b2473adbe3e34b19d91"><div>Initial bounds is device bounds outset by 1 on all sides.
Clipped bounds is <a href='#SkCanvas_clipPath'>clipPath</a> bounds outset by 1 on all sides.
-Scaling the canvas by two in x and y scales the local bounds by 1/2 in x and y.
+Scaling the canvas by two on both axes scales the local bounds by 1/2
+on both axes.
</div>
#### Example Output
@@ -3567,7 +3568,8 @@ bounds of <a href='#Clip'>Clip</a> in <a href='undocumented#Device'>Device</a> c
<div><fiddle-embed name="556832ac5711af662a98c21c547185e9"><div>Initial bounds is device bounds, not outset.
Clipped bounds is <a href='#SkCanvas_clipPath'>clipPath</a> bounds, not outset.
-Scaling the canvas by 1/2 in x and y scales the device bounds by 1/2 in x and y.
+Scaling the canvas by 1/2 on both axes scales the device bounds by 1/2
+on both axes.
</div>
#### Example Output
@@ -3731,7 +3733,7 @@ device bounds empty = true
</tr>
<tr style='background-color: #f0f0f0; '>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#SkCanvas_drawPatch'>drawPatch</a></td>
- <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>draws Coons_Patch</td>
+ <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>draws <a href='undocumented#Coons_Patch'>Coons Patch</a></td>
</tr>
<tr>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '></td>
@@ -4558,10 +4560,10 @@ If <a href='#SkCanvas_drawRoundRect_rx'>rx</a> and <a href='#SkCanvas_drawRoundR
<td><a href='SkRect_Reference#Rect'>Rect</a> bounds of <a href='undocumented#Round_Rect'>Round Rect</a> to draw</td>
</tr>
<tr> <td><a name='SkCanvas_drawRoundRect_rx'><code><strong>rx</strong></code></a></td>
- <td>axis length in x of oval describing rounded corners</td>
+ <td>axis length on x-axis of oval describing rounded corners</td>
</tr>
<tr> <td><a name='SkCanvas_drawRoundRect_ry'><code><strong>ry</strong></code></a></td>
- <td>axis length in y of oval describing rounded corners</td>
+ <td>axis length on y-axis of oval describing rounded corners</td>
</tr>
<tr> <td><a name='SkCanvas_drawRoundRect_paint'><code><strong>paint</strong></code></a></td>
<td>stroke, blend, color, and so on, used to draw</td>
@@ -5574,7 +5576,7 @@ draws one of fColors into lattice rectangle</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>const&nbsp;int*</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a name='SkCanvas_Lattice_fXDivs'><code>fXDivs</code></a></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
-Array of x-coordinates that divide the bitmap vertically.
+Array of x-axis values that divide the bitmap vertically.
Array entries must be unique, increasing, greater than or equal to
<a href='#SkCanvas_Lattice_fBounds'>fBounds</a> left edge, and less than <a href='#SkCanvas_Lattice_fBounds'>fBounds</a> right edge.
Set the first element to <a href='#SkCanvas_Lattice_fBounds'>fBounds</a> left to collapse the left column of
@@ -5585,7 +5587,7 @@ fixed grid entries.
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>const&nbsp;int*</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a name='SkCanvas_Lattice_fYDivs'><code>fYDivs</code></a></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
-Array of y-coordinates that divide the bitmap horizontally.
+Array of y-axis values that divide the bitmap horizontally.
Array entries must be unique, increasing, greater than or equal to
<a href='#SkCanvas_Lattice_fBounds'>fBounds</a> top edge, and less than <a href='#SkCanvas_Lattice_fBounds'>fBounds</a> bottom edge.
Set the first element to <a href='#SkCanvas_Lattice_fBounds'>fBounds</a> top to collapse the top row of fixed
@@ -5981,10 +5983,9 @@ void <a href='#SkCanvas_drawPosText'>drawPosText</a>(const void* text, size_t by
described by <a href='#SkCanvas_drawPosText_byteLength'>byteLength</a> of <a href='#SkCanvas_drawPosText_text'>text</a>.
<a href='#SkCanvas_drawPosText_text'>text</a> meaning depends on <a href='SkPaint_Reference#Text_Encoding'>Paint Text Encoding</a>; by default, <a href='#SkCanvas_drawPosText_text'>text</a> is encoded as
-UTF-8. <a href='#SkCanvas_drawPosText_pos'>pos</a> elements meaning depends on <a href='SkPaint_Reference#Vertical_Text'>Paint Vertical Text</a>;
-by default each glyph left side bearing is positioned at x and its
-baseline is positioned at y. <a href='undocumented#Text'>Text</a> size is affected by <a href='#Matrix'>Matrix</a> and
-<a href='SkPaint_Reference#Text_Size'>Paint Text Size</a>.
+UTF-8. <a href='#SkCanvas_drawPosText_pos'>pos</a> elements meaning depends on <a href='SkPaint_Reference#Vertical_Text'>Paint Vertical Text</a>; by default
+glyph left side bearing and baseline are relative to <a href='SkPoint_Reference#Point'>Point</a> in <a href='#SkCanvas_drawPosText_pos'>pos</a> array.
+<a href='undocumented#Text'>Text</a> size is affected by <a href='#Matrix'>Matrix</a> and <a href='SkPaint_Reference#Text_Size'>Paint Text Size</a>.
All elements of <a href='#SkCanvas_drawPosText_paint'>paint</a>: <a href='undocumented#Path_Effect'>Path Effect</a>, <a href='undocumented#Mask_Filter'>Mask Filter</a>, <a href='undocumented#Shader'>Shader</a>,
<a href='undocumented#Color_Filter'>Color Filter</a>, <a href='undocumented#Image_Filter'>Image Filter</a>, and <a href='undocumented#Draw_Looper'>Draw Looper</a>; apply to <a href='#SkCanvas_drawPosText_text'>text</a>. By default, draws
@@ -6054,10 +6055,10 @@ baseline.
<td>byte length of <a href='#SkCanvas_drawPosTextH_text'>text</a> array</td>
</tr>
<tr> <td><a name='SkCanvas_drawPosTextH_xpos'><code><strong>xpos</strong></code></a></td>
- <td>array of x positions, used to position each glyph</td>
+ <td>array of x-axis positions, used to position each glyph</td>
</tr>
<tr> <td><a name='SkCanvas_drawPosTextH_constY'><code><strong>constY</strong></code></a></td>
- <td>shared y coordinate for all of x positions</td>
+ <td>shared y-axis value for all of x-axis positions</td>
</tr>
<tr> <td><a name='SkCanvas_drawPosTextH_paint'><code><strong>paint</strong></code></a></td>
<td><a href='#SkCanvas_drawPosTextH_text'>text</a> size, blend, color, and so on, used to draw</td>
@@ -6092,8 +6093,8 @@ than the <a href='#SkCanvas_drawTextOnPathHV_path'>path</a> length, the excess <
<a href='#SkCanvas_drawTextOnPathHV_text'>text</a> meaning depends on <a href='SkPaint_Reference#Text_Encoding'>Paint Text Encoding</a>; by default, <a href='#SkCanvas_drawTextOnPathHV_text'>text</a> is encoded as
UTF-8. Origin meaning depends on <a href='SkPaint_Reference#Text_Align'>Paint Text Align</a> and <a href='SkPaint_Reference#Vertical_Text'>Paint Vertical Text</a>; by
-default <a href='#SkCanvas_drawTextOnPathHV_text'>text</a> positions the first glyph left side bearing at origin x and its
-baseline at origin y. <a href='undocumented#Text'>Text</a> size is affected by <a href='#Matrix'>Matrix</a> and <a href='SkPaint_Reference#Text_Size'>Paint Text Size</a>.
+default <a href='#SkCanvas_drawTextOnPathHV_text'>text</a> positions the first glyph left side bearing and baseline relative
+to origin. <a href='undocumented#Text'>Text</a> size is affected by <a href='#Matrix'>Matrix</a> and <a href='SkPaint_Reference#Text_Size'>Paint Text Size</a>.
All elements of <a href='#SkCanvas_drawTextOnPathHV_paint'>paint</a>: <a href='undocumented#Path_Effect'>Path Effect</a>, <a href='undocumented#Mask_Filter'>Mask Filter</a>, <a href='undocumented#Shader'>Shader</a>,
<a href='undocumented#Color_Filter'>Color Filter</a>, <a href='undocumented#Image_Filter'>Image Filter</a>, and <a href='undocumented#Draw_Looper'>Draw Looper</a>; apply to <a href='#SkCanvas_drawTextOnPathHV_text'>text</a>. By default, draws
@@ -6151,8 +6152,8 @@ If the <a href='#SkCanvas_drawTextOnPath_text'>text</a> advance is larger than t
<a href='#SkCanvas_drawTextOnPath_text'>text</a> meaning depends on <a href='SkPaint_Reference#Text_Encoding'>Paint Text Encoding</a>; by default, <a href='#SkCanvas_drawTextOnPath_text'>text</a> is encoded as
UTF-8. Origin meaning depends on <a href='SkPaint_Reference#Text_Align'>Paint Text Align</a> and <a href='SkPaint_Reference#Vertical_Text'>Paint Vertical Text</a>; by
-default <a href='#SkCanvas_drawTextOnPath_text'>text</a> positions the first glyph left side bearing at origin x and its
-baseline at origin y. <a href='undocumented#Text'>Text</a> size is affected by <a href='#SkCanvas_drawTextOnPath_matrix'>matrix</a> parameter, <a href='#Canvas'>Canvas</a> <a href='#Matrix'>Matrix</a>,
+default <a href='#SkCanvas_drawTextOnPath_text'>text</a> positions the first glyph left side bearing and baseline relative
+to origin. <a href='undocumented#Text'>Text</a> size is affected by <a href='#SkCanvas_drawTextOnPath_matrix'>matrix</a> parameter, <a href='#Canvas'>Canvas</a> <a href='#Matrix'>Matrix</a>,
and <a href='SkPaint_Reference#Text_Size'>Paint Text Size</a>.
All elements of <a href='#SkCanvas_drawTextOnPath_paint'>paint</a>: <a href='undocumented#Path_Effect'>Path Effect</a>, <a href='undocumented#Mask_Filter'>Mask Filter</a>, <a href='undocumented#Shader'>Shader</a>,
@@ -6538,12 +6539,12 @@ void <a href='#SkCanvas_drawPatch'>drawPatch</a>(const <a href='SkPoint_Referenc
<a href='undocumented#SkBlendMode'>SkBlendMode</a> mode, const <a href='SkPaint_Reference#SkPaint'>SkPaint</a>& paint)
</pre>
-Draws a Coons_Patch: the interpolation of four <a href='#SkCanvas_drawPatch_cubics'>cubics</a> with shared corners,
-associating a color, and optionally a texture coordinate, with each corner.
+Draws a <a href='undocumented#Coons_Patch'>Coons Patch</a>: the interpolation of four <a href='#SkCanvas_drawPatch_cubics'>cubics</a> with shared corners,
+associating a color, and optionally a texture <a href='SkPoint_Reference#Point'>Point</a>, with each corner.
-Coons_Patch uses <a href='#Clip'>Clip</a> and <a href='#Matrix'>Matrix</a>, <a href='#SkCanvas_drawPatch_paint'>paint</a> <a href='undocumented#Shader'>Shader</a>, <a href='undocumented#Color_Filter'>Color Filter</a>,
+<a href='undocumented#Coons_Patch'>Coons Patch</a> uses <a href='#Clip'>Clip</a> and <a href='#Matrix'>Matrix</a>, <a href='#SkCanvas_drawPatch_paint'>paint</a> <a href='undocumented#Shader'>Shader</a>, <a href='undocumented#Color_Filter'>Color Filter</a>,
<a href='SkColor_Reference#Alpha'>Color Alpha</a>, <a href='undocumented#Image_Filter'>Image Filter</a>, and <a href='undocumented#Blend_Mode'>Blend Mode</a>. If <a href='undocumented#Shader'>Shader</a> is provided it is treated
-as Coons_Patch texture; <a href='undocumented#Blend_Mode'>Blend Mode</a> <a href='#SkCanvas_drawPatch_mode'>mode</a> combines <a href='SkColor_Reference#Color'>Color</a> <a href='#SkCanvas_drawPatch_colors'>colors</a> and <a href='undocumented#Shader'>Shader</a> if
+as <a href='undocumented#Coons_Patch'>Coons Patch</a> texture; <a href='undocumented#Blend_Mode'>Blend Mode</a> <a href='#SkCanvas_drawPatch_mode'>mode</a> combines <a href='SkColor_Reference#Color'>Color</a> <a href='#SkCanvas_drawPatch_colors'>colors</a> and <a href='undocumented#Shader'>Shader</a> if
both are provided.
<a href='SkPoint_Reference#Point'>Point</a> array <a href='#SkCanvas_drawPatch_cubics'>cubics</a> specifies four <a href='SkPath_Reference#Cubic'>Cubics</a> starting at the top-left corner,
@@ -6593,12 +6594,12 @@ void <a href='#SkCanvas_drawPatch'>drawPatch</a>(const <a href='SkPoint_Referenc
const <a href='SkPaint_Reference#SkPaint'>SkPaint</a>& paint)
</pre>
-Draws <a href='SkPath_Reference#Cubic'>Cubic</a> Coons_Patch: the interpolation of four <a href='#SkCanvas_drawPatch_2_cubics'>cubics</a> with shared corners,
-associating a color, and optionally a texture coordinate, with each corner.
+Draws <a href='SkPath_Reference#Cubic'>Cubic</a> <a href='undocumented#Coons_Patch'>Coons Patch</a>: the interpolation of four <a href='#SkCanvas_drawPatch_2_cubics'>cubics</a> with shared corners,
+associating a color, and optionally a texture <a href='SkPoint_Reference#Point'>Point</a>, with each corner.
-Coons_Patch uses <a href='#Clip'>Clip</a> and <a href='#Matrix'>Matrix</a>, <a href='#SkCanvas_drawPatch_2_paint'>paint</a> <a href='undocumented#Shader'>Shader</a>, <a href='undocumented#Color_Filter'>Color Filter</a>,
+<a href='undocumented#Coons_Patch'>Coons Patch</a> uses <a href='#Clip'>Clip</a> and <a href='#Matrix'>Matrix</a>, <a href='#SkCanvas_drawPatch_2_paint'>paint</a> <a href='undocumented#Shader'>Shader</a>, <a href='undocumented#Color_Filter'>Color Filter</a>,
<a href='SkColor_Reference#Alpha'>Color Alpha</a>, <a href='undocumented#Image_Filter'>Image Filter</a>, and <a href='undocumented#Blend_Mode'>Blend Mode</a>. If <a href='undocumented#Shader'>Shader</a> is provided it is treated
-as Coons_Patch texture; <a href='undocumented#Blend_Mode'>Blend Mode</a> mode combines <a href='SkColor_Reference#Color'>Color</a> <a href='#SkCanvas_drawPatch_2_colors'>colors</a> and <a href='undocumented#Shader'>Shader</a> if
+as <a href='undocumented#Coons_Patch'>Coons Patch</a> texture; <a href='undocumented#Blend_Mode'>Blend Mode</a> mode combines <a href='SkColor_Reference#Color'>Color</a> <a href='#SkCanvas_drawPatch_2_colors'>colors</a> and <a href='undocumented#Shader'>Shader</a> if
both are provided.
<a href='SkPoint_Reference#Point'>Point</a> array <a href='#SkCanvas_drawPatch_2_cubics'>cubics</a> specifies four <a href='SkPath_Reference#Cubic'>Cubics</a> starting at the top-left corner,
@@ -6905,10 +6906,10 @@ immediate drawing, call <a href='undocumented#SkDrawable_draw'>SkDrawable::draw(
<td>custom struct encapsulating drawing commands</td>
</tr>
<tr> <td><a name='SkCanvas_drawDrawable_2_x'><code><strong>x</strong></code></a></td>
- <td>offset into <a href='#Canvas'>Canvas</a> writable pixels in <a href='#SkCanvas_drawDrawable_2_x'>x</a></td>
+ <td>offset into <a href='#Canvas'>Canvas</a> writable pixels on <a href='#SkCanvas_drawDrawable_2_x'>x</a>-axis</td>
</tr>
<tr> <td><a name='SkCanvas_drawDrawable_2_y'><code><strong>y</strong></code></a></td>
- <td>offset into <a href='#Canvas'>Canvas</a> writable pixels in <a href='#SkCanvas_drawDrawable_2_y'>y</a></td>
+ <td>offset into <a href='#Canvas'>Canvas</a> writable pixels on <a href='#SkCanvas_drawDrawable_2_y'>y</a>-axis</td>
</tr>
</table>
diff --git a/site/user/api/SkColor_Reference.md b/site/user/api/SkColor_Reference.md
index 33316148c9..3d686e27af 100644
--- a/site/user/api/SkColor_Reference.md
+++ b/site/user/api/SkColor_Reference.md
@@ -643,7 +643,7 @@ Represents fully opaque black.
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
Represents fully opaque dark gray.
-Note that SVG_darkgray is equivalent to 0xFFA9A9A9.
+Note that <a href='undocumented#SVG_darkgray'>SVG darkgray</a> is equivalent to 0xFFA9A9A9.
</td>
</tr>
<tr>
@@ -652,7 +652,7 @@ Note that SVG_darkgray is equivalent to 0xFFA9A9A9.
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
Represents fully opaque gray.
-Note that HTML_Gray is equivalent to 0xFF808080.
+Note that <a href='undocumented#HTML_Gray'>HTML Gray</a> is equivalent to 0xFF808080.
</td>
</tr>
<tr style='background-color: #f0f0f0; '>
@@ -660,8 +660,8 @@ Note that HTML_Gray is equivalent to 0xFF808080.
<td style='text-align: center; border: 2px solid #dddddd; padding: 8px; '>0xFFCCCCCC</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
-Represents fully opaque light gray. HTML_Silver is equivalent to 0xFFC0C0C0.
-Note that SVG_lightgray is equivalent to 0xFFD3D3D3.
+Represents fully opaque light gray. <a href='undocumented#HTML_Silver'>HTML Silver</a> is equivalent to 0xFFC0C0C0.
+Note that <a href='undocumented#SVG_lightgray'>SVG lightgray</a> is equivalent to 0xFFD3D3D3.
</td>
</tr>
<tr>
@@ -685,8 +685,8 @@ Represents fully opaque red.
<td style='text-align: center; border: 2px solid #dddddd; padding: 8px; '>0xFF00FF00</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
-Represents fully opaque green. HTML_Lime is equivalent.
-Note that HTML_Green is equivalent to 0xFF008000.
+Represents fully opaque green. <a href='undocumented#HTML_Lime'>HTML Lime</a> is equivalent.
+Note that <a href='undocumented#HTML_Green'>HTML Green</a> is equivalent to 0xFF008000.
</td>
</tr>
<tr style='background-color: #f0f0f0; '>
@@ -710,7 +710,7 @@ Represents fully opaque yellow.
<td style='text-align: center; border: 2px solid #dddddd; padding: 8px; '>0xFF00FFFF</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
-Represents fully opaque cyan. HTML_Aqua is equivalent.
+Represents fully opaque cyan. <a href='undocumented#HTML_Aqua'>HTML Aqua</a> is equivalent.
</td>
</tr>
<tr>
@@ -718,7 +718,7 @@ Represents fully opaque cyan. HTML_Aqua is equivalent.
<td style='text-align: center; border: 2px solid #dddddd; padding: 8px; '>0xFFFF00FF</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
-Represents fully opaque magenta. HTML_Fuchsia is equivalent.
+Represents fully opaque magenta. <a href='undocumented#HTML_Fuchsia'>HTML Fuchsia</a> is equivalent.
</td>
</tr>
</table>
diff --git a/site/user/api/SkIRect_Reference.md b/site/user/api/SkIRect_Reference.md
index 764b67aab3..8f8014767f 100644
--- a/site/user/api/SkIRect_Reference.md
+++ b/site/user/api/SkIRect_Reference.md
@@ -1461,7 +1461,7 @@ If <a href='#SkIRect_makeOffset_dy'>dy</a> is positive, <a href='#IRect'>IRect</
### Return Value
-<a href='#IRect'>IRect</a> offset in x or y, with original width and height
+<a href='#IRect'>IRect</a> offset by <a href='#SkIRect_makeOffset_dx'>dx</a> and <a href='#SkIRect_makeOffset_dy'>dy</a>, with original width and height
### Example
@@ -1953,16 +1953,16 @@ Returns false if <a href='#IRect'>IRect</a> is empty or construction is empty.
### Parameters
<table> <tr> <td><a name='SkIRect_contains_2_left'><code><strong>left</strong></code></a></td>
- <td>x minimum of constructed <a href='#IRect'>IRect</a></td>
+ <td>x-axis minimum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_contains_2_top'><code><strong>top</strong></code></a></td>
- <td>y minimum of constructed <a href='#IRect'>IRect</a></td>
+ <td>y-axis minimum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_contains_2_right'><code><strong>right</strong></code></a></td>
- <td>x maximum of constructed <a href='#IRect'>IRect</a></td>
+ <td>x-axis maximum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_contains_2_bottom'><code><strong>bottom</strong></code></a></td>
- <td>y maximum of constructed <a href='#IRect'>IRect</a></td>
+ <td>y-axis maximum of constructed <a href='#IRect'>IRect</a></td>
</tr>
</table>
@@ -2092,16 +2092,16 @@ Return is undefined if <a href='#IRect'>IRect</a> is empty or construction is em
### Parameters
<table> <tr> <td><a name='SkIRect_containsNoEmptyCheck_left'><code><strong>left</strong></code></a></td>
- <td>x minimum of constructed <a href='#IRect'>IRect</a></td>
+ <td>x-axis minimum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_containsNoEmptyCheck_top'><code><strong>top</strong></code></a></td>
- <td>y minimum of constructed <a href='#IRect'>IRect</a></td>
+ <td>y-axis minimum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_containsNoEmptyCheck_right'><code><strong>right</strong></code></a></td>
- <td>x maximum of constructed <a href='#IRect'>IRect</a></td>
+ <td>x-axis maximum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_containsNoEmptyCheck_bottom'><code><strong>bottom</strong></code></a></td>
- <td>y maximum of constructed <a href='#IRect'>IRect</a></td>
+ <td>y-axis maximum of constructed <a href='#IRect'>IRect</a></td>
</tr>
</table>
@@ -2319,16 +2319,16 @@ Returns false if either construction or <a href='#IRect'>IRect</a> is empty, lea
### Parameters
<table> <tr> <td><a name='SkIRect_intersect_3_left'><code><strong>left</strong></code></a></td>
- <td>x minimum of constructed <a href='#IRect'>IRect</a></td>
+ <td>x-axis minimum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_intersect_3_top'><code><strong>top</strong></code></a></td>
- <td>y minimum of constructed <a href='#IRect'>IRect</a></td>
+ <td>y-axis minimum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_intersect_3_right'><code><strong>right</strong></code></a></td>
- <td>x maximum of constructed <a href='#IRect'>IRect</a></td>
+ <td>x-axis maximum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_intersect_3_bottom'><code><strong>bottom</strong></code></a></td>
- <td>y maximum of constructed <a href='#IRect'>IRect</a></td>
+ <td>y-axis maximum of constructed <a href='#IRect'>IRect</a></td>
</tr>
</table>
@@ -2480,16 +2480,16 @@ Has no effect if construction is empty. Otherwise, if <a href='#IRect'>IRect</a>
### Parameters
<table> <tr> <td><a name='SkIRect_join_left'><code><strong>left</strong></code></a></td>
- <td>x minimum of constructed <a href='#IRect'>IRect</a></td>
+ <td>x-axis minimum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_join_top'><code><strong>top</strong></code></a></td>
- <td>y minimum of constructed <a href='#IRect'>IRect</a></td>
+ <td>y-axis minimum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_join_right'><code><strong>right</strong></code></a></td>
- <td>x maximum of constructed <a href='#IRect'>IRect</a></td>
+ <td>x-axis maximum of constructed <a href='#IRect'>IRect</a></td>
</tr>
<tr> <td><a name='SkIRect_join_bottom'><code><strong>bottom</strong></code></a></td>
- <td>y maximum of constructed <a href='#IRect'>IRect</a></td>
+ <td>y-axis maximum of constructed <a href='#IRect'>IRect</a></td>
</tr>
</table>
diff --git a/site/user/api/SkImageInfo_Reference.md b/site/user/api/SkImageInfo_Reference.md
index 4e0ac4bd69..5cab53fb28 100644
--- a/site/user/api/SkImageInfo_Reference.md
+++ b/site/user/api/SkImageInfo_Reference.md
@@ -348,9 +348,9 @@ true if <a href='#SkAlphaTypeIsOpaque_at'>at</a> equals <a href='#kOpaque_SkAlph
Describes how pixel bits encode color. A pixel may be an alpha mask, a
<a href='undocumented#Grayscale'>Grayscale</a>, RGB, or ARGB.
-<a href='#kN32_SkColorType'>kN32_SkColorType</a> selects the native 32-bit ARGB format. On Little_Endian
+<a href='#kN32_SkColorType'>kN32_SkColorType</a> selects the native 32-bit ARGB format. On <a href='undocumented#Little_Endian'>Little Endian</a>
processors, pixels containing 8-bit ARGB components pack into 32-bit
-<a href='#kBGRA_8888_SkColorType'>kBGRA_8888_SkColorType</a>. On Big_Endian processors, pixels pack into 32-bit
+<a href='#kBGRA_8888_SkColorType'>kBGRA_8888_SkColorType</a>. On <a href='undocumented#Big_Endian'>Big Endian</a> processors, pixels pack into 32-bit
<a href='#kRGBA_8888_SkColorType'>kRGBA_8888_SkColorType</a>.
### Constants
@@ -567,7 +567,7 @@ If paired with <a href='#kOpaque_SkAlphaType'>kOpaque_SkAlphaType</a>: all alpha
red, green, and blue components are fully opaque. If any alpha component is
less than 255, the drawn result is undefined.
-On Big_Endian platforms, <a href='#kRGBA_8888_SkColorType'>kRGBA_8888_SkColorType</a> is the native <a href='#Color_Type'>Color Type</a>, and
+On <a href='undocumented#Big_Endian'>Big Endian</a> platforms, <a href='#kRGBA_8888_SkColorType'>kRGBA_8888_SkColorType</a> is the native <a href='#Color_Type'>Color Type</a>, and
will have the best performance. Use <a href='#kN32_SkColorType'>kN32_SkColorType</a> to choose the best
<a href='#Color_Type'>Color Type</a> for the platform at compile time.
@@ -616,7 +616,7 @@ If paired with <a href='#kOpaque_SkAlphaType'>kOpaque_SkAlphaType</a>: all alpha
blue, green, and red components are fully opaque. If any alpha component is
less than 255, the drawn result is undefined.
-On Little_Endian platforms, <a href='#kBGRA_8888_SkColorType'>kBGRA_8888_SkColorType</a> is the native <a href='#Color_Type'>Color Type</a>,
+On <a href='undocumented#Little_Endian'>Little Endian</a> platforms, <a href='#kBGRA_8888_SkColorType'>kBGRA_8888_SkColorType</a> is the native <a href='#Color_Type'>Color Type</a>,
and will have the best performance. Use <a href='#kN32_SkColorType'>kN32_SkColorType</a> to choose the best
<a href='#Color_Type'>Color Type</a> for the platform at compile time.
@@ -1142,7 +1142,7 @@ SkImageInfo global, <code>struct</code>, and <code>class</code> related member f
</tr>
<tr>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#Color_Type_BGRA_8888'>Color Type BGRA 8888</a></td>
- <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>encodes ARGB Little_Endian in 32 bits</td>
+ <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>encodes ARGB <a href='undocumented#Little_Endian'>Little Endian</a> in 32 bits</td>
</tr>
<tr style='background-color: #f0f0f0; '>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#Color_Type_Gray_8'>Color Type Gray 8</a></td>
@@ -1154,7 +1154,7 @@ SkImageInfo global, <code>struct</code>, and <code>class</code> related member f
</tr>
<tr style='background-color: #f0f0f0; '>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#Color_Type_RGBA_8888'>Color Type RGBA 8888</a></td>
- <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>encodes ARGB Big_Endian in 32 bits</td>
+ <td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>encodes ARGB <a href='undocumented#Big_Endian'>Big Endian</a> in 32 bits</td>
</tr>
<tr>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a href='#Color_Type_RGBA_F16'>Color Type RGBA F16</a></td>
diff --git a/site/user/api/SkImage_Reference.md b/site/user/api/SkImage_Reference.md
index 7f3f0054c3..5b45ed0c8f 100644
--- a/site/user/api/SkImage_Reference.md
+++ b/site/user/api/SkImage_Reference.md
@@ -899,7 +899,7 @@ static <a href='undocumented#sk_sp'>sk sp</a>&lt;<a href='#SkImage'>SkImage</a>&
Creates <a href='#Image'>Image</a> from encoded <a href='#SkImage_MakeCrossContextFromEncoded_data'>data</a>. <a href='#Image'>Image</a> is uploaded to GPU back-end using <a href='#SkImage_MakeCrossContextFromEncoded_context'>context</a>.
Created <a href='#Image'>Image</a> is available to other GPU contexts, and is available across thread
-boundaries. All contexts must be in the same GPU_Share_Group, or otherwise
+boundaries. All contexts must be in the same <a href='undocumented#GPU_Share_Group'>GPU Share Group</a>, or otherwise
share resources.
When <a href='#Image'>Image</a> is no longer referenced, <a href='#SkImage_MakeCrossContextFromEncoded_context'>context</a> releases texture memory
@@ -923,7 +923,7 @@ moving resources between contexts.
<td><a href='#Image'>Image</a> to decode</td>
</tr>
<tr> <td><a name='SkImage_MakeCrossContextFromEncoded_buildMips'><code><strong>buildMips</strong></code></a></td>
- <td>create <a href='#Image'>Image</a> as Mip_Map if true</td>
+ <td>create <a href='#Image'>Image</a> as <a href='undocumented#Mip_Map'>Mip Map</a> if true</td>
</tr>
<tr> <td><a name='SkImage_MakeCrossContextFromEncoded_dstColorSpace'><code><strong>dstColorSpace</strong></code></a></td>
<td>range of colors of matching <a href='SkSurface_Reference#Surface'>Surface</a> on GPU</td>
@@ -959,7 +959,7 @@ static <a href='undocumented#sk_sp'>sk sp</a>&lt;<a href='#SkImage'>SkImage</a>&
Creates <a href='#Image'>Image</a> from <a href='#SkImage_MakeCrossContextFromPixmap_pixmap'>pixmap</a>. <a href='#Image'>Image</a> is uploaded to GPU back-end using <a href='#SkImage_MakeCrossContextFromPixmap_context'>context</a>.
Created <a href='#Image'>Image</a> is available to other GPU contexts, and is available across thread
-boundaries. All contexts must be in the same GPU_Share_Group, or otherwise
+boundaries. All contexts must be in the same <a href='undocumented#GPU_Share_Group'>GPU Share Group</a>, or otherwise
share resources.
When <a href='#Image'>Image</a> is no longer referenced, <a href='#SkImage_MakeCrossContextFromPixmap_context'>context</a> releases texture memory
@@ -983,7 +983,7 @@ Recognized GPU formats vary by platform and GPU back-end.
<td><a href='SkImageInfo_Reference#Image_Info'>Image Info</a>, pixel address, and row bytes</td>
</tr>
<tr> <td><a name='SkImage_MakeCrossContextFromPixmap_buildMips'><code><strong>buildMips</strong></code></a></td>
- <td>create <a href='#Image'>Image</a> as Mip_Map if true</td>
+ <td>create <a href='#Image'>Image</a> as <a href='undocumented#Mip_Map'>Mip Map</a> if true</td>
</tr>
<tr> <td><a name='SkImage_MakeCrossContextFromPixmap_dstColorSpace'><code><strong>dstColorSpace</strong></code></a></td>
<td>range of colors of matching <a href='SkSurface_Reference#Surface'>Surface</a> on GPU</td>
@@ -1119,9 +1119,9 @@ static <a href='undocumented#sk_sp'>sk sp</a>&lt;<a href='#SkImage'>SkImage</a>&
</pre>
Creates <a href='#Image'>Image</a> from copy of <a href='#SkImage_MakeFromNV12TexturesCopy_nv12Textures'>nv12Textures</a>, an array of textures on GPU.
-<a href='#SkImage_MakeFromNV12TexturesCopy_nv12Textures'>nv12Textures</a>[0] contains pixels for YUV_Component_Y plane.
-<a href='#SkImage_MakeFromNV12TexturesCopy_nv12Textures'>nv12Textures</a>[1] contains pixels for YUV_Component_U plane,
-followed by pixels for YUV_Component_V plane.
+<a href='#SkImage_MakeFromNV12TexturesCopy_nv12Textures'>nv12Textures</a>[0] contains pixels for <a href='undocumented#YUV_Component_Y'>YUV Component Y</a> plane.
+<a href='#SkImage_MakeFromNV12TexturesCopy_nv12Textures'>nv12Textures</a>[1] contains pixels for <a href='undocumented#YUV_Component_U'>YUV Component U</a> plane,
+followed by pixels for <a href='undocumented#YUV_Component_V'>YUV Component V</a> plane.
Returned <a href='#Image'>Image</a> has the dimensions <a href='#SkImage_MakeFromNV12TexturesCopy_nv12Textures'>nv12Textures</a>[2].
<a href='#SkImage_MakeFromNV12TexturesCopy_yuvColorSpace'>yuvColorSpace</a> describes how YUV colors convert to RGB colors.
@@ -1662,12 +1662,12 @@ transforming <a href='#Image'>Image</a> before <a href='SkCanvas_Reference#Matri
### Parameters
<table> <tr> <td><a name='SkImage_makeShader_tileMode1'><code><strong>tileMode1</strong></code></a></td>
- <td>tiling in x, one of: <a href='undocumented#SkShader_kClamp_TileMode'>SkShader::kClamp TileMode</a>, <a href='undocumented#SkShader_kRepeat_TileMode'>SkShader::kRepeat TileMode</a>,
-<a href='undocumented#SkShader_kMirror_TileMode'>SkShader::kMirror TileMode</a></td>
+ <td>tiling on x-axis, one of: <a href='undocumented#SkShader_kClamp_TileMode'>SkShader::kClamp TileMode</a>,
+<a href='undocumented#SkShader_kRepeat_TileMode'>SkShader::kRepeat TileMode</a>, <a href='undocumented#SkShader_kMirror_TileMode'>SkShader::kMirror TileMode</a></td>
</tr>
<tr> <td><a name='SkImage_makeShader_tileMode2'><code><strong>tileMode2</strong></code></a></td>
- <td>tiling in y, one of: <a href='undocumented#SkShader_kClamp_TileMode'>SkShader::kClamp TileMode</a>, <a href='undocumented#SkShader_kRepeat_TileMode'>SkShader::kRepeat TileMode</a>,
-<a href='undocumented#SkShader_kMirror_TileMode'>SkShader::kMirror TileMode</a></td>
+ <td>tiling on y-axis, one of: <a href='undocumented#SkShader_kClamp_TileMode'>SkShader::kClamp TileMode</a>,
+<a href='undocumented#SkShader_kRepeat_TileMode'>SkShader::kRepeat TileMode</a>, <a href='undocumented#SkShader_kMirror_TileMode'>SkShader::kMirror TileMode</a></td>
</tr>
<tr> <td><a name='SkImage_makeShader_localMatrix'><code><strong>localMatrix</strong></code></a></td>
<td><a href='#Image'>Image</a> transformation, or nullptr</td>
@@ -2319,14 +2319,14 @@ partial or full <a href='#Image'>Image</a>, or nullptr
<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0">
<a href='undocumented#sk_sp'>sk sp</a>&lt;<a href='#SkImage'>SkImage</a>&gt; <a href='#SkImage_makeTextureImage'>makeTextureImage</a>(<a href='undocumented#GrContext'>GrContext</a>* context, <a href='undocumented#SkColorSpace'>SkColorSpace</a>* dstColorSpace,
- mipMapped = GrMipMapped::kNo) const
+ <a href='undocumented#GrMipMapped'>GrMipMapped</a> mipMapped = <a href='undocumented#GrMipMapped_kNo'>GrMipMapped::kNo</a>) const
</pre>
Returns <a href='#Image'>Image</a> backed by <a href='undocumented#GPU_Texture'>GPU Texture</a> associated with <a href='#SkImage_makeTextureImage_context'>context</a>. Returned <a href='#Image'>Image</a> is
-compatible with <a href='SkSurface_Reference#Surface'>Surface</a> created with <a href='#SkImage_makeTextureImage_dstColorSpace'>dstColorSpace</a>. The returned <a href='#Image'>Image</a> will also
-support the request status. In other words if <a href='#SkImage_makeTextureImage_mipMapped'>mipMapped</a> is GrMipMapped::kYes,
-then the backing texture will have Mip_Map levels allocated. Returns original <a href='#Image'>Image</a> if <a href='#SkImage_makeTextureImage_context'>context</a>
-and <a href='#SkImage_makeTextureImage_dstColorSpace'>dstColorSpace</a> match and <a href='#SkImage_makeTextureImage_mipMapped'>mipMapped</a> is compatible with the backing <a href='undocumented#GPU_Texture'>GPU Texture</a>.
+compatible with <a href='SkSurface_Reference#Surface'>Surface</a> created with <a href='#SkImage_makeTextureImage_dstColorSpace'>dstColorSpace</a>. The returned <a href='#Image'>Image</a> respects
+<a href='#SkImage_makeTextureImage_mipMapped'>mipMapped</a> setting; if <a href='#SkImage_makeTextureImage_mipMapped'>mipMapped</a> equals <a href='undocumented#GrMipMapped_kYes'>GrMipMapped::kYes</a>, the backing texture
+allocates <a href='undocumented#Mip_Map'>Mip Map</a> levels. Returns original <a href='#Image'>Image</a> if <a href='#SkImage_makeTextureImage_context'>context</a>
+and <a href='#SkImage_makeTextureImage_dstColorSpace'>dstColorSpace</a> match and <a href='#SkImage_makeTextureImage_mipMapped'>mipMapped</a> is compatible with backing <a href='undocumented#GPU_Texture'>GPU Texture</a>.
Returns nullptr if <a href='#SkImage_makeTextureImage_context'>context</a> is nullptr, or if <a href='#Image'>Image</a> was created with another
<a href='undocumented#GrContext'>GrContext</a>.
@@ -2340,7 +2340,7 @@ Returns nullptr if <a href='#SkImage_makeTextureImage_context'>context</a> is nu
<td>range of colors of matching <a href='SkSurface_Reference#Surface'>Surface</a> on GPU</td>
</tr>
<tr> <td><a name='SkImage_makeTextureImage_mipMapped'><code><strong>mipMapped</strong></code></a></td>
- <td>whether the returned <a href='#SkImage'>SkImage</a>'s texture must have allocated Mip_Map levels</td>
+ <td>whether created <a href='#Image'>Image</a> texture must allocate <a href='undocumented#Mip_Map'>Mip Map</a> levels</td>
</tr>
</table>
diff --git a/site/user/api/SkMatrix_Reference.md b/site/user/api/SkMatrix_Reference.md
index 33ad804cf5..d2ffdd14ad 100644
--- a/site/user/api/SkMatrix_Reference.md
+++ b/site/user/api/SkMatrix_Reference.md
@@ -818,10 +818,10 @@ Sets <a href='#Matrix'>Matrix</a> to:
<td>vertical translation</td>
</tr>
<tr> <td><a name='SkMatrix_MakeAll_pers0'><code><strong>pers0</strong></code></a></td>
- <td>input x perspective factor</td>
+ <td>input x-axis perspective factor</td>
</tr>
<tr> <td><a name='SkMatrix_MakeAll_pers1'><code><strong>pers1</strong></code></a></td>
- <td>input y perspective factor</td>
+ <td>input y-axis perspective factor</td>
</tr>
<tr> <td><a name='SkMatrix_MakeAll_pers2'><code><strong>pers2</strong></code></a></td>
<td>perspective scale factor</td>
@@ -1191,7 +1191,7 @@ bool <a href='#SkMatrix_rectStaysRect'>rectStaysRect</a>() const
</pre>
Returns true <a href='#Matrix'>Matrix</a> maps <a href='SkRect_Reference#Rect'>Rect</a> to another <a href='SkRect_Reference#Rect'>Rect</a>. If true, <a href='#Matrix'>Matrix</a> is identity,
-or scales, or rotates a multiple of 90 degrees, or mirrors in x or y. In all
+or scales, or rotates a multiple of 90 degrees, or mirrors on axes. In all
cases, <a href='#Matrix'>Matrix</a> may also have translation. <a href='#Matrix'>Matrix</a> form is either:
<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
@@ -1246,7 +1246,7 @@ bool <a href='#SkMatrix_preservesAxisAlignment'>preservesAxisAlignment</a>() con
</pre>
Returns true <a href='#Matrix'>Matrix</a> maps <a href='SkRect_Reference#Rect'>Rect</a> to another <a href='SkRect_Reference#Rect'>Rect</a>. If true, <a href='#Matrix'>Matrix</a> is identity,
-or scales, or rotates a multiple of 90 degrees, or mirrors in x or y. In all
+or scales, or rotates a multiple of 90 degrees, or mirrors on axes. In all
cases, <a href='#Matrix'>Matrix</a> may also have translation. <a href='#Matrix'>Matrix</a> form is either:
<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
@@ -1339,7 +1339,7 @@ degenerate forms that collapse to a line or point.
Describes that the <a href='#Matrix'>Matrix</a> makes rendering with and without the matrix are
visually alike; a transformed circle remains a circle. Mathematically, this is
-referred to as similarity of a Euclidean_Space, or a similarity transformation.
+referred to as similarity of a <a href='undocumented#Euclidean_Space'>Euclidean Space</a>, or a similarity transformation.
Preserves right angles, keeping the arms of the angle equal lengths.
@@ -1778,7 +1778,7 @@ matrix.get(SkMatrix::kMSkewY) == 24
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkMatrix_getScaleX'>getScaleX</a>() const
</pre>
-Returns scale factor multiplied by x input, contributing to x output.
+Returns scale factor multiplied by x-axis input, contributing to x-axis output.
With <a href='#SkMatrix_mapPoints'>mapPoints</a>, scales <a href='SkPoint_Reference#Point'>Points</a> along the x-axis.
### Return Value
@@ -1810,7 +1810,7 @@ matrix.getScaleX() == 42
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkMatrix_getScaleY'>getScaleY</a>() const
</pre>
-Returns scale factor multiplied by y input, contributing to y output.
+Returns scale factor multiplied by y-axis input, contributing to y-axis output.
With <a href='#SkMatrix_mapPoints'>mapPoints</a>, scales <a href='SkPoint_Reference#Point'>Points</a> along the y-axis.
### Return Value
@@ -1842,9 +1842,9 @@ matrix.getScaleY() == 24
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkMatrix_getSkewY'>getSkewY</a>() const
</pre>
-Returns scale factor multiplied by x input, contributing to y output.
+Returns scale factor multiplied by x-axis input, contributing to y-axis output.
With <a href='#SkMatrix_mapPoints'>mapPoints</a>, skews <a href='SkPoint_Reference#Point'>Points</a> along the y-axis.
-Skew x and y together can rotate <a href='SkPoint_Reference#Point'>Points</a>.
+Skewing both axes can rotate <a href='SkPoint_Reference#Point'>Points</a>.
### Return Value
@@ -1875,9 +1875,9 @@ matrix.getSkewY() == 24
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkMatrix_getSkewX'>getSkewX</a>() const
</pre>
-Returns scale factor multiplied by y input, contributing to x output.
+Returns scale factor multiplied by y-axis input, contributing to x-axis output.
With <a href='#SkMatrix_mapPoints'>mapPoints</a>, skews <a href='SkPoint_Reference#Point'>Points</a> along the x-axis.
-Skew x and y together can rotate <a href='SkPoint_Reference#Point'>Points</a>.
+Skewing both axes can rotate <a href='SkPoint_Reference#Point'>Points</a>.
### Return Value
@@ -1908,7 +1908,7 @@ matrix.getSkewX() == 42
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkMatrix_getTranslateX'>getTranslateX</a>() const
</pre>
-Returns translation contributing to x output.
+Returns translation contributing to x-axis output.
With <a href='#SkMatrix_mapPoints'>mapPoints</a>, moves <a href='SkPoint_Reference#Point'>Points</a> along the x-axis.
### Return Value
@@ -1940,7 +1940,7 @@ matrix.getTranslateX() == 42
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkMatrix_getTranslateY'>getTranslateY</a>() const
</pre>
-Returns translation contributing to y output.
+Returns translation contributing to y-axis output.
With <a href='#SkMatrix_mapPoints'>mapPoints</a>, moves <a href='SkPoint_Reference#Point'>Points</a> along the y-axis.
### Return Value
@@ -1972,11 +1972,11 @@ matrix.getTranslateY() == 24
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkMatrix_getPerspX'>getPerspX</a>() const
</pre>
-Returns factor scaling input x relative to input y.
+Returns factor scaling input x-axis relative to input y-axis.
### Return Value
-input x perspective factor
+input x-axis perspective factor
### Example
@@ -1995,11 +1995,11 @@ input x perspective factor
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkMatrix_getPerspY'>getPerspY</a>() const
</pre>
-Returns factor scaling input y relative to input x.
+Returns factor scaling input y-axis relative to input x-axis.
### Return Value
-input y perspective factor
+input y-axis perspective factor
### Example
@@ -2414,8 +2414,8 @@ Sets vertical translation.
void <a href='#SkMatrix_setPerspX'>setPerspX</a>(<a href='undocumented#SkScalar'>SkScalar</a> v)
</pre>
-Sets input x perspective factor, which causes <a href='#SkMatrix_mapXY'>mapXY</a> to vary input x inversely
-proportional to input y.
+Sets input x-axis perspective factor, which causes <a href='#SkMatrix_mapXY'>mapXY</a> to vary input x-axis values
+inversely proportional to input y-axis values.
### Parameters
@@ -2441,8 +2441,8 @@ proportional to input y.
void <a href='#SkMatrix_setPerspY'>setPerspY</a>(<a href='undocumented#SkScalar'>SkScalar</a> v)
</pre>
-Sets input y perspective factor, which causes <a href='#SkMatrix_mapXY'>mapXY</a> to vary input y inversely
-proportional to input x.
+Sets input y-axis perspective factor, which causes <a href='#SkMatrix_mapXY'>mapXY</a> to vary input y-axis values
+inversely proportional to input x-axis values.
### Parameters
@@ -2498,10 +2498,10 @@ Sets all values from parameters. Sets matrix to:
<td>vertical translation to store</td>
</tr>
<tr> <td><a name='SkMatrix_setAll_persp0'><code><strong>persp0</strong></code></a></td>
- <td>input x perspective factor to store</td>
+ <td>input x-axis values perspective factor to store</td>
</tr>
<tr> <td><a name='SkMatrix_setAll_persp1'><code><strong>persp1</strong></code></a></td>
- <td>input y perspective factor to store</td>
+ <td>input y-axis values perspective factor to store</td>
</tr>
<tr> <td><a name='SkMatrix_setAll_persp2'><code><strong>persp2</strong></code></a></td>
<td>perspective scale factor to store</td>
@@ -2863,16 +2863,16 @@ The pivot point is unchanged when mapped with <a href='#Matrix'>Matrix</a>.
### Parameters
<table> <tr> <td><a name='SkMatrix_setSinCos_sinValue'><code><strong>sinValue</strong></code></a></td>
- <td>rotation vector x component</td>
+ <td>rotation vector x-axis component</td>
</tr>
<tr> <td><a name='SkMatrix_setSinCos_cosValue'><code><strong>cosValue</strong></code></a></td>
- <td>rotation vector y component</td>
+ <td>rotation vector y-axis component</td>
</tr>
<tr> <td><a name='SkMatrix_setSinCos_px'><code><strong>px</strong></code></a></td>
- <td>pivot x</td>
+ <td>pivot x-axis</td>
</tr>
<tr> <td><a name='SkMatrix_setSinCos_py'><code><strong>py</strong></code></a></td>
- <td>pivot y</td>
+ <td>pivot y-axis</td>
</tr>
</table>
@@ -2900,10 +2900,10 @@ Sets <a href='#Matrix'>Matrix</a> to rotate by <a href='#SkMatrix_setSinCos_2_si
### Parameters
<table> <tr> <td><a name='SkMatrix_setSinCos_2_sinValue'><code><strong>sinValue</strong></code></a></td>
- <td>rotation vector x component</td>
+ <td>rotation vector x-axis component</td>
</tr>
<tr> <td><a name='SkMatrix_setSinCos_2_cosValue'><code><strong>cosValue</strong></code></a></td>
- <td>rotation vector y component</td>
+ <td>rotation vector y-axis component</td>
</tr>
</table>
@@ -3093,10 +3093,10 @@ Matrix * T(dx, dy) = | D E F | | 0 1 dy | = | D E D*dx+E*dy+F |
### Parameters
<table> <tr> <td><a name='SkMatrix_preTranslate_dx'><code><strong>dx</strong></code></a></td>
- <td>x translation before applying <a href='#Matrix'>Matrix</a></td>
+ <td>x-axis translation before applying <a href='#Matrix'>Matrix</a></td>
</tr>
<tr> <td><a name='SkMatrix_preTranslate_dy'><code><strong>dy</strong></code></a></td>
- <td>y translation before applying <a href='#Matrix'>Matrix</a></td>
+ <td>y-axis translation before applying <a href='#Matrix'>Matrix</a></td>
</tr>
</table>
@@ -3509,10 +3509,10 @@ T(dx, dy) * Matrix = | 0 1 dy | | M N O | = | M+dy*P N+dy*Q O+dy*R |
### Parameters
<table> <tr> <td><a name='SkMatrix_postTranslate_dx'><code><strong>dx</strong></code></a></td>
- <td>x translation after applying <a href='#Matrix'>Matrix</a></td>
+ <td>x-axis translation after applying <a href='#Matrix'>Matrix</a></td>
</tr>
<tr> <td><a name='SkMatrix_postTranslate_dy'><code><strong>dy</strong></code></a></td>
- <td>y translation after applying <a href='#Matrix'>Matrix</a></td>
+ <td>y-axis translation after applying <a href='#Matrix'>Matrix</a></td>
</tr>
</table>
@@ -4627,10 +4627,10 @@ Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , -------
### Parameters
<table> <tr> <td><a name='SkMatrix_mapXY_x'><code><strong>x</strong></code></a></td>
- <td><a href='#SkMatrix_mapXY_x'>x</a>-coordinate of <a href='SkPoint_Reference#Point'>Point</a> to map</td>
+ <td><a href='#SkMatrix_mapXY_x'>x</a>-axis value of <a href='SkPoint_Reference#Point'>Point</a> to map</td>
</tr>
<tr> <td><a name='SkMatrix_mapXY_y'><code><strong>y</strong></code></a></td>
- <td><a href='#SkMatrix_mapXY_y'>y</a>-coordinate of <a href='SkPoint_Reference#Point'>Point</a> to map</td>
+ <td><a href='#SkMatrix_mapXY_y'>y</a>-axis value of <a href='SkPoint_Reference#Point'>Point</a> to map</td>
</tr>
<tr> <td><a name='SkMatrix_mapXY_result'><code><strong>result</strong></code></a></td>
<td>storage for mapped <a href='SkPoint_Reference#Point'>Point</a></td>
@@ -4672,10 +4672,10 @@ Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , -------
### Parameters
<table> <tr> <td><a name='SkMatrix_mapXY_2_x'><code><strong>x</strong></code></a></td>
- <td><a href='#SkMatrix_mapXY_2_x'>x</a>-coordinate of <a href='SkPoint_Reference#Point'>Point</a> to map</td>
+ <td><a href='#SkMatrix_mapXY_2_x'>x</a>-axis value of <a href='SkPoint_Reference#Point'>Point</a> to map</td>
</tr>
<tr> <td><a name='SkMatrix_mapXY_2_y'><code><strong>y</strong></code></a></td>
- <td><a href='#SkMatrix_mapXY_2_y'>y</a>-coordinate of <a href='SkPoint_Reference#Point'>Point</a> to map</td>
+ <td><a href='#SkMatrix_mapXY_2_y'>y</a>-axis value of <a href='SkPoint_Reference#Point'>Point</a> to map</td>
</tr>
</table>
@@ -4831,10 +4831,10 @@ Matrix * vec = |D E 0| |dy| = |A*dx+B*dy D*dx+E*dy G*dx+H*dy+I| = ----------- ,
### Parameters
<table> <tr> <td><a name='SkMatrix_mapVector_dx'><code><strong>dx</strong></code></a></td>
- <td>x-coordinate of <a href='SkPoint_Reference#Vector'>Vector</a> to map</td>
+ <td>x-axis value of <a href='SkPoint_Reference#Vector'>Vector</a> to map</td>
</tr>
<tr> <td><a name='SkMatrix_mapVector_dy'><code><strong>dy</strong></code></a></td>
- <td>y-coordinate of <a href='SkPoint_Reference#Vector'>Vector</a> to map</td>
+ <td>y-axis value of <a href='SkPoint_Reference#Vector'>Vector</a> to map</td>
</tr>
<tr> <td><a name='SkMatrix_mapVector_result'><code><strong>result</strong></code></a></td>
<td>storage for mapped <a href='SkPoint_Reference#Vector'>Vector</a></td>
@@ -4877,10 +4877,10 @@ Matrix * vec = |D E 0| |dy| = |A*dx+B*dy D*dx+E*dy G*dx+H*dy+I| = ----------- ,
### Parameters
<table> <tr> <td><a name='SkMatrix_mapVector_2_dx'><code><strong>dx</strong></code></a></td>
- <td>x-coordinate of <a href='SkPoint_Reference#Vector'>Vector</a> to map</td>
+ <td>x-axis value of <a href='SkPoint_Reference#Vector'>Vector</a> to map</td>
</tr>
<tr> <td><a name='SkMatrix_mapVector_2_dy'><code><strong>dy</strong></code></a></td>
- <td>y-coordinate of <a href='SkPoint_Reference#Vector'>Vector</a> to map</td>
+ <td>y-axis value of <a href='SkPoint_Reference#Vector'>Vector</a> to map</td>
</tr>
</table>
@@ -5121,9 +5121,9 @@ the area enclosed by the ellipse major and minor axes.
bool <a href='#SkMatrix_isFixedStepInX'>isFixedStepInX</a>() const
</pre>
-Returns true if a unit step in x at some y mapped through <a href='#Matrix'>Matrix</a> can be
-represented by a constant <a href='SkPoint_Reference#Vector'>Vector</a>. Returns true if <a href='#SkMatrix_getType'>getType</a> returns <a href='#SkMatrix_kIdentity_Mask'>kIdentity Mask</a>,
-or combinations of: <a href='#SkMatrix_kTranslate_Mask'>kTranslate Mask</a>, <a href='#SkMatrix_kScale_Mask'>kScale Mask</a>, and <a href='#SkMatrix_kAffine_Mask'>kAffine Mask</a>.
+Returns true if a unit step on x-axis at some y-axis value mapped through <a href='#Matrix'>Matrix</a>
+can be represented by a constant <a href='SkPoint_Reference#Vector'>Vector</a>. Returns true if <a href='#SkMatrix_getType'>getType</a> returns
+<a href='#SkMatrix_kIdentity_Mask'>kIdentity Mask</a>, or combinations of: <a href='#SkMatrix_kTranslate_Mask'>kTranslate Mask</a>, <a href='#SkMatrix_kScale_Mask'>kScale Mask</a>, and <a href='#SkMatrix_kAffine_Mask'>kAffine Mask</a>.
May return true if <a href='#SkMatrix_getType'>getType</a> returns <a href='#SkMatrix_kPerspective_Mask'>kPerspective Mask</a>, but only when <a href='#Matrix'>Matrix</a>
does not include rotation or skewing along the y-axis.
@@ -5172,7 +5172,7 @@ isFixedStepInX: false
<a href='SkPoint_Reference#SkVector'>SkVector</a> <a href='#SkMatrix_fixedStepInX'>fixedStepInX</a>(<a href='undocumented#SkScalar'>SkScalar</a> y) const
</pre>
-Returns <a href='SkPoint_Reference#Vector'>Vector</a> representing a unit step in x at <a href='#SkMatrix_fixedStepInX_y'>y</a> mapped through <a href='#Matrix'>Matrix</a>.
+Returns <a href='SkPoint_Reference#Vector'>Vector</a> representing a unit step on x-axis at <a href='#SkMatrix_fixedStepInX_y'>y</a> mapped through <a href='#Matrix'>Matrix</a>.
If <a href='#SkMatrix_isFixedStepInX'>isFixedStepInX</a> is false, returned value is undefined.
### Parameters
@@ -5184,7 +5184,7 @@ If <a href='#SkMatrix_isFixedStepInX'>isFixedStepInX</a> is false, returned valu
### Return Value
-<a href='SkPoint_Reference#Vector'>Vector</a> advance of mapped unit step in x
+<a href='SkPoint_Reference#Vector'>Vector</a> advance of mapped unit step on x-axis
### Example
@@ -5490,8 +5490,8 @@ bool <a href='#SkMatrix_decomposeScale'>decomposeScale</a>(<a href='undocumented
Decomposes <a href='#Matrix'>Matrix</a> into <a href='#SkMatrix_decomposeScale_scale'>scale</a> components and whatever remains. Returns false if
<a href='#Matrix'>Matrix</a> could not be decomposed.
-Sets <a href='#SkMatrix_decomposeScale_scale'>scale</a> to portion of <a href='#Matrix'>Matrix</a> that scales in x and y. Sets <a href='#SkMatrix_decomposeScale_remaining'>remaining</a> to <a href='#Matrix'>Matrix</a>
-with x and y scaling factored out. <a href='#SkMatrix_decomposeScale_remaining'>remaining</a> may be passed as nullptr
+Sets <a href='#SkMatrix_decomposeScale_scale'>scale</a> to portion of <a href='#Matrix'>Matrix</a> that <a href='#SkMatrix_decomposeScale_scale'>scale</a> axes. Sets <a href='#SkMatrix_decomposeScale_remaining'>remaining</a> to <a href='#Matrix'>Matrix</a>
+with scaling factored out. <a href='#SkMatrix_decomposeScale_remaining'>remaining</a> may be passed as nullptr
to determine if <a href='#Matrix'>Matrix</a> can be decomposed without computing remainder.
Returns true if <a href='#SkMatrix_decomposeScale_scale'>scale</a> components are found. <a href='#SkMatrix_decomposeScale_scale'>scale</a> and <a href='#SkMatrix_decomposeScale_remaining'>remaining</a> are
@@ -5503,7 +5503,7 @@ On success<a href='#Matrix'>Matrix</a> = <a href='#SkMatrix_decomposeScale_scale
### Parameters
<table> <tr> <td><a name='SkMatrix_decomposeScale_scale'><code><strong>scale</strong></code></a></td>
- <td>x and y scaling factors; may be nullptr</td>
+ <td>axes scaling factors; may be nullptr</td>
</tr>
<tr> <td><a name='SkMatrix_decomposeScale_remaining'><code><strong>remaining</strong></code></a></td>
<td><a href='#Matrix'>Matrix</a> without scaling; may be nullptr</td>
diff --git a/site/user/api/SkPaint_Reference.md b/site/user/api/SkPaint_Reference.md
index 8a07616f9a..7ef986d432 100644
--- a/site/user/api/SkPaint_Reference.md
+++ b/site/user/api/SkPaint_Reference.md
@@ -4940,9 +4940,9 @@ SkPaint members may be read and written directly without using a member function
computed by <a href='undocumented#Font_Manager'>Font Manager</a> using <a href='undocumented#Typeface'>Typeface</a>. Values are set to zero if they are
not available.
-All vertical values relative to the baseline are given y-down. As such, zero is on the
-baseline, negative values are above the baseline, and positive values are below the
-baseline.
+All vertical values are relative to the baseline, on a y-axis pointing down.
+Zero is on the baseline, negative values are above the baseline, and positive
+values are below the baseline.
<a href='#SkPaint_FontMetrics_fUnderlineThickness'>fUnderlineThickness</a> and <a href='#SkPaint_FontMetrics_fUnderlinePosition'>fUnderlinePosition</a> have a bit set in <a href='#SkPaint_FontMetrics_fFlags'>fFlags</a> if their values
are valid, since their value may be zero.
@@ -5067,7 +5067,7 @@ maximum character width</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>SkScalar</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a name='SkPaint_FontMetrics_fXMin'><code>fXMin</code></a></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
-Minimum bounding box x-value for all <a href='undocumented#Glyph'>Glyphs</a>.
+Minimum bounding box x-axis value for all <a href='undocumented#Glyph'>Glyphs</a>.
Typically less than zero.
</td>
</tr>
@@ -5075,7 +5075,7 @@ Typically less than zero.
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>SkScalar</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '><a name='SkPaint_FontMetrics_fXMax'><code>fXMax</code></a></td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
-Maximum bounding box x value for all <a href='undocumented#Glyph'>Glyphs</a>.
+Maximum bounding box x-axis value for all <a href='undocumented#Glyph'>Glyphs</a>.
Typically greater than zero.
</td>
</tr>
@@ -5726,10 +5726,10 @@ Uses <a href='#SkPaint_getTextPath_x'>x</a>, <a href='#SkPaint_getTextPath_y'>y<
<td>number of bytes of <a href='#SkPaint_getTextPath_text'>text</a></td>
</tr>
<tr> <td><a name='SkPaint_getTextPath_x'><code><strong>x</strong></code></a></td>
- <td><a href='#SkPaint_getTextPath_x'>x</a>-coordinate of the origin of the <a href='#SkPaint_getTextPath_text'>text</a></td>
+ <td><a href='#SkPaint_getTextPath_x'>x</a>-axis value of the origin of the <a href='#SkPaint_getTextPath_text'>text</a></td>
</tr>
<tr> <td><a name='SkPaint_getTextPath_y'><code><strong>y</strong></code></a></td>
- <td><a href='#SkPaint_getTextPath_y'>y</a>-coordinate of the origin of the <a href='#SkPaint_getTextPath_text'>text</a></td>
+ <td><a href='#SkPaint_getTextPath_y'>y</a>-axis value of the origin of the <a href='#SkPaint_getTextPath_text'>text</a></td>
</tr>
<tr> <td><a name='SkPaint_getTextPath_path'><code><strong>path</strong></code></a></td>
<td>geometry of the <a href='undocumented#Glyph'>Glyphs</a></td>
@@ -5816,10 +5816,10 @@ Pass nullptr for <a href='#SkPaint_getTextIntercepts_intervals'>intervals</a> to
<td>number of bytes of <a href='#SkPaint_getTextIntercepts_text'>text</a></td>
</tr>
<tr> <td><a name='SkPaint_getTextIntercepts_x'><code><strong>x</strong></code></a></td>
- <td><a href='#SkPaint_getTextIntercepts_x'>x</a>-coordinate of the origin of the <a href='#SkPaint_getTextIntercepts_text'>text</a></td>
+ <td><a href='#SkPaint_getTextIntercepts_x'>x</a>-axis value of the origin of the <a href='#SkPaint_getTextIntercepts_text'>text</a></td>
</tr>
<tr> <td><a name='SkPaint_getTextIntercepts_y'><code><strong>y</strong></code></a></td>
- <td><a href='#SkPaint_getTextIntercepts_y'>y</a>-coordinate of the origin of the <a href='#SkPaint_getTextIntercepts_text'>text</a></td>
+ <td><a href='#SkPaint_getTextIntercepts_y'>y</a>-axis value of the origin of the <a href='#SkPaint_getTextIntercepts_text'>text</a></td>
</tr>
<tr> <td><a name='SkPaint_getTextIntercepts_bounds'><code><strong>bounds</strong></code></a></td>
<td>lower and upper line parallel to the advance</td>
diff --git a/site/user/api/SkPath_Reference.md b/site/user/api/SkPath_Reference.md
index a00c7922e4..5d151be5de 100644
--- a/site/user/api/SkPath_Reference.md
+++ b/site/user/api/SkPath_Reference.md
@@ -78,7 +78,7 @@ makes them visible.
# <a name='SkPath'>Class SkPath</a>
<a href='#Path'>Paths</a> contain geometry. <a href='#Path'>Paths</a> may be empty, or contain one or more <a href='#Verb'>Verbs</a> that
-outline a figure. <a href='#Path'>Path</a> always starts with a move verb to a Cartesian_Coordinate,
+outline a figure. <a href='#Path'>Path</a> always starts with a move verb to a <a href='undocumented#Cartesian_Coordinate'>Cartesian Coordinate</a>,
and may be followed by additional verbs that add lines or curves.
Adding a close verb makes the geometry into a continuous loop, a closed contour.
<a href='#Path'>Paths</a> may contain any number of contours, each beginning with a move verb.
@@ -805,7 +805,7 @@ parabolic (and identical to <a href='#Quad'>Quad</a>); greater than one hyperbol
<td style='text-align: center; border: 2px solid #dddddd; padding: 8px; '>4</td>
<td style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>
Adds <a href='#Cubic'>Cubic</a> from <a href='#Last_Point'>Last Point</a>, using two control <a href='SkPoint_Reference#Point'>Points</a>, and end <a href='SkPoint_Reference#Point'>Point</a>.
-<a href='#Cubic'>Cubic</a> is a third-order Bezier_Curve section within tangents from <a href='#Last_Point'>Last Point</a>
+<a href='#Cubic'>Cubic</a> is a third-order <a href='undocumented#Bezier_Curve'>Bezier Curve</a> section within tangents from <a href='#Last_Point'>Last Point</a>
to first control <a href='SkPoint_Reference#Point'>Point</a>, and from second control <a href='SkPoint_Reference#Point'>Point</a> to end <a href='SkPoint_Reference#Point'>Point</a>.
</td>
</tr>
@@ -2485,7 +2485,7 @@ path2 bounds = 10, 20, 30, 40
const <a href='SkRect_Reference#SkRect'>SkRect</a>& <a href='#SkPath_getBounds'>getBounds</a>() const
</pre>
-Returns minimum and maximum x and y values of <a href='#Point_Array'>Point Array</a>.
+Returns minimum and maximum axes values of <a href='#Point_Array'>Point Array</a>.
Returns (0, 0, 0, 0) if <a href='#Path'>Path</a> contains no points. Returned bounds width and height may
be larger or smaller than area affected when <a href='#Path'>Path</a> is drawn.
@@ -2625,7 +2625,7 @@ cached avg: 0.182784 ms
<a href='SkRect_Reference#SkRect'>SkRect</a> <a href='#SkPath_computeTightBounds'>computeTightBounds</a>() const
</pre>
-Returns minimum and maximum x and y values of the lines and curves in <a href='#Path'>Path</a>.
+Returns minimum and maximum axes values of the lines and curves in <a href='#Path'>Path</a>.
Returns (0, 0, 0, 0) if <a href='#Path'>Path</a> contains no points.
Returned bounds width and height may be larger or smaller than area affected
when <a href='#Path'>Path</a> is drawn.
@@ -2900,10 +2900,10 @@ Adds beginning of <a href='#Contour'>Contour</a> at <a href='SkPoint_Reference#P
### Parameters
<table> <tr> <td><a name='SkPath_moveTo_x'><code><strong>x</strong></code></a></td>
- <td><a href='#SkPath_moveTo_x'>x</a>-coordinate of <a href='#Contour'>Contour</a> start</td>
+ <td><a href='#SkPath_moveTo_x'>x</a>-axis value of <a href='#Contour'>Contour</a> start</td>
</tr>
<tr> <td><a name='SkPath_moveTo_y'><code><strong>y</strong></code></a></td>
- <td><a href='#SkPath_moveTo_y'>y</a>-coordinate of <a href='#Contour'>Contour</a> start</td>
+ <td><a href='#SkPath_moveTo_y'>y</a>-axis value of <a href='#Contour'>Contour</a> start</td>
</tr>
</table>
@@ -2957,10 +2957,10 @@ Function name stands for "relative move to".
### Parameters
<table> <tr> <td><a name='SkPath_rMoveTo_dx'><code><strong>dx</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Contour'>Contour</a> start x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Contour'>Contour</a> start on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rMoveTo_dy'><code><strong>dy</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> y to <a href='#Contour'>Contour</a> start y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Contour'>Contour</a> start on y-axis</td>
</tr>
</table>
@@ -3054,10 +3054,10 @@ Function name stands for "relative line to".
### Parameters
<table> <tr> <td><a name='SkPath_rLineTo_dx'><code><strong>dx</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='undocumented#Line'>Line</a> end x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='undocumented#Line'>Line</a> end on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rLineTo_dy'><code><strong>dy</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> y to <a href='undocumented#Line'>Line</a> end y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='undocumented#Line'>Line</a> end on y-axis</td>
</tr>
</table>
@@ -3187,16 +3187,16 @@ Function name stands for "relative quad to".
### Parameters
<table> <tr> <td><a name='SkPath_rQuadTo_dx1'><code><strong>dx1</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Quad'>Quad</a> control x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Quad'>Quad</a> control on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rQuadTo_dy1'><code><strong>dy1</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Quad'>Quad</a> control y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Quad'>Quad</a> control on y-axis</td>
</tr>
<tr> <td><a name='SkPath_rQuadTo_dx2'><code><strong>dx2</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Quad'>Quad</a> end x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Quad'>Quad</a> end on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rQuadTo_dy2'><code><strong>dy2</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Quad'>Quad</a> end y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Quad'>Quad</a> end on y-axis</td>
</tr>
</table>
@@ -3410,16 +3410,16 @@ Function name stands for "relative conic to".
### Parameters
<table> <tr> <td><a name='SkPath_rConicTo_dx1'><code><strong>dx1</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Conic'>Conic</a> control x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Conic'>Conic</a> control on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rConicTo_dy1'><code><strong>dy1</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Conic'>Conic</a> control y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Conic'>Conic</a> control on y-axis</td>
</tr>
<tr> <td><a name='SkPath_rConicTo_dx2'><code><strong>dx2</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Conic'>Conic</a> end x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Conic'>Conic</a> end on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rConicTo_dy2'><code><strong>dy2</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Conic'>Conic</a> end y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Conic'>Conic</a> end on y-axis</td>
</tr>
<tr> <td><a name='SkPath_rConicTo_w'><code><strong>w</strong></code></a></td>
<td>weight of added <a href='#Conic'>Conic</a></td>
@@ -3438,7 +3438,7 @@ Function name stands for "relative conic to".
## <a name='Cubic'>Cubic</a>
-<a href='#Cubic'>Cubic</a> describes a Bezier_Curve segment described by a third-order polynomial.
+<a href='#Cubic'>Cubic</a> describes a <a href='undocumented#Bezier_Curve'>Bezier Curve</a> segment described by a third-order polynomial.
<a href='#Cubic'>Cubic</a> begins at a start <a href='SkPoint_Reference#Point'>Point</a>, curving towards the first control <a href='SkPoint_Reference#Point'>Point</a>;
and curves from the end <a href='SkPoint_Reference#Point'>Point</a> towards the second control <a href='SkPoint_Reference#Point'>Point</a>.
@@ -3552,22 +3552,22 @@ Function name stands for "relative cubic to".
### Parameters
<table> <tr> <td><a name='SkPath_rCubicTo_x1'><code><strong>x1</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to first <a href='#Cubic'>Cubic</a> control x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to first <a href='#Cubic'>Cubic</a> control on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rCubicTo_y1'><code><strong>y1</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to first <a href='#Cubic'>Cubic</a> control y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to first <a href='#Cubic'>Cubic</a> control on y-axis</td>
</tr>
<tr> <td><a name='SkPath_rCubicTo_x2'><code><strong>x2</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to second <a href='#Cubic'>Cubic</a> control x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to second <a href='#Cubic'>Cubic</a> control on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rCubicTo_y2'><code><strong>y2</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to second <a href='#Cubic'>Cubic</a> control y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to second <a href='#Cubic'>Cubic</a> control on y-axis</td>
</tr>
<tr> <td><a name='SkPath_rCubicTo_x3'><code><strong>x3</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Cubic'>Cubic</a> end x</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Cubic'>Cubic</a> end on x-axis</td>
</tr>
<tr> <td><a name='SkPath_rCubicTo_y3'><code><strong>y3</strong></code></a></td>
- <td>offset from <a href='#Last_Point'>Last Point</a> x to <a href='#Cubic'>Cubic</a> end y</td>
+ <td>offset from <a href='#Last_Point'>Last Point</a> to <a href='#Cubic'>Cubic</a> end on y-axis</td>
</tr>
</table>
@@ -3716,16 +3716,16 @@ tangents are nearly parallel, <a href='#SkPath_arcTo'>arcTo</a> appends <a href=
### Parameters
<table> <tr> <td><a name='SkPath_arcTo_2_x1'><code><strong>x1</strong></code></a></td>
- <td>x common to pair of tangents</td>
+ <td>x-axis value common to pair of tangents</td>
</tr>
<tr> <td><a name='SkPath_arcTo_2_y1'><code><strong>y1</strong></code></a></td>
- <td>y common to pair of tangents</td>
+ <td>y-axis value common to pair of tangents</td>
</tr>
<tr> <td><a name='SkPath_arcTo_2_x2'><code><strong>x2</strong></code></a></td>
- <td>x end of second tangent</td>
+ <td>x-axis value end of second tangent</td>
</tr>
<tr> <td><a name='SkPath_arcTo_2_y2'><code><strong>y2</strong></code></a></td>
- <td>y end of second tangent</td>
+ <td>y-axis value end of second tangent</td>
</tr>
<tr> <td><a name='SkPath_arcTo_2_radius'><code><strong>radius</strong></code></a></td>
<td>distance from <a href='#Arc'>Arc</a> to <a href='undocumented#Circle'>Circle</a> center</td>
@@ -3930,7 +3930,7 @@ opposite the integer value of <a href='#SkPath_arcTo_5_sweep'>sweep</a>; <a href
### Parameters
<table> <tr> <td><a name='SkPath_arcTo_5_r'><code><strong>r</strong></code></a></td>
- <td>radii in x and y before x-axis rotation</td>
+ <td>radii on axes before x-axis rotation</td>
</tr>
<tr> <td><a name='SkPath_arcTo_5_xAxisRotate'><code><strong>xAxisRotate</strong></code></a></td>
<td>x-axis rotation in degrees; positive values are clockwise</td>
@@ -3987,10 +3987,10 @@ opposite the integer value of <a href='#SkPath_rArcTo_sweep'>sweep</a>; <a href=
### Parameters
<table> <tr> <td><a name='SkPath_rArcTo_rx'><code><strong>rx</strong></code></a></td>
- <td>radius in x before x-axis rotation</td>
+ <td>radius before x-axis rotation</td>
</tr>
<tr> <td><a name='SkPath_rArcTo_ry'><code><strong>ry</strong></code></a></td>
- <td>radius in y before x-axis rotation</td>
+ <td>radius before x-axis rotation</td>
</tr>
<tr> <td><a name='SkPath_rArcTo_xAxisRotate'><code><strong>xAxisRotate</strong></code></a></td>
<td>x-axis rotation in degrees; positive values are clockwise</td>
@@ -4002,10 +4002,10 @@ opposite the integer value of <a href='#SkPath_rArcTo_sweep'>sweep</a>; <a href=
<td>chooses clockwise or counterclockwise <a href='#Arc'>Arc</a></td>
</tr>
<tr> <td><a name='SkPath_rArcTo_dx'><code><strong>dx</strong></code></a></td>
- <td>x offset end of <a href='#Arc'>Arc</a> from last <a href='#Path'>Path</a> <a href='SkPoint_Reference#Point'>Point</a></td>
+ <td>x-axis offset end of <a href='#Arc'>Arc</a> from last <a href='#Path'>Path</a> <a href='SkPoint_Reference#Point'>Point</a></td>
</tr>
<tr> <td><a name='SkPath_rArcTo_dy'><code><strong>dy</strong></code></a></td>
- <td>y offset end of <a href='#Arc'>Arc</a> from last <a href='#Path'>Path</a> <a href='SkPoint_Reference#Point'>Point</a></td>
+ <td>y-axis offset end of <a href='#Arc'>Arc</a> from last <a href='#Path'>Path</a> <a href='SkPoint_Reference#Point'>Point</a></td>
</tr>
</table>
@@ -4403,16 +4403,16 @@ and <a href='#SkPath_addRect_3_bottom'>bottom</a>-<a href='#SkPath_addRect_3_lef
### Parameters
<table> <tr> <td><a name='SkPath_addRect_3_left'><code><strong>left</strong></code></a></td>
- <td>smaller x of <a href='SkRect_Reference#Rect'>Rect</a></td>
+ <td>smaller x-axis value of <a href='SkRect_Reference#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkPath_addRect_3_top'><code><strong>top</strong></code></a></td>
- <td>smaller y of <a href='SkRect_Reference#Rect'>Rect</a></td>
+ <td>smaller y-axis value of <a href='SkRect_Reference#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkPath_addRect_3_right'><code><strong>right</strong></code></a></td>
- <td>larger x of <a href='SkRect_Reference#Rect'>Rect</a></td>
+ <td>larger x-axis value of <a href='SkRect_Reference#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkPath_addRect_3_bottom'><code><strong>bottom</strong></code></a></td>
- <td>larger y of <a href='SkRect_Reference#Rect'>Rect</a></td>
+ <td>larger y-axis value of <a href='SkRect_Reference#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkPath_addRect_3_dir'><code><strong>dir</strong></code></a></td>
<td><a href='#SkPath_Direction'>Direction</a> to wind added contour</td>
@@ -4613,10 +4613,10 @@ After appending, <a href='#Path'>Path</a> may be empty, or may contain: <a href=
<td>bounds of <a href='undocumented#Round_Rect'>Round Rect</a></td>
</tr>
<tr> <td><a name='SkPath_addRoundRect_rx'><code><strong>rx</strong></code></a></td>
- <td>x-radius of rounded corners on the <a href='undocumented#Round_Rect'>Round Rect</a></td>
+ <td>x-axis radius of rounded corners on the <a href='undocumented#Round_Rect'>Round Rect</a></td>
</tr>
<tr> <td><a name='SkPath_addRoundRect_ry'><code><strong>ry</strong></code></a></td>
- <td>y-radius of rounded corners on the <a href='undocumented#Round_Rect'>Round Rect</a></td>
+ <td>y-axis radius of rounded corners on the <a href='undocumented#Round_Rect'>Round Rect</a></td>
</tr>
<tr> <td><a name='SkPath_addRoundRect_dir'><code><strong>dir</strong></code></a></td>
<td><a href='#SkPath_Direction'>Direction</a> to wind <a href='undocumented#Round_Rect'>Round Rect</a></td>
@@ -4650,14 +4650,14 @@ array.
| <a href='#SkPath_addRoundRect_2_radii'>radii</a> index | location |
| --- | --- |
-| 0 | x-radius of top-left corner |
-| 1 | y-radius of top-left corner |
-| 2 | x-radius of top-right corner |
-| 3 | y-radius of top-right corner |
-| 4 | x-radius of bottom-right corner |
-| 5 | y-radius of bottom-right corner |
-| 6 | x-radius of bottom-left corner |
-| 7 | y-radius of bottom-left corner |
+| 0 | x-axis radius of top-left corner |
+| 1 | y-axis radius of top-left corner |
+| 2 | x-axis radius of top-right corner |
+| 3 | y-axis radius of top-right corner |
+| 4 | x-axis radius of bottom-right corner |
+| 5 | y-axis radius of bottom-right corner |
+| 6 | x-axis radius of bottom-left corner |
+| 7 | y-axis radius of bottom-left corner |
If <a href='#SkPath_addRoundRect_2_dir'>dir</a> is <a href='#SkPath_kCW_Direction'>kCW Direction</a>, <a href='undocumented#Round_Rect'>Round Rect</a> starts at top-left of the lower-left corner
and winds clockwise. If <a href='#SkPath_addRoundRect_2_dir'>dir</a> is <a href='#SkPath_kCCW_Direction'>kCCW Direction</a>, <a href='undocumented#Round_Rect'>Round Rect</a> starts at the
@@ -4878,10 +4878,10 @@ added unaltered. If <a href='#SkPath_addPath_mode'>mode</a> is <a href='#SkPath_
<td><a href='#Path'>Path</a> <a href='#Verb'>Verbs</a>, <a href='SkPoint_Reference#Point'>Points</a>, and <a href='#Conic_Weight'>Conic Weights</a> to add</td>
</tr>
<tr> <td><a name='SkPath_addPath_dx'><code><strong>dx</strong></code></a></td>
- <td>offset added to <a href='#SkPath_addPath_src'>src</a> <a href='#Point_Array'>Point Array</a> x coordinates</td>
+ <td>offset added to <a href='#SkPath_addPath_src'>src</a> <a href='#Point_Array'>Point Array</a> x-axis coordinates</td>
</tr>
<tr> <td><a name='SkPath_addPath_dy'><code><strong>dy</strong></code></a></td>
- <td>offset added to <a href='#SkPath_addPath_src'>src</a> <a href='#Point_Array'>Point Array</a> y coordinates</td>
+ <td>offset added to <a href='#SkPath_addPath_src'>src</a> <a href='#Point_Array'>Point Array</a> y-axis coordinates</td>
</tr>
<tr> <td><a name='SkPath_addPath_mode'><code><strong>mode</strong></code></a></td>
<td><a href='#SkPath_kAppend_AddPathMode'>kAppend AddPathMode</a> or <a href='#SkPath_kExtend_AddPathMode'>kExtend AddPathMode</a></td>
@@ -5006,10 +5006,10 @@ If <a href='#SkPath_offset_dst'>dst</a> is nullptr, <a href='#Path'>Path</a> is
### Parameters
<table> <tr> <td><a name='SkPath_offset_dx'><code><strong>dx</strong></code></a></td>
- <td>offset added to <a href='#Point_Array'>Point Array</a> x coordinates</td>
+ <td>offset added to <a href='#Point_Array'>Point Array</a> x-axis coordinates</td>
</tr>
<tr> <td><a name='SkPath_offset_dy'><code><strong>dy</strong></code></a></td>
- <td>offset added to <a href='#Point_Array'>Point Array</a> y coordinates</td>
+ <td>offset added to <a href='#Point_Array'>Point Array</a> y-axis coordinates</td>
</tr>
<tr> <td><a name='SkPath_offset_dst'><code><strong>dst</strong></code></a></td>
<td>overwritten, translated copy of <a href='#Path'>Path</a>; may be nullptr</td>
@@ -5070,10 +5070,10 @@ Offset <a href='#Point_Array'>Point Array</a> by (<a href='#SkPath_offset_2_dx'>
### Parameters
<table> <tr> <td><a name='SkPath_offset_2_dx'><code><strong>dx</strong></code></a></td>
- <td>offset added to <a href='#Point_Array'>Point Array</a> x coordinates</td>
+ <td>offset added to <a href='#Point_Array'>Point Array</a> x-axis coordinates</td>
</tr>
<tr> <td><a name='SkPath_offset_2_dy'><code><strong>dy</strong></code></a></td>
- <td>offset added to <a href='#Point_Array'>Point Array</a> y coordinates</td>
+ <td>offset added to <a href='#Point_Array'>Point Array</a> y-axis coordinates</td>
</tr>
</table>
@@ -5204,10 +5204,10 @@ Set <a href='#Last_Point'>Last Point</a> to (<a href='#SkPath_setLastPt_x'>x</a>
### Parameters
<table> <tr> <td><a name='SkPath_setLastPt_x'><code><strong>x</strong></code></a></td>
- <td>set <a href='#SkPath_setLastPt_x'>x</a>-coordinate of <a href='#Last_Point'>Last Point</a></td>
+ <td>set <a href='#SkPath_setLastPt_x'>x</a>-axis value of <a href='#Last_Point'>Last Point</a></td>
</tr>
<tr> <td><a name='SkPath_setLastPt_y'><code><strong>y</strong></code></a></td>
- <td>set <a href='#SkPath_setLastPt_y'>y</a>-coordinate of <a href='#Last_Point'>Last Point</a></td>
+ <td>set <a href='#SkPath_setLastPt_y'>y</a>-axis value of <a href='#Last_Point'>Last Point</a></td>
</tr>
</table>
@@ -5370,10 +5370,10 @@ account <a href='#SkPath_FillType'>FillType</a>.
### Parameters
<table> <tr> <td><a name='SkPath_contains_x'><code><strong>x</strong></code></a></td>
- <td><a href='#SkPath_contains_x'>x</a>-coordinate of containment test</td>
+ <td><a href='#SkPath_contains_x'>x</a>-axis value of containment test</td>
</tr>
<tr> <td><a name='SkPath_contains_y'><code><strong>y</strong></code></a></td>
- <td><a href='#SkPath_contains_y'>y</a>-coordinate of containment test</td>
+ <td><a href='#SkPath_contains_y'>y</a>-axis value of containment test</td>
</tr>
</table>
diff --git a/site/user/api/SkPoint_Reference.md b/site/user/api/SkPoint_Reference.md
index a8145ed038..9e701b8a5f 100644
--- a/site/user/api/SkPoint_Reference.md
+++ b/site/user/api/SkPoint_Reference.md
@@ -768,7 +768,7 @@ Adds offset (<a href='#SkPoint_offset_dx'>dx</a>, <a href='#SkPoint_offset_dy'>d
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkPoint_length'>length</a>() const
</pre>
-Returns the Euclidean_Distance from origin, computed as:
+Returns the <a href='undocumented#Euclidean_Distance'>Euclidean Distance</a> from origin, computed as:
<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
sqrt(fX * fX + fY * fY)
@@ -797,7 +797,7 @@ straight-line distance to origin
<a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkPoint_distanceToOrigin'>distanceToOrigin</a>() const
</pre>
-Returns the Euclidean_Distance from origin, computed as:
+Returns the <a href='undocumented#Euclidean_Distance'>Euclidean Distance</a> from origin, computed as:
<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
sqrt(fX * fX + fY * fY)
@@ -1501,7 +1501,7 @@ Can also be used to add <a href='#Vector'>Vector</a> to <a href='#Vector'>Vector
static <a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkPoint_Length'>Length</a>(<a href='undocumented#SkScalar'>SkScalar</a> x, <a href='undocumented#SkScalar'>SkScalar</a> y)
</pre>
-Returns the Euclidean_Distance from origin, computed as:
+Returns the <a href='undocumented#Euclidean_Distance'>Euclidean Distance</a> from origin, computed as:
<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
sqrt(x * x + y * y)
@@ -1576,7 +1576,7 @@ original <a href='#SkPoint_Normalize_vec'>vec</a> length
static <a href='undocumented#SkScalar'>SkScalar</a> <a href='#SkPoint_Distance'>Distance</a>(const <a href='#SkPoint'>SkPoint</a>& a, const <a href='#SkPoint'>SkPoint</a>& b)
</pre>
-Returns the Euclidean_Distance between <a href='#SkPoint_Distance_a'>a</a> and <a href='#SkPoint_Distance_b'>b</a>.
+Returns the <a href='undocumented#Euclidean_Distance'>Euclidean Distance</a> between <a href='#SkPoint_Distance_a'>a</a> and <a href='#SkPoint_Distance_b'>b</a>.
### Parameters
@@ -1745,4 +1745,4 @@ product of input magnitudes and cosine of the angle between them
</pre>
<a href='#SkVector'>SkVector</a> provides an alternative name for <a href='#SkPoint'>SkPoint</a>. <a href='#SkVector'>SkVector</a> and <a href='#SkPoint'>SkPoint</a> can
-be used interchangably for all purposes. \ No newline at end of file
+be used interchangeably for all purposes. \ No newline at end of file
diff --git a/site/user/api/SkRect_Reference.md b/site/user/api/SkRect_Reference.md
index 68f6aff8da..042e33a46d 100644
--- a/site/user/api/SkRect_Reference.md
+++ b/site/user/api/SkRect_Reference.md
@@ -2138,7 +2138,7 @@ If <a href='#SkRect_makeOffset_dy'>dy</a> is positive, <a href='#Rect'>Rect</a>
### Return Value
-<a href='#Rect'>Rect</a> offset in x or y, with original width and height
+<a href='#Rect'>Rect</a> offset on axes, with original width and height
### Example
@@ -2693,16 +2693,16 @@ Returns false if either construction or <a href='#Rect'>Rect</a> is empty, leavi
### Parameters
<table> <tr> <td><a name='SkRect_intersect_2_left'><code><strong>left</strong></code></a></td>
- <td>x minimum of constructed <a href='#Rect'>Rect</a></td>
+ <td>x-axis minimum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_intersect_2_top'><code><strong>top</strong></code></a></td>
- <td>y minimum of constructed <a href='#Rect'>Rect</a></td>
+ <td>y-axis minimum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_intersect_2_right'><code><strong>right</strong></code></a></td>
- <td>x maximum of constructed <a href='#Rect'>Rect</a></td>
+ <td>x-axis maximum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_intersect_2_bottom'><code><strong>bottom</strong></code></a></td>
- <td>y maximum of constructed <a href='#Rect'>Rect</a></td>
+ <td>y-axis maximum of constructed <a href='#Rect'>Rect</a></td>
</tr>
</table>
@@ -2790,16 +2790,16 @@ Returns false if either construction or <a href='#Rect'>Rect</a> is empty, or do
### Parameters
<table> <tr> <td><a name='SkRect_intersects_left'><code><strong>left</strong></code></a></td>
- <td>x minimum of constructed <a href='#Rect'>Rect</a></td>
+ <td>x-axis minimum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_intersects_top'><code><strong>top</strong></code></a></td>
- <td>y minimum of constructed <a href='#Rect'>Rect</a></td>
+ <td>y-axis minimum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_intersects_right'><code><strong>right</strong></code></a></td>
- <td>x maximum of constructed <a href='#Rect'>Rect</a></td>
+ <td>x-axis maximum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_intersects_bottom'><code><strong>bottom</strong></code></a></td>
- <td>y maximum of constructed <a href='#Rect'>Rect</a></td>
+ <td>y-axis maximum of constructed <a href='#Rect'>Rect</a></td>
</tr>
</table>
@@ -2948,16 +2948,16 @@ Has no effect if construction is empty. Otherwise, if <a href='#Rect'>Rect</a> i
### Parameters
<table> <tr> <td><a name='SkRect_join_left'><code><strong>left</strong></code></a></td>
- <td>x minimum of constructed <a href='#Rect'>Rect</a></td>
+ <td>x-axis minimum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_join_top'><code><strong>top</strong></code></a></td>
- <td>y minimum of constructed <a href='#Rect'>Rect</a></td>
+ <td>y-axis minimum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_join_right'><code><strong>right</strong></code></a></td>
- <td>x maximum of constructed <a href='#Rect'>Rect</a></td>
+ <td>x-axis maximum of constructed <a href='#Rect'>Rect</a></td>
</tr>
<tr> <td><a name='SkRect_join_bottom'><code><strong>bottom</strong></code></a></td>
- <td>y maximum of constructed <a href='#Rect'>Rect</a></td>
+ <td>y-axis maximum of constructed <a href='#Rect'>Rect</a></td>
</tr>
</table>
diff --git a/site/user/api/SkSurface_Reference.md b/site/user/api/SkSurface_Reference.md
index 7ae4bdfa70..76f2de6716 100644
--- a/site/user/api/SkSurface_Reference.md
+++ b/site/user/api/SkSurface_Reference.md
@@ -804,13 +804,13 @@ describes the pixel format in <a href='SkImageInfo_Reference#Color_Type'>Color T
<a href='SkImageInfo_Reference#Alpha_Type'>Alpha Type</a>, and color matching in <a href='undocumented#Color_Space'>Color Space</a>.
<a href='#SkSurface_MakeRenderTarget_sampleCount'>sampleCount</a> requests the number of samples per pixel.
-Pass zero to disable Multi_Sample_Anti_Aliasing. The request is rounded
+Pass zero to disable <a href='undocumented#Multi_Sample_Anti_Aliasing'>Multi Sample Anti Aliasing</a>. The request is rounded
up to the next supported count, or rounded down if it is larger than the
maximum supported count.
<a href='#SkSurface_MakeRenderTarget_surfaceOrigin'>surfaceOrigin</a> pins either the top-left or the bottom-left corner to the origin.
-<a href='#SkSurface_MakeRenderTarget_shouldCreateWithMips'>shouldCreateWithMips</a> hints that <a href='SkImage_Reference#Image'>Image</a> returned by <a href='#SkSurface_makeImageSnapshot'>makeImageSnapshot</a> is Mip_Map.
+<a href='#SkSurface_MakeRenderTarget_shouldCreateWithMips'>shouldCreateWithMips</a> hints that <a href='SkImage_Reference#Image'>Image</a> returned by <a href='#SkSurface_makeImageSnapshot'>makeImageSnapshot</a> is <a href='undocumented#Mip_Map'>Mip Map</a>.
If SK_SUPPORT_GPU is defined as zero, has no effect and returns nullptr.
@@ -837,7 +837,7 @@ width, or height, or both, may be zero</td>
fonts; may be nullptr</td>
</tr>
<tr> <td><a name='SkSurface_MakeRenderTarget_shouldCreateWithMips'><code><strong>shouldCreateWithMips</strong></code></a></td>
- <td>hint that <a href='#Surface'>Surface</a> will host Mip_Map images</td>
+ <td>hint that <a href='#Surface'>Surface</a> will host <a href='undocumented#Mip_Map'>Mip Map</a> images</td>
</tr>
</table>
@@ -870,7 +870,7 @@ describes the pixel format in <a href='SkImageInfo_Reference#Color_Type'>Color T
<a href='SkImageInfo_Reference#Alpha_Type'>Alpha Type</a>, and color matching in <a href='undocumented#Color_Space'>Color Space</a>.
<a href='#SkSurface_MakeRenderTarget_2_sampleCount'>sampleCount</a> requests the number of samples per pixel.
-Pass zero to disable Multi_Sample_Anti_Aliasing. The request is rounded
+Pass zero to disable <a href='undocumented#Multi_Sample_Anti_Aliasing'>Multi Sample Anti Aliasing</a>. The request is rounded
up to the next supported count, or rounded down if it is larger than the
maximum supported count.
@@ -889,7 +889,7 @@ maximum supported count.
of <a href='undocumented#Raster_Surface'>Raster Surface</a>; width, or height, or both, may be zero</td>
</tr>
<tr> <td><a name='SkSurface_MakeRenderTarget_2_sampleCount'><code><strong>sampleCount</strong></code></a></td>
- <td>samples per pixel, or 0 to disable Multi_Sample_Anti_Aliasing</td>
+ <td>samples per pixel, or 0 to disable <a href='undocumented#Multi_Sample_Anti_Aliasing'>Multi Sample Anti Aliasing</a></td>
</tr>
<tr> <td><a name='SkSurface_MakeRenderTarget_2_props'><code><strong>props</strong></code></a></td>
<td>LCD striping orientation and setting for device independent
@@ -1642,10 +1642,10 @@ Does not copy, and returns false if:
<td>storage for pixels copied from <a href='#Surface'>Surface</a></td>
</tr>
<tr> <td><a name='SkSurface_readPixels_srcX'><code><strong>srcX</strong></code></a></td>
- <td>offset into readable pixels in x; may be negative</td>
+ <td>offset into readable pixels on x-axis; may be negative</td>
</tr>
<tr> <td><a name='SkSurface_readPixels_srcY'><code><strong>srcY</strong></code></a></td>
- <td>offset into readable pixels in y; may be negative</td>
+ <td>offset into readable pixels on y-axis; may be negative</td>
</tr>
</table>
@@ -1709,10 +1709,10 @@ Does not copy, and returns false if:
<td>size of one destination row; <a href='#SkSurface_readPixels_2_dstInfo'>dstInfo</a>.<a href='#SkSurface_width'>width</a> times pixel size, or larger</td>
</tr>
<tr> <td><a name='SkSurface_readPixels_2_srcX'><code><strong>srcX</strong></code></a></td>
- <td>offset into readable pixels in x; may be negative</td>
+ <td>offset into readable pixels on x-axis; may be negative</td>
</tr>
<tr> <td><a name='SkSurface_readPixels_2_srcY'><code><strong>srcY</strong></code></a></td>
- <td>offset into readable pixels in y; may be negative</td>
+ <td>offset into readable pixels on y-axis; may be negative</td>
</tr>
</table>
@@ -1775,10 +1775,10 @@ Does not copy, and returns false if:
<td>storage for pixels copied from <a href='#Surface'>Surface</a></td>
</tr>
<tr> <td><a name='SkSurface_readPixels_3_srcX'><code><strong>srcX</strong></code></a></td>
- <td>offset into readable pixels in x; may be negative</td>
+ <td>offset into readable pixels on x-axis; may be negative</td>
</tr>
<tr> <td><a name='SkSurface_readPixels_3_srcY'><code><strong>srcY</strong></code></a></td>
- <td>offset into readable pixels in y; may be negative</td>
+ <td>offset into readable pixels on y-axis; may be negative</td>
</tr>
</table>
@@ -1818,10 +1818,10 @@ converting to <a href='#Surface'>Surface</a> colorType() and <a href='#Surface'>
<td>storage for pixels to copy to <a href='#Surface'>Surface</a></td>
</tr>
<tr> <td><a name='SkSurface_writePixels_dstX'><code><strong>dstX</strong></code></a></td>
- <td>x position relative to <a href='#Surface'>Surface</a> to begin copy; may be negative</td>
+ <td>x-axis position relative to <a href='#Surface'>Surface</a> to begin copy; may be negative</td>
</tr>
<tr> <td><a name='SkSurface_writePixels_dstY'><code><strong>dstY</strong></code></a></td>
- <td>x position relative to <a href='#Surface'>Surface</a> to begin copy; may be negative</td>
+ <td>y-axis position relative to <a href='#Surface'>Surface</a> to begin copy; may be negative</td>
</tr>
</table>
@@ -1856,10 +1856,10 @@ converting to <a href='#Surface'>Surface</a> colorType() and <a href='#Surface'>
<td>storage for pixels to copy to <a href='#Surface'>Surface</a></td>
</tr>
<tr> <td><a name='SkSurface_writePixels_2_dstX'><code><strong>dstX</strong></code></a></td>
- <td>x position relative to <a href='#Surface'>Surface</a> to begin copy; may be negative</td>
+ <td>x-axis position relative to <a href='#Surface'>Surface</a> to begin copy; may be negative</td>
</tr>
<tr> <td><a name='SkSurface_writePixels_2_dstY'><code><strong>dstY</strong></code></a></td>
- <td>x position relative to <a href='#Surface'>Surface</a> to begin copy; may be negative</td>
+ <td>y-axis position relative to <a href='#Surface'>Surface</a> to begin copy; may be negative</td>
</tr>
</table>
diff --git a/site/user/api/undocumented.md b/site/user/api/undocumented.md
index 4a98ee8d7e..bb8977a294 100644
--- a/site/user/api/undocumented.md
+++ b/site/user/api/undocumented.md
@@ -13,6 +13,10 @@ undocumented
# <a name='GrBackendSemaphore'>Class GrBackendSemaphore</a>
+# <a name='Bezier_Curve'>Bezier Curve</a>
+
+# <a name='Big_Endian'>Big Endian</a>
+
# <a name='Blend_Mode'>Blend Mode</a>
## <a name='SkBlendMode'>Enum SkBlendMode</a>
@@ -43,6 +47,8 @@ undocumented
</tr>
</table>
+# <a name='Cartesian_Coordinate'>Cartesian Coordinate</a>
+
# <a name='Circle'>Circle</a>
# <a name='Clip_Op'>Clip Op</a>
@@ -126,6 +132,8 @@ static bool <a href='#SkColorSpace_Equals'>Equals</a>(const <a href='#SkColorSpa
</tr>
</table>
+# <a name='Coons_Patch'>Coons Patch</a>
+
# <a name='Core_Graphics'>Core Graphics</a>
# <a name='Core_Text'>Core Text</a>
@@ -217,6 +225,10 @@ void <a href='#SkDrawable_draw'>draw</a>(<a href='SkCanvas_Reference#SkCanvas'>S
---
+# <a name='Euclidean_Distance'>Euclidean Distance</a>
+
+# <a name='Euclidean_Space'>Euclidean Space</a>
+
# <a name='Filter_Quality'>Filter Quality</a>
## <a name='SkFilterQuality'>Enum SkFilterQuality</a>
@@ -282,6 +294,8 @@ void <a href='#GrContext_flush'>flush</a>()
---
+# <a name='GPU_Share_Group'>GPU Share Group</a>
+
# <a name='GPU_Surface'>GPU Surface</a>
# <a name='GPU_Texture'>GPU Texture</a>
@@ -290,10 +304,26 @@ void <a href='#GrContext_flush'>flush</a>()
# <a name='Grayscale'>Grayscale</a>
+# <a name='HTML_Aqua'>HTML Aqua</a>
+
# <a name='HTML_Canvas'>HTML Canvas</a>
## <a name='ArcTo'>ArcTo</a>
+# <a name='HTML_DarkGray'>HTML DarkGray</a>
+
+# <a name='HTML_Fuchsia'>HTML Fuchsia</a>
+
+# <a name='HTML_Gray'>HTML Gray</a>
+
+# <a name='HTML_Green'>HTML Green</a>
+
+# <a name='HTML_LightGray'>HTML LightGray</a>
+
+# <a name='HTML_Lime'>HTML Lime</a>
+
+# <a name='HTML_Silver'>HTML Silver</a>
+
# <a name='ISize'>ISize</a>
# <a name='SkISize'>Struct SkISize</a>
@@ -310,6 +340,8 @@ void <a href='#GrContext_flush'>flush</a>()
# <a name='Line'>Line</a>
+# <a name='Little_Endian'>Little Endian</a>
+
# <a name='Mask_Alpha'>Mask Alpha</a>
# <a name='Mask_Filter'>Mask Filter</a>
@@ -322,6 +354,8 @@ void <a href='#GrContext_flush'>flush</a>()
# <a name='Mip_Map'>Mip Map</a>
+# <a name='Multi_Sample_Anti_Aliasing'>Multi Sample Anti Aliasing</a>
+
# <a name='Nine_Patch'>Nine Patch</a>
# <a name='OS_X'>OS X</a>
@@ -549,6 +583,10 @@ void <a href='#SkRRect_dumpHex'>dumpHex</a>() const
## <a name='Arc'>Arc</a>
+# <a name='SVG_darkgray'>SVG darkgray</a>
+
+# <a name='SVG_lightgray'>SVG lightgray</a>
+
# <a name='Scalar'>Scalar</a>
## <a name='SkScalar'>Typedef SkScalar</a>
@@ -667,6 +705,8 @@ bool <a href='#GrBackendTexture_isValid'>isValid</a>() const
# <a name='SkTypeface'>Class SkTypeface</a>
+# <a name='UV_Mapping'>UV Mapping</a>
+
# <a name='Unhinted'>Unhinted</a>
# <a name='Unpremultiply'>Unpremultiply</a>
@@ -679,3 +719,8 @@ bool <a href='#GrBackendTexture_isValid'>isValid</a>() const
## <a name='Texs'>Texs</a>
+# <a name='YUV_Component_U'>YUV Component U</a>
+
+# <a name='YUV_Component_V'>YUV Component V</a>
+
+# <a name='YUV_Component_Y'>YUV Component Y</a>