diff options
| author |  Mike Reed <reed@google.com> | 2017-03-21 05:41:35 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-21 10:11:35 +0000 |
| commit | 3130fbb1a7aa60ac764f5ccb64a1a0ee976ea127 (patch) | |
| tree | 1a80d6a1845c71619f3cc46fe70df82561ffdb4e | |
| parent | 4e8472c5299b051c7e87481f97d46f5db5a3c98c (diff) | |
remove SK_SUPPORT_LEGACY_DRAWVERTICES_VIRTUAL flag
BUG=skia:6366
Change-Id: If5e5bc2a65f2d8c66d7bef36cbb906c01225f80f
Reviewed-on: https://skia-review.googlesource.com/9940
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
| -rw-r--r-- | gn/android_framework_defines.gni | 1 | ||||
| -rw-r--r-- | include/core/SkCanvas.h | 8 | ||||
| -rw-r--r-- | public.bzl | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni index fdc76a9ef9..76c8339a9c 100644 --- a/gn/android_framework_defines.gni +++ b/gn/android_framework_defines.gni @@ -16,6 +16,5 @@ android_framework_defines = [ "SK_SUPPORT_LEGACY_SHADER_ISABITMAP", "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER", "SK_SUPPORT_LEGACY_CANVAS_HELPERS", - "SK_SUPPORT_LEGACY_DRAWVERTICES_VIRTUAL", "SK_SUPPORT_LEGACY_IMG_SNAPSHOT", ] diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 27b28ff029..a1ba4c50e7 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1442,15 +1442,7 @@ protected: const SkPaint&); virtual void onDrawRRect(const SkRRect&, const SkPaint&); virtual void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&); - -#ifdef SK_SUPPORT_LEGACY_DRAWVERTICES_VIRTUAL - virtual void onDrawVertices(VertexMode, int, const SkPoint[], - const SkPoint[], const SkColor[], SkBlendMode, - const uint16_t[], int, const SkPaint&) {} -#endif - virtual void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&); - virtual void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int count, SkBlendMode, const SkRect* cull, const SkPaint*); virtual void onDrawPath(const SkPath&, const SkPaint&); diff --git a/public.bzl b/public.bzl index 93d95a3707..89b80a43a4 100644 --- a/public.bzl +++ b/public.bzl @@ -657,7 +657,6 @@ DEFINES_ALL = [ # Temporarily Disable analytic AA for Google3 "SK_NO_ANALYTIC_AA", "SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF", - "SK_SUPPORT_LEGACY_DRAWVERTICES_VIRTUAL", ] ################################################################################ |