aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar reed <reed@chromium.org>2015-01-02 06:39:51 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-02 06:39:51 -0800
commitc4fda92f45b9649f233a5b8636618a6431aa59cb (patch)
tree18eab2beddd77308e51e6aba0fa152e883d7b1b0 /include
parent7c339ae1e362e9f02cdfb9b32007f143dec0bc0e (diff)
remove unused drawData
Diffstat (limited to 'include')
-rw-r--r--include/core/SkCanvas.h6
-rw-r--r--include/utils/SkDumpCanvas.h3
-rw-r--r--include/utils/SkLuaCanvas.h1
-rw-r--r--include/utils/SkNWayCanvas.h1
-rw-r--r--include/utils/SkProxyCanvas.h1
5 files changed, 4 insertions, 8 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 121239d4bf..cb4fedefdc 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1017,15 +1017,15 @@ public:
void EXPERIMENTAL_drawDrawable(SkCanvasDrawable*);
+#ifdef SK_SUPPORT_LEGACY_DRAWDATA
/** Send a blob of data to the canvas.
For canvases that draw, this call is effectively a no-op, as the data
is not parsed, but just ignored. However, this call exists for
subclasses like SkPicture's recording canvas, that can store the data
and then play it back later (via another call to drawData).
*/
- virtual void drawData(const void* /*data*/, size_t /*length*/) {
- // do nothing. Subclasses may do something with the data
- }
+ virtual void drawData(const void* /*data*/, size_t /*length*/) {}
+#endif
/** Add comments. beginCommentGroup/endCommentGroup open/close a new group.
Each comment added via addComment is notionally attached to its
diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h
index 63c0a399af..0c66506c44 100644
--- a/include/utils/SkDumpCanvas.h
+++ b/include/utils/SkDumpCanvas.h
@@ -47,7 +47,7 @@ public:
kDrawPicture_Verb,
kDrawVertices_Verb,
kDrawPatch_Verb,
- kDrawData_Verb,
+ kDrawData_Verb, // obsolete
kBeginCommentGroup_Verb,
kAddComment_Verb,
@@ -94,7 +94,6 @@ public:
const SkColor colors[], SkXfermode* xmode,
const uint16_t indices[], int indexCount,
const SkPaint& paint) SK_OVERRIDE;
- virtual void drawData(const void*, size_t) SK_OVERRIDE;
virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
virtual void endCommentGroup() SK_OVERRIDE;
diff --git a/include/utils/SkLuaCanvas.h b/include/utils/SkLuaCanvas.h
index 7eede85b71..d2019d4325 100644
--- a/include/utils/SkLuaCanvas.h
+++ b/include/utils/SkLuaCanvas.h
@@ -39,7 +39,6 @@ public:
const SkColor colors[], SkXfermode* xmode,
const uint16_t indices[], int indexCount,
const SkPaint& paint) SK_OVERRIDE;
- virtual void drawData(const void* data, size_t length) SK_OVERRIDE;
protected:
virtual void willSave() SK_OVERRIDE;
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index ee780104c1..5e8c52d136 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -50,7 +50,6 @@ public:
const SkColor colors[], SkXfermode* xmode,
const uint16_t indices[], int indexCount,
const SkPaint&) SK_OVERRIDE;
- virtual void drawData(const void* data, size_t length) SK_OVERRIDE;
virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE;
diff --git a/include/utils/SkProxyCanvas.h b/include/utils/SkProxyCanvas.h
index 49fcf5fa3f..c8a830f613 100644
--- a/include/utils/SkProxyCanvas.h
+++ b/include/utils/SkProxyCanvas.h
@@ -50,7 +50,6 @@ public:
const SkColor colors[], SkXfermode* xmode,
const uint16_t indices[], int indexCount,
const SkPaint& paint) SK_OVERRIDE;
- virtual void drawData(const void* data, size_t length) SK_OVERRIDE;
virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;