AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "enable color4f doc examples"

Browse Source 
This reverts commit b84576af0a.

Reason for revert: Need to revert original CL.

Original change's description:
> enable color4f doc examples
> 
> fiddle has picked up the SkPaint::(get)(set)Color4f
> include change, so the doc examples are ready to
> check in.
> 
> NOTRY=true
> R=​brianosman@google.com
> 
> Docs-Preview: https://skia.org/?cl=151370
> Bug: skia:6898
> Change-Id: I2c7ad3ce892ea6c8fde524df8e48a3c5713e2ba9
> Reviewed-on: https://skia-review.googlesource.com/151370
> Reviewed-by: Cary Clark <caryclark@skia.org>
> Commit-Queue: Cary Clark <caryclark@skia.org>
> Auto-Submit: Cary Clark <caryclark@skia.org>

TBR=brianosman@google.com,caryclark@skia.org

Change-Id: Iec47490505b532eb496f0eab8de9678fb5b7dcbf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6898
Reviewed-on: https://skia-review.googlesource.com/151542
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2018-09-04 19:49:59 +00:00 committed by Skia Commit-Bot
parent 5bcab74e7a
commit 62475beb6d
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/SkPaint_Reference.bmh
View File

@ -1709,7 +1709,7 @@ a different arrangement.
#Return Unpremultiplied RGBA ##
#ToDo enable and correct example once fiddle picks up getColor4f ##
#Example
#NoExample
SkPaint paint;
paint.setColor(SK_ColorYELLOW);
SkColor4f y = paint.getColor4f();
@ -1764,7 +1764,7 @@ a different arrangement.
#Param colorSpace Color_Space describing the encoding of color ##
#ToDo enable and correct example once fiddle picks up setColor4f ##
#Example
#NoExample
SkPaint green1, green2;
green1.setColor4f({0, 1, 0, 1}, nullptr); // R=0 G=1 B=0 A=1
green2.setColor(0xFF00FF00); // A=255 R=0 G=255 B=0

12
site/user/api/SkPaint_Reference.md
View File

@ -2613,18 +2613,12 @@ are extended sRGB values (sRGB gamut, and encoded with the sRGB transfer functio
<a href='undocumented#Unpremultiply'>Unpremultiplied</a> RGBA
### Example
<div><fiddle-embed name="8512ea2176f36e8f1aeef311ff228790">
#### Example Output
~~~~
Yellow is 100% red, 100% green, and 0% blue.
~~~~
</fiddle-embed></div>
### See Also
<a href='#SkPaint_getColor'>getColor</a> <a href='SkColor_Reference#SkColor'>SkColor</a>
@ -2688,18 +2682,12 @@ sRGB <a href='#SkPaint_setColor4f_color'>color</a> space.
</tr>
</table>
### Example
<div><fiddle-embed name="fa60859e3d03bdc117a05b32e093a8f1">
#### Example Output
~~~~
green1 == green2
~~~~
</fiddle-embed></div>
### See Also
<a href='SkColor_Reference#SkColor'>SkColor</a> <a href='#SkPaint_setColor'>setColor</a> <a href='#SkPaint_setARGB'>setARGB</a> <a href='SkColor_Reference#SkColorSetARGB'>SkColorSetARGB</a>

14
site/user/api/catalog.htm
View File

@ -1497,13 +1497,6 @@
"file": "SkPaint_Reference",
"name": "SkPaint::getColor",
"stdout": "Yellow is 100% red, 100% green, and 0% blue.\\n"
},
"SkPaint_getColor4f": {
"code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setColor(SK_ColorYELLOW);\n SkColor4f y = paint.getColor4f();\n SkDebugf(\"Yellow is %d%% red, %d%% green, and %d%% blue.\\n\", (int) (y.fR * 100),\n (int) (y.fG * 100), (int) (y.fB * 100));\n}",
"hash": "8512ea2176f36e8f1aeef311ff228790",
"file": "SkPaint_Reference",
"name": "SkPaint::getColor4f",
"stdout": "Yellow is 100% red, 100% green, and 0% blue.\\n"
},
"SkPaint_getColorFilter": {
"code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n SkDebugf(\"nullptr %c= color filter\\n\", paint.getColorFilter() ? '!' : '=');\n paint.setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorLTGRAY, SkBlendMode::kSrcIn));\n SkDebugf(\"nullptr %c= color filter\\n\", paint.getColorFilter() ? '!' : '=');\n}\n",
@ -1854,13 +1847,6 @@
"file": "SkPaint_Reference",
"name": "SkPaint::setColor",
"stdout": "green1 == green2\\n"
},
"SkPaint_setColor4f": {
"code": "void draw(SkCanvas* canvas) {\n SkPaint green1, green2;\n green1.setColor4f({0, 1, 0, 1}, nullptr); // R=0 G=1 B=0 A=1\n green2.setColor(0xFF00FF00); // A=255 R=0 G=255 B=0\n SkDebugf(\"green1 %c= green2\\n\", green1 == green2 ? '=' : '!');\n}",
"hash": "fa60859e3d03bdc117a05b32e093a8f1",
"file": "SkPaint_Reference",
"name": "SkPaint::setColor4f",
"stdout": "green1 == green2\\n"
},
"SkPaint_setDither": {
"code": "void draw(SkCanvas* canvas) {\n SkPaint paint1, paint2;\n paint1.setDither(true);\n paint2.setFlags(paint2.getFlags() | SkPaint::kDither_Flag);\n SkDebugf(\"paint1 %c= paint2\\n\", paint1 == paint2 ? '=' : '!');\n}",