From 7bae65d0070c5923abe8d052688b86e41d872f33 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Wed, 17 Oct 2018 09:39:54 -0400 Subject: [PATCH] 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 Auto-Submit: Cary Clark Reviewed-by: Cary Clark --- docs/SkColor4f_Reference.bmh | 41 ++++++++++++++++++++ site/user/api/SkColor4f_Reference.md | 56 ++++++++++++++++++++++++++-- site/user/api/SkColor_Reference.md | 14 +++---- site/user/api/SkMatrix_Reference.md | 10 ++--- 4 files changed, 106 insertions(+), 15 deletions(-) diff --git a/docs/SkColor4f_Reference.bmh b/docs/SkColor4f_Reference.bmh index 9bb85965c6..97fabb173b 100644 --- a/docs/SkColor4f_Reference.bmh +++ b/docs/SkColor4f_Reference.bmh @@ -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 diff --git a/site/user/api/SkColor4f_Reference.md b/site/user/api/SkColor4f_Reference.md index fefe65cd75..49fcc12b8a 100644 --- a/site/user/api/SkColor4f_Reference.md +++ b/site/user/api/SkColor4f_Reference.md @@ -33,9 +33,9 @@ struct SkRGBA4f { static SkRGBA4f FromPMColor(SkPMColor); SkRGBA4f<kPremul_SkAlphaType> premul() const; SkRGBA4f<kUnpremul_SkAlphaType> unpremul() const; - uint32_t toBytes_RGBA() const; - static SkRGBA4f FromBytes_RGBA(uint32_t color); - SkRGBA4f makeOpaque() const; + uint32_t toBytes_RGBA() const; + static SkRGBA4f FromBytes_RGBA(uint32_t color); + SkRGBA4f makeOpaque() const; }; @@ -540,6 +540,56 @@ Returns SkRGBA4f with all components independent of premul + + +--- + +
+uint32_t toBytes RGBA() const
+
+ +Produces bytes in RGBA order. Component values are not affected by color Alpha. + +### Return Value + +color + + + +--- + +
+static SkRGBA4f FromBytes RGBA(uint32_t color)
+
+ +Returns from color kRGBA_8888_SkColorType order. Component values are +not affected by color Alpha. + +### Parameters + + + + +
colorPremultiplied or Unpremultiplied
+ +### Return Value + +color + + + +--- + +
+SkRGBA4f makeOpaque() const
+
+ +Returns color with Alpha set to one. + +### Return Value + +color + --- diff --git a/site/user/api/SkColor_Reference.md b/site/user/api/SkColor_Reference.md index 8a79b54518..9ecda8d5e8 100644 --- a/site/user/api/SkColor_Reference.md +++ b/site/user/api/SkColor_Reference.md @@ -321,8 +321,8 @@ from a. Alpha component of -constexpr SkAlpha SK_AlphaOPAQUE = 0xFF; constexpr SkAlpha SK_AlphaTRANSPARENT = 0x00; +constexpr SkAlpha SK_AlphaOPAQUE = 0xFF; Alpha constants are conveniences to represent fully transparent and fully @@ -372,17 +372,17 @@ fully transparent; to 255, fully opaque. 
 constexpr SkColor SK_ColorGREEN;
-constexpr SkColor SK_ColorLTGRAY;
 constexpr SkColor SK_ColorRED;
-constexpr SkColor SK_ColorGRAY;
-constexpr SkColor SK_ColorYELLOW;
 constexpr SkColor SK_ColorBLACK;
-constexpr SkColor SK_ColorDKGRAY;
 constexpr SkColor SK_ColorTRANSPARENT;
-constexpr SkColor SK_ColorCYAN;
+constexpr SkColor SK_ColorDKGRAY;
+constexpr SkColor SK_ColorLTGRAY;
+constexpr SkColor SK_ColorGRAY;
 constexpr SkColor SK_ColorWHITE;
-constexpr SkColor SK_ColorMAGENTA;
+constexpr SkColor SK_ColorYELLOW;
 constexpr SkColor SK_ColorBLUE;
+constexpr SkColor SK_ColorCYAN;
+constexpr SkColor SK_ColorMAGENTA;
Color names are provided as conveniences, but are not otherwise special. diff --git a/site/user/api/SkMatrix_Reference.md b/site/user/api/SkMatrix_Reference.md index bb0feaf91a..a94b565aa9 100644 --- a/site/user/api/SkMatrix_Reference.md +++ b/site/user/api/SkMatrix_Reference.md @@ -790,15 +790,15 @@ Skews are not similar and do not preserve right angles. --- 
-    static constexpr int kMPersp2 = 8;
-    static constexpr int kMPersp0 = 6;
     static constexpr int kMPersp1 = 7;
-    static constexpr int kMSkewX = 1;
+    static constexpr int kMPersp2 = 8;
+    static constexpr int kMSkewY = 3;
     static constexpr int kMTransX = 2;
     static constexpr int kMScaleX = 0;
-    static constexpr int kMSkewY = 3;
-    static constexpr int kMScaleY = 4;
+    static constexpr int kMSkewX = 1;
     static constexpr int kMTransY = 5;
+    static constexpr int kMScaleY = 4;
+    static constexpr int kMPersp0 = 6;
Matrix organizes its values in row order. These members correspond to