From 939fd6ce9c49f8b3552e8334b7ac72dde420a352 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Thu, 12 Jul 2018 08:40:13 -0400 Subject: remove more references to draw filter TBR=bungeman@google.com NOTRY=true Docs-Preview: https://skia.org/?cl=140798 Bug: skia:6818 Change-Id: Ia741238f65b55cf20b6f4a813a573e84d29a2dfd Reviewed-on: https://skia-review.googlesource.com/140798 Commit-Queue: Cary Clark Reviewed-by: Cary Clark --- site/user/api/SkCanvas_Reference.md | 47 +++++++++++++++---------------------- site/user/api/SkColor_Reference.md | 2 +- site/user/api/SkMatrix_Reference.md | 4 ++-- site/user/api/SkPixmap_Reference.md | 4 ++-- site/user/api/undocumented.md | 4 ---- 5 files changed, 24 insertions(+), 37 deletions(-) (limited to 'site') diff --git a/site/user/api/SkCanvas_Reference.md b/site/user/api/SkCanvas_Reference.md index 70f4657a4d..c418c50897 100644 --- a/site/user/api/SkCanvas_Reference.md +++ b/site/user/api/SkCanvas_Reference.md @@ -689,7 +689,7 @@ times rowBytes ### Example -
Allocates a three by three bitmap, clears it to white, and draws a black pixel +
Allocates a three by three bitmap, clears it to white, and draws a black pixel in the center.
@@ -1872,10 +1872,9 @@ to implement windows and views. The initial state has an identity matrix and and an infinite clip. Even with a wide-open clip, drawing is constrained by the bounds of the Canvas Surface or Device. -Canvas savable state consists of Clip, Matrix, and Draw_Filter. +Canvas savable state consists of Clip and Matrix. Clip describes the area that may be drawn to. Matrix transforms the geometry. -Draw_Filter (deprecated on most platforms) modifies the paint before drawing. save, saveLayer, saveLayerPreserveLCDTextRequests, and saveLayerAlpha save state and return the depth of the stack. @@ -1920,9 +1919,9 @@ Each Clip uses the current Matrix for int save() -Saves Matrix, Clip, and ( deprecated on most platforms). -Calling restore discards changes to Matrix, Clip, and Draw_Filter, -restoring the Matrix, Clip, and to their state when save was called. +Saves Matrix and Clip. +Calling restore discards changes to Matrix and Clip, +restoring the Matrix and Clip to their state when save was called. Matrix may be changed by translate, scale, rotate, skew, concat, setMatrix, and resetMatrix. Clip may be changed by clipRect, clipRRect, clipPath, clipRegion. @@ -1956,7 +1955,7 @@ the red square is not translated, and is drawn at the origin. void restore() -Removes changes to Matrix, Clip, and since Canvas state was +Removes changes to Matrix and Clip since Canvas state was last saved. The state is removed from the stack. Does nothing if the stack is empty. @@ -1978,7 +1977,7 @@ Does nothing if the stack is empty. int getSaveCount() const -Returns the number of saved states, each containing: Matrix, Clip, and Draw_Filter. +Returns the number of saved states, each containing: Matrix and Clip. Equals the number of save calls less the number of restore calls plus one. The save count of a new canvas is one. @@ -2013,7 +2012,7 @@ depth = 1 void restoreToCount(int saveCount) -Restores state to Matrix, Clip, and values when save, saveLayer, +Restores state to Matrix and Clip values when save, saveLayer, saveLayerPreserveLCDTextRequests, or saveLayerAlpha returned saveCount. Does nothing if saveCount is greater than state stack count. @@ -2065,10 +2064,8 @@ restored, its Bitmap can be modified by int saveLayer(const SkRect* bounds, const SkPaint* paint) -Saves Matrix, Clip, and ( deprecated on most platforms), -and allocates a Bitmap for subsequent drawing. -Calling restore discards changes to Matrix, Clip, and Draw_Filter, -and draws the Bitmap. +Saves Matrix and Clip, and allocates a Bitmap for subsequent drawing. +Calling restore discards changes to Matrix and Clip, and draws the Bitmap. Matrix may be changed by translate, scale, rotate, skew, concat, setMatrix, and resetMatrix. Clip may be changed by clipRect, clipRRect, @@ -2114,10 +2111,8 @@ depth of saved stack int saveLayer(const SkRect& bounds, const SkPaint* paint) -Saves Matrix, Clip, and ( deprecated on most platforms), -and allocates a Bitmap for subsequent drawing. -Calling restore discards changes to Matrix, Clip, and Draw_Filter, -and draws the Bitmap. +Saves Matrix and Clip, and allocates a Bitmap for subsequent drawing. +Calling restore discards changes to Matrix and Clip, and draws the Bitmap. Matrix may be changed by translate, scale, rotate, skew, concat, setMatrix, and resetMatrix. Clip may be changed by clipRect, clipRRect, @@ -2165,12 +2160,10 @@ The red rectangle is clipped; it does not fully fit on LayersaveLayerPreserveLCDTextRequests(const SkRect* bounds, const SkPaint* paint) -Saves Matrix, Clip, and ( deprecated on most platforms), -and allocates a Bitmap for subsequent drawing. +Saves Matrix and Clip, and allocates a Bitmap for subsequent drawing. LCD Text is preserved when the Layer is drawn to the prior Layer. -Calling restore discards changes to Matrix, Clip, and Draw_Filter, -and draws Layer. +Calling restore discards changes to Matrix and Clip, and draws Layer. Matrix may be changed by translate, scale, rotate, skew, concat, setMatrix, and resetMatrix. Clip may be changed by clipRect, clipRRect, @@ -2219,10 +2212,9 @@ depth of saved stack int saveLayerAlpha(const SkRect* bounds, U8CPU alpha) -Saves Matrix, Clip, and ( deprecated on most platforms), -and allocates Bitmap for subsequent drawing. +Saves Matrix and Clip, and allocates Bitmap for subsequent drawing. -Calling restore discards changes to Matrix, Clip, and Draw_Filter, +Calling restore discards changes to Matrix and Clip, and blends Layer with alpha opacity onto prior Layer. Matrix may be changed by translate, scale, rotate, skew, concat, @@ -2625,10 +2617,9 @@ identity matrix int saveLayer(const SaveLayerRec& layerRec) -Saves Matrix, Clip, and ( deprecated on most platforms), -and allocates Bitmap for subsequent drawing. +Saves Matrix and Clip, and allocates Bitmap for subsequent drawing. -Calling restore discards changes to Matrix, Clip, and Draw_Filter, +Calling restore discards changes to Matrix and Clip, and blends Bitmap with Color Alpha opacity onto the prior Layer. Matrix may be changed by translate, scale, rotate, skew, concat, @@ -3246,7 +3237,7 @@ itself or another Path Contour, whether t ### Example -
Top figure uses SkPath::kInverseWinding FillType and SkClipOp::kDifference; +
Top figure uses SkPath::kInverseWinding FillType and SkClipOp::kDifference; area outside clip is subtracted from circle. Bottom figure uses SkPath::kWinding FillType and SkClipOp::kIntersect; diff --git a/site/user/api/SkColor_Reference.md b/site/user/api/SkColor_Reference.md index bc6db9d2aa..cb497f6537 100644 --- a/site/user/api/SkColor_Reference.md +++ b/site/user/api/SkColor_Reference.md @@ -609,7 +609,7 @@ The values chosen for names may not be the same as values used by ### Example -
+
### Constants diff --git a/site/user/api/SkMatrix_Reference.md b/site/user/api/SkMatrix_Reference.md index 2bd8b688b6..617ccc8915 100644 --- a/site/user/api/SkMatrix_Reference.md +++ b/site/user/api/SkMatrix_Reference.md @@ -2278,7 +2278,7 @@ Sets horizontal scale factor. ### Example -
+
### See Also @@ -2998,7 +2998,7 @@ The pivot point is unchanged when mapped with Matrix. ### Example -
+
### See Also diff --git a/site/user/api/SkPixmap_Reference.md b/site/user/api/SkPixmap_Reference.md index c94411dca2..4a5ba1f941 100644 --- a/site/user/api/SkPixmap_Reference.md +++ b/site/user/api/SkPixmap_Reference.md @@ -332,7 +332,7 @@ memory if desired. ### Example -
+
#### Example Output @@ -910,7 +910,7 @@ size in bytes of image buffer ### Example -
+
#### Example Output diff --git a/site/user/api/undocumented.md b/site/user/api/undocumented.md index 45e5551cb2..7f46c73924 100644 --- a/site/user/api/undocumented.md +++ b/site/user/api/undocumented.md @@ -176,10 +176,6 @@ SK_API void SkDebugf(const char format[], ...) ## PDF -# Draw Filter - -# Class SkDrawFilter - # Draw Layer # Draw Looper -- cgit v1.2.3