Remove legacy Picture defines.

include/core/SkPicture.h

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPicture_DEFINED
@@ skipping 96 matching lines @@
 
     /** Replays the drawing commands on the specified canvas. Note that
         this has the effect of unfurling this picture into the destination
         canvas. Using the SkCanvas::drawPicture entry point gives the destination
         canvas the option of just taking a ref.
         @param canvas the canvas receiving the drawing commands.
         @param callback a callback that allows interruption of playback
     */
     void playback(SkCanvas* canvas, SkDrawPictureCallback* = NULL) const;
 
-#ifdef SK_LEGACY_PICTURE_DRAW_API
-    void draw(SkCanvas* canvas, SkDrawPictureCallback* callback = NULL) const {
-        this->playback(canvas, callback);
-    }
-#endif
-
-#ifdef SK_LEGACY_PICTURE_SIZE_API
-    int width() const  { return fCullRect.roundOut().width(); }
-    int height() const { return fCullRect.roundOut().height(); }
-#endif
-
     /** Return the cull rect used when creating this picture: { 0, 0, cullWidth, cullHeight }.
         It does not necessarily reflect the bounds of what has been recorded into the picture.
         @return the cull rect used to create this picture
     */
     SkRect cullRect() const { return fCullRect; }
 
     /** Return a non-zero, unique value representing the picture.
      */
     uint32_t uniqueID() const { return fUniqueID; }
 
@@ skipping 178 matching lines @@
 
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class GrLayerHoister;               // access to fRecord
     friend class ReplaceDraw;
     friend class SkPictureUtils;
     friend class SkRecordedDrawable;
 };
 SK_COMPILE_ASSERT(sizeof(SkPicture) <= 96, SkPictureSize);
 
 #endif