Index: skia/ext/analysis_canvas.h |
diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h |
index d3d3b80dc8d8581002d2cbd443ac6507f0a86763..abedcaf0e5240d42bca95999eaed15a047185bd9 100644 |
--- a/skia/ext/analysis_canvas.h |
+++ b/skia/ext/analysis_canvas.h |
@@ -18,7 +18,7 @@ namespace skia { |
class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback { |
public: |
AnalysisCanvas(int width, int height); |
- virtual ~AnalysisCanvas(); |
+ ~AnalysisCanvas() override; |
// Returns true when a SkColor can be used to represent result. |
bool GetColorIfSolid(SkColor* color) const; |
@@ -27,92 +27,93 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback { |
void SetForceNotTransparent(bool flag); |
// SkDrawPictureCallback override. |
- virtual bool abortDrawing() override; |
+ bool abortDrawing() override; |
// SkCanvas overrides. |
- virtual void clear(SkColor) override; |
- virtual void drawPaint(const SkPaint& paint) override; |
- virtual void drawPoints(PointMode, |
- size_t count, |
- const SkPoint pts[], |
- const SkPaint&) override; |
- virtual void drawOval(const SkRect&, const SkPaint&) override; |
- virtual void drawRect(const SkRect&, const SkPaint&) override; |
- virtual void drawRRect(const SkRRect&, const SkPaint&) override; |
- virtual void drawPath(const SkPath& path, const SkPaint&) override; |
- virtual void drawBitmap(const SkBitmap&, |
- SkScalar left, |
- SkScalar top, |
- const SkPaint* paint = NULL) override; |
- virtual void drawBitmapRectToRect(const SkBitmap&, |
- const SkRect* src, |
- const SkRect& dst, |
- const SkPaint* paint, |
- DrawBitmapRectFlags flags) override; |
- virtual void drawBitmapMatrix(const SkBitmap&, |
- const SkMatrix&, |
- const SkPaint* paint = NULL) override; |
- virtual void drawBitmapNine(const SkBitmap& bitmap, |
- const SkIRect& center, |
- const SkRect& dst, |
- const SkPaint* paint = NULL) override; |
- virtual void drawSprite(const SkBitmap&, int left, int top, |
- const SkPaint* paint = NULL) override; |
- virtual void drawVertices(VertexMode, |
- int vertexCount, |
- const SkPoint vertices[], |
- const SkPoint texs[], |
- const SkColor colors[], |
- SkXfermode*, |
- const uint16_t indices[], |
- int indexCount, |
- const SkPaint&) override; |
+ void clear(SkColor) override; |
+ void drawPaint(const SkPaint& paint) override; |
+ void drawPoints(PointMode, |
+ size_t count, |
+ const SkPoint pts[], |
+ const SkPaint&) override; |
+ void drawOval(const SkRect&, const SkPaint&) override; |
+ void drawRect(const SkRect&, const SkPaint&) override; |
+ void drawRRect(const SkRRect&, const SkPaint&) override; |
+ void drawPath(const SkPath& path, const SkPaint&) override; |
+ void drawBitmap(const SkBitmap&, |
+ SkScalar left, |
+ SkScalar top, |
+ const SkPaint* paint = NULL) override; |
+ void drawBitmapRectToRect(const SkBitmap&, |
+ const SkRect* src, |
+ const SkRect& dst, |
+ const SkPaint* paint, |
+ DrawBitmapRectFlags flags) override; |
+ void drawBitmapMatrix(const SkBitmap&, |
+ const SkMatrix&, |
+ const SkPaint* paint = NULL) override; |
+ void drawBitmapNine(const SkBitmap& bitmap, |
+ const SkIRect& center, |
+ const SkRect& dst, |
+ const SkPaint* paint = NULL) override; |
+ void drawSprite(const SkBitmap&, |
+ int left, |
+ int top, |
+ const SkPaint* paint = NULL) override; |
+ void drawVertices(VertexMode, |
+ int vertexCount, |
+ const SkPoint vertices[], |
+ const SkPoint texs[], |
+ const SkColor colors[], |
+ SkXfermode*, |
+ const uint16_t indices[], |
+ int indexCount, |
+ const SkPaint&) override; |
protected: |
- virtual void willSave() override; |
- virtual SaveLayerStrategy willSaveLayer(const SkRect*, |
- const SkPaint*, |
- SaveFlags) override; |
- virtual void willRestore() override; |
- |
- virtual void onClipRect(const SkRect& rect, |
- SkRegion::Op op, |
- ClipEdgeStyle edge_style) override; |
- virtual void onClipRRect(const SkRRect& rrect, |
- SkRegion::Op op, |
- ClipEdgeStyle edge_style) override; |
- virtual void onClipPath(const SkPath& path, |
- SkRegion::Op op, |
- ClipEdgeStyle edge_style) override; |
- virtual void onClipRegion(const SkRegion& deviceRgn, |
- SkRegion::Op op) override; |
- |
- virtual void onDrawText(const void* text, |
- size_t byteLength, |
- SkScalar x, |
- SkScalar y, |
- const SkPaint&) override; |
- virtual void onDrawPosText(const void* text, |
- size_t byteLength, |
- const SkPoint pos[], |
- const SkPaint&) override; |
- virtual void onDrawPosTextH(const void* text, |
- size_t byteLength, |
- const SkScalar xpos[], |
- SkScalar constY, |
- const SkPaint&) override; |
- virtual void onDrawTextOnPath(const void* text, |
- size_t byteLength, |
- const SkPath& path, |
- const SkMatrix* matrix, |
- const SkPaint&) override; |
- virtual void onDrawTextBlob(const SkTextBlob* blob, |
- SkScalar x, |
- SkScalar y, |
- const SkPaint& paint) override; |
- virtual void onDrawDRRect(const SkRRect& outer, |
- const SkRRect& inner, |
- const SkPaint&) override; |
+ void willSave() override; |
+ SaveLayerStrategy willSaveLayer(const SkRect*, |
+ const SkPaint*, |
+ SaveFlags) override; |
+ void willRestore() override; |
+ |
+ void onClipRect(const SkRect& rect, |
+ SkRegion::Op op, |
+ ClipEdgeStyle edge_style) override; |
+ void onClipRRect(const SkRRect& rrect, |
+ SkRegion::Op op, |
+ ClipEdgeStyle edge_style) override; |
+ void onClipPath(const SkPath& path, |
+ SkRegion::Op op, |
+ ClipEdgeStyle edge_style) override; |
+ void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) override; |
+ |
+ void onDrawText(const void* text, |
+ size_t byteLength, |
+ SkScalar x, |
+ SkScalar y, |
+ const SkPaint&) override; |
+ void onDrawPosText(const void* text, |
+ size_t byteLength, |
+ const SkPoint pos[], |
+ const SkPaint&) override; |
+ void onDrawPosTextH(const void* text, |
+ size_t byteLength, |
+ const SkScalar xpos[], |
+ SkScalar constY, |
+ const SkPaint&) override; |
+ void onDrawTextOnPath(const void* text, |
+ size_t byteLength, |
+ const SkPath& path, |
+ const SkMatrix* matrix, |
+ const SkPaint&) override; |
+ void onDrawTextBlob(const SkTextBlob* blob, |
+ SkScalar x, |
+ SkScalar y, |
+ const SkPaint& paint) override; |
+ void onDrawDRRect(const SkRRect& outer, |
+ const SkRRect& inner, |
+ const SkPaint&) override; |
void OnComplexClip(); |