fix bookmaker

TBR=brianosman@google.com

Docs-Preview: https://skia.org/?cl=163121
Bug: skia:
Change-Id: I3191da39b9b9b642d2a7160ac0e274d56869bdf4
Reviewed-on: https://skia-review.googlesource.com/c/163121
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>
Reviewed-by: Cary Clark <caryclark@skia.org>
This commit is contained in:
Cary Clark 2018-10-17 09:39:54 -04:00 committed by Skia Commit-Bot
parent ca7c297989
commit 7bae65d007
4 changed files with 106 additions and 15 deletions

View File

@ -424,6 +424,47 @@ Returns SkRGBA4f with all components independent of Alpha.
#Method ##
#Method uint32_t toBytes_RGBA() const
#In Utility
#Line # returns kRGBA_8888_SkColorType color ##
Produces bytes in RGBA order. Component values are not affected by color Alpha.
#Return color ##
#NoExample
##
#Method ##
#Method static SkRGBA4f FromBytes_RGBA(uint32_t color)
#In Utility
#Line # sets kRGBA_8888_SkColorType color ##
Returns from color kRGBA_8888_SkColorType order. Component values are
not affected by color Alpha.
#Param color Premultiplied or Unpremultiplied ##
#Return color ##
#NoExample
##
#Method ##
#Method SkRGBA4f makeOpaque() const
#In Utility
#Line # returns color without transparency ##
Returns color with Alpha set to one.
#Return color ##
#NoExample
##
#Method ##
#Struct ##
#Typedef SkRGBA4f SkColor4f

View File

@ -33,9 +33,9 @@ struct <a href='#SkRGBA4f'>SkRGBA4f</a> {
static <a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_FromPMColor'>FromPMColor</a>(<a href='SkColor_Reference#SkPMColor'>SkPMColor</a>);
<a href='#SkRGBA4f'>SkRGBA4f</a><<a href='SkImageInfo_Reference#kPremul_SkAlphaType'>kPremul_SkAlphaType</a>> <a href='#SkRGBA4f_premul'>premul</a>() const;
<a href='#SkRGBA4f'>SkRGBA4f</a><<a href='SkImageInfo_Reference#kUnpremul_SkAlphaType'>kUnpremul_SkAlphaType</a>> <a href='#SkRGBA4f_unpremul'>unpremul</a>() const;
uint32_t toBytes_RGBA() const;
static <a href='#SkRGBA4f'>SkRGBA4f</a> FromBytes_RGBA(uint32_t color);
<a href='#SkRGBA4f'>SkRGBA4f</a> makeOpaque() const;
uint32_t <a href='#SkRGBA4f_toBytes_RGBA'>toBytes_RGBA</a>() const;
static <a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_FromBytes_RGBA'>FromBytes_RGBA</a>(uint32_t color);
<a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_makeOpaque'>makeOpaque</a>() const;
};
</pre>
@ -540,6 +540,56 @@ Returns <a href='#SkRGBA4f'>SkRGBA4f</a> with all components independent of <a h
<a href='#SkRGBA4f_premul'>premul</a>
<a name='SkRGBA4f_toBytes_RGBA'></a>
---
<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0">
uint32_t <a href='#SkRGBA4f_toBytes_RGBA'>toBytes RGBA</a>() const
</pre>
Produces bytes in RGBA order. Component values are not affected by color <a href='SkColor_Reference#Alpha'>Alpha</a>.
### Return Value
color
<a name='SkRGBA4f_FromBytes_RGBA'></a>
---
<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0">
static <a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_FromBytes_RGBA'>FromBytes RGBA</a>(uint32_t color)
</pre>
Returns from <a href='#SkRGBA4f_FromBytes_RGBA_color'>color</a> <a href='SkImageInfo_Reference#kRGBA_8888_SkColorType'>kRGBA_8888_SkColorType</a> order. Component values are
not affected by <a href='#SkRGBA4f_FromBytes_RGBA_color'>color</a> <a href='SkColor_Reference#Alpha'>Alpha</a>.
### Parameters
<table> <tr> <td><a name='SkRGBA4f_FromBytes_RGBA_color'><code><strong>color</strong></code></a></td>
<td><a href='undocumented#Premultiply'>Premultiplied</a> or <a href='undocumented#Unpremultiply'>Unpremultiplied</a></td>
</tr>
</table>
### Return Value
<a href='#SkRGBA4f_FromBytes_RGBA_color'>color</a>
<a name='SkRGBA4f_makeOpaque'></a>
---
<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0">
<a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_makeOpaque'>makeOpaque</a>() const
</pre>
Returns color with <a href='SkColor_Reference#Alpha'>Alpha</a> set to one.
### Return Value
color
<a name='SkColor4f'></a>
---

View File

@ -321,8 +321,8 @@ from <a href='#SkColorSetA_a'>a</a>. <a href='#Alpha'>Alpha</a> component of <a
---
<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
constexpr <a href='#SkAlpha'>SkAlpha</a> <a href='#SK_AlphaOPAQUE'>SK_AlphaOPAQUE</a> = 0xFF;
constexpr <a href='#SkAlpha'>SkAlpha</a> <a href='#SK_AlphaTRANSPARENT'>SK_AlphaTRANSPARENT</a> = 0x00;
constexpr <a href='#SkAlpha'>SkAlpha</a> <a href='#SK_AlphaOPAQUE'>SK_AlphaOPAQUE</a> = 0xFF;
</pre>
<a href='#Alpha'>Alpha</a> constants are conveniences to represent fully transparent and fully
@ -372,17 +372,17 @@ fully transparent; to 255, fully opaque.
<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorGREEN'>SK_ColorGREEN</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorLTGRAY'>SK_ColorLTGRAY</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorRED'>SK_ColorRED</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorGRAY'>SK_ColorGRAY</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorYELLOW'>SK_ColorYELLOW</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorBLACK'>SK_ColorBLACK</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorDKGRAY'>SK_ColorDKGRAY</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorTRANSPARENT'>SK_ColorTRANSPARENT</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorCYAN'>SK_ColorCYAN</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorDKGRAY'>SK_ColorDKGRAY</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorLTGRAY'>SK_ColorLTGRAY</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorGRAY'>SK_ColorGRAY</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorWHITE'>SK_ColorWHITE</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorMAGENTA'>SK_ColorMAGENTA</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorYELLOW'>SK_ColorYELLOW</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorBLUE'>SK_ColorBLUE</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorCYAN'>SK_ColorCYAN</a>;
constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorMAGENTA'>SK_ColorMAGENTA</a>;
</pre>
<a href='#Color'>Color</a> names are provided as conveniences, but are not otherwise special.

View File

@ -790,15 +790,15 @@ Skews are not similar and do not preserve right angles.
---
<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
static constexpr int <a href='#SkMatrix_kMPersp2'>kMPersp2</a> = 8;
static constexpr int <a href='#SkMatrix_kMPersp0'>kMPersp0</a> = 6;
static constexpr int <a href='#SkMatrix_kMPersp1'>kMPersp1</a> = 7;
static constexpr int <a href='#SkMatrix_kMSkewX'>kMSkewX</a> = 1;
static constexpr int <a href='#SkMatrix_kMPersp2'>kMPersp2</a> = 8;
static constexpr int <a href='#SkMatrix_kMSkewY'>kMSkewY</a> = 3;
static constexpr int <a href='#SkMatrix_kMTransX'>kMTransX</a> = 2;
static constexpr int <a href='#SkMatrix_kMScaleX'>kMScaleX</a> = 0;
static constexpr int <a href='#SkMatrix_kMSkewY'>kMSkewY</a> = 3;
static constexpr int <a href='#SkMatrix_kMScaleY'>kMScaleY</a> = 4;
static constexpr int <a href='#SkMatrix_kMSkewX'>kMSkewX</a> = 1;
static constexpr int <a href='#SkMatrix_kMTransY'>kMTransY</a> = 5;
static constexpr int <a href='#SkMatrix_kMScaleY'>kMScaleY</a> = 4;
static constexpr int <a href='#SkMatrix_kMPersp0'>kMPersp0</a> = 6;
</pre>
<a href='#Matrix'>Matrix</a> organizes its values in row order. These members correspond to