aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar Ruiqi Mao <ruiqimao@google.com>2018-07-02 15:20:10 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-03 13:33:43 +0000
commit94d57c477fe122c146a034c625cebb6c44ef21b0 (patch)
treec2709663d47bce026cc465ff6cda2b77f1c59efa /include/core
parentd7425b58df89b1cf67cf9a8b0a055c1d071a6d88 (diff)
updated SkCanvas documentation for animation overloads of drawVertices
changed bookmaker ParserCommon::writeBlockTrim limit to 20000 disabled broken SkPaint::containsText example Docs-Preview: https://skia.org/?cl=138862 Bug: skia:8123 Change-Id: Ib4003bf7b9603bf652f86cd56e0975cd09bcbf71 Reviewed-on: https://skia-review.googlesource.com/138862 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkCanvas.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 15ed034db6..90e51e9b0e 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -6,7 +6,7 @@
*/
/* Generated by tools/bookmaker from include/core/SkCanvas.h and docs/SkCanvas_Reference.bmh
- on 2018-06-14 13:13:33. Additional documentation and examples can be found at:
+ on 2018-07-02 10:27:08. Additional documentation and examples can be found at:
https://skia.org/user/api/SkCanvas_Reference
You may edit either file directly. Structural changes to public interfaces require
@@ -2157,11 +2157,11 @@ public:
will be applied before performing mesh deformations. If no such transformation is needed,
it should be the identity matrix.
- @param vertices triangle mesh to draw
- @param bones bone matrix data
- @param boneCount number of bone matrices
- @param mode combines vertices colors with SkShader, if both are present
- @param paint specifies the SkShader, used as SkVertices texture, may be nullptr
+ @param vertices triangle mesh to draw
+ @param bones bone matrix data
+ @param boneCount number of bone matrices
+ @param mode combines vertices colors with SkShader, if both are present
+ @param paint specifies the SkShader, used as SkVertices texture, may be nullptr
*/
void drawVertices(const SkVertices* vertices, const SkMatrix* bones, int boneCount,
SkBlendMode mode, const SkPaint& paint);
@@ -2174,13 +2174,13 @@ public:
will be applied before performing mesh deformations. If no such transformation is needed,
it should be the identity matrix.
- @param vertices triangle mesh to draw
- @param bones bone matrix data
- @param boneCount number of bone matrices
- @param mode combines vertices colors with SkShader, if both are present
- @param paint specifies the SkShader, used as SkVertices texture, may be nullptr
+ @param vertices triangle mesh to draw
+ @param bones bone matrix data
+ @param boneCount number of bone matrices
+ @param mode combines vertices colors with SkShader, if both are present
+ @param paint specifies the SkShader, used as SkVertices texture, may be nullptr
*/
- void drawVertices(const sk_sp<SkVertices> vertices, const SkMatrix* bones, int boneCount,
+ void drawVertices(const sk_sp<SkVertices>& vertices, const SkMatrix* bones, int boneCount,
SkBlendMode mode, const SkPaint& paint);
/** Draws a Coons patch: the interpolation of four cubics with shared corners,
@@ -2246,7 +2246,8 @@ public:
atlas, and SkRSXform xform transforms it into destination space.
xform, text, and colors if present, must contain count entries.
- Optional colors are applied for each sprite using SkBlendMode.
+ Optional colors are applied for each sprite using SkBlendMode mode, treating
+ sprite as source and colors as destination.
Optional cullRect is a conservative bounds of all transformed sprites.
If cullRect is outside of clip, canvas can skip drawing.
@@ -2782,6 +2783,7 @@ private:
*/
class SkAutoCanvasRestore {
public:
+
/** Preserves SkCanvas save count. Optionally saves SkCanvas clip and SkCanvas matrix.
@param canvas SkCanvas to guard