remove legacy canvas helpers

Bug: skia:
Change-Id: I79e08adb49556be506e6198d9fadda684bcb08f2
Reviewed-on: https://skia-review.googlesource.com/11321
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index a40b434739048211856d76174262db2c84e7cd79..71e45fa369a8f190592916fd458e122c595bace3 100644 (file)
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -150,13 +150,6 @@ public:
      */
     virtual SkISize getBaseLayerSize() const;
 
-#ifdef SK_SUPPORT_LEGACY_CANVAS_HELPERS
-    /**
-     *  DEPRECATED: call getBaseLayerSize
-     */
-    SkISize getDeviceSize() const { return this->getBaseLayerSize(); }
-#endif
-
     /**
      *  Create a new surface matching the specified info, one that attempts to
      *  be maximally compatible when used with this canvas. If there is no matching Surface type,
@@ -558,18 +551,6 @@ public:
         return !bounds->isEmpty();
     }
 
-#ifdef SK_SUPPORT_LEGACY_CANVAS_HELPERS
-    /** Fill the entire canvas' bitmap (restricted to the current clip) with the
-        specified ARGB color, using the specified mode.
-        @param a    the alpha component (0..255) of the color to fill the canvas
-        @param r    the red component (0..255) of the color to fill the canvas
-        @param g    the green component (0..255) of the color to fill the canvas
-        @param b    the blue component (0..255) of the color to fill the canvas
-        @param mode the mode to apply the color in (defaults to SrcOver)
-    */
-    void drawARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b, SkBlendMode mode = SkBlendMode::kSrcOver);
-#endif
-
     /** Fill the entire canvas' bitmap (restricted to the current clip) with the
         specified color and mode.
         @param color    the color to draw with
@@ -642,15 +623,6 @@ public:
      */
     void drawPoint(SkScalar x, SkScalar y, const SkPaint& paint);
 
-#ifdef SK_SUPPORT_LEGACY_CANVAS_HELPERS
-    /** Draws a single pixel in the specified color.
-        @param x        The X coordinate of which pixel to draw
-        @param y        The Y coordiante of which pixel to draw
-        @param color    The color to draw
-    */
-    void drawPoint(SkScalar x, SkScalar y, SkColor color);
-#endif
-
     /** Draw a line segment with the specified start and stop x,y coordinates,
         using the specified paint. NOTE: since a line is always "framed", the
         paint's Style is ignored.
@@ -680,19 +652,6 @@ public:
         this->drawRect(r, paint);
     }
 
-#ifdef SK_SUPPORT_LEGACY_CANVAS_HELPERS
-    /** Draw the specified rectangle using the specified paint. The rectangle
-        will be filled or framed based on the Style in the paint.
-        @param left     The left side of the rectangle to be drawn
-        @param top      The top side of the rectangle to be drawn
-        @param right    The right side of the rectangle to be drawn
-        @param bottom   The bottom side of the rectangle to be drawn
-        @param paint    The paint used to draw the rect
-    */
-    void drawRectCoords(SkScalar left, SkScalar top, SkScalar right,
-                        SkScalar bottom, const SkPaint& paint);
-#endif
-
     /** Draw the outline of the specified region using the specified paint.
         @param region   The region to be drawn
         @param paint    The paint used to draw the region

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index d20179a29073c8d2e0274ac0b3f33bf18348f063..e38e73be0c722eba6de5a85cd2aa9491c390b432 100644 (file)
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2777,17 +2777,6 @@ void SkCanvas::onDrawAnnotation(const SkRect& rect, const char key[], SkData* va
 // methods, rather than actually drawing themselves.
 //////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_SUPPORT_LEGACY_CANVAS_HELPERS
-void SkCanvas::drawARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b, SkBlendMode mode) {
-    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawARGB()");
-    SkPaint paint;
-
-    paint.setARGB(a, r, g, b);
-    paint.setBlendMode(mode);
-    this->drawPaint(paint);
-}
-#endif
-
 void SkCanvas::drawColor(SkColor c, SkBlendMode mode) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawColor()");
     SkPaint paint;
@@ -2803,18 +2792,6 @@ void SkCanvas::drawPoint(SkScalar x, SkScalar y, const SkPaint& paint) {
     this->drawPoints(kPoints_PointMode, 1, &pt, paint);
 }
 
-#ifdef SK_SUPPORT_LEGACY_CANVAS_HELPERS
-void SkCanvas::drawPoint(SkScalar x, SkScalar y, SkColor color) {
-    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPoint(SkColor)");
-    SkPoint pt;
-    SkPaint paint;
-
-    pt.set(x, y);
-    paint.setColor(color);
-    this->drawPoints(kPoints_PointMode, 1, &pt, paint);
-}
-#endif
-
 void SkCanvas::drawLine(SkScalar x0, SkScalar y0, SkScalar x1, SkScalar y1, const SkPaint& paint) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawLine()");
     SkPoint pts[2];
@@ -2824,18 +2801,6 @@ void SkCanvas::drawLine(SkScalar x0, SkScalar y0, SkScalar x1, SkScalar y1, cons
     this->drawPoints(kLines_PointMode, 2, pts, paint);
 }
 
-#ifdef SK_SUPPORT_LEGACY_CANVAS_HELPERS
-void SkCanvas::drawRectCoords(SkScalar left, SkScalar top,
-                              SkScalar right, SkScalar bottom,
-                              const SkPaint& paint) {
-    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRectCoords()");
-    SkRect  r;
-
-    r.set(left, top, right, bottom);
-    this->drawRect(r, paint);
-}
-#endif
-
 void SkCanvas::drawCircle(SkScalar cx, SkScalar cy, SkScalar radius, const SkPaint& paint) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawCircle()");
     if (radius < 0) {