commit adaeaedc28ff708dbe1380fe54480bb77ed007d8
author Florin Malita <fmalita@chromium.org> Thu Sep 21 15:28:29 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 22 14:01:27 2017 +0000
tree 66457d2f45abff9dfaac8c162123019f30479856
parent 8aa4569c139a7a7ac38c62b25e3af40309cc2ee2

Add missing onDrawDrawable() overrides to utility canvases

Change-Id: Ia5a7c523263e2c4744e0f3a743c6a4433760a4be
Reviewed-on: https://skia-review.googlesource.com/49770
Reviewed-by: Stan Iliev <stani@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

include/utils/SkDumpCanvas.h

diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h
index e7f941c..2988aaa 100644
--- a/include/utils/SkDumpCanvas.h
+++ b/include/utils/SkDumpCanvas.h
@@ -45,6 +45,7 @@
         kDrawBitmap_Verb,
         kDrawText_Verb,
         kDrawPicture_Verb,
+        kDrawDrawable_Verb,
         kDrawVertices_Verb,
         kDrawPatch_Verb,
         kDrawData_Verb, // obsolete
@@ -120,6 +121,7 @@
     void onClipRegion(const SkRegion&, SkClipOp) override;
 
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
+    void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
     void onDrawAnnotation(const SkRect&, const char key[], SkData* value) override;
 
     static const char* EdgeStyleToAAString(ClipEdgeStyle edgeStyle);

include/utils/SkLuaCanvas.h

diff --git a/include/utils/SkLuaCanvas.h b/include/utils/SkLuaCanvas.h
index 7653b45..2fef2c0 100644
--- a/include/utils/SkLuaCanvas.h
+++ b/include/utils/SkLuaCanvas.h
@@ -66,6 +66,7 @@
     void onClipRegion(const SkRegion&, SkClipOp) override;
 
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
+    void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
 
 private:
     lua_State*  fL;

include/utils/SkNWayCanvas.h

diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index 7701d50..6641395 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -79,6 +79,7 @@
     void onClipRegion(const SkRegion&, SkClipOp) override;
 
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
+    void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
     void onDrawAnnotation(const SkRect&, const char[], SkData*) override;
 
     class Iter;

include/utils/SkPaintFilterCanvas.h

diff --git a/include/utils/SkPaintFilterCanvas.h b/include/utils/SkPaintFilterCanvas.h
index 31b3663..d89c80a 100644
--- a/include/utils/SkPaintFilterCanvas.h
+++ b/include/utils/SkPaintFilterCanvas.h
@@ -34,6 +34,7 @@
         kOval_Type,
         kPath_Type,
         kPicture_Type,
+        kDrawable_Type,
         kText_Type,
         kTextBlob_Type,
         kVertices_Type,
@@ -79,6 +80,7 @@
                              const SkPoint texCoords[4], SkBlendMode,
                              const SkPaint& paint) override;
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
+    void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
 
     void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                     const SkPaint&) override;