Revert "Patch to prevent chromium breakage until the DEPS."

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 171 matching lines @@
      */
     typedef SkData* (*EncodeBitmap)(size_t* pixelRefOffset, const SkBitmap& bm);
 
     /**
      *  Serialize to a stream. If non NULL, encoder will be used to encode
      *  any bitmaps in the picture.
      *  encoder will never be called with a NULL pixelRefOffset.
      */
     void serialize(SkWStream*, EncodeBitmap encoder = NULL) const;
 
-    /**
-     *  @Deprecated
-     *  Old version of EncodeBitmap, here to prevent chrome tree from going
-     *  red. Will be removed once chrome is switched to the new version.
-     */
-    typedef bool (*OldEncodeBitmap)(SkWStream*, const SkBitmap&);
-
-    /**
-     *  @Deprecated
-     *  Old version of serialize, taking the old version of EncodeBitmap,
-     *  to keep the chrome build green. Will be removed once chrome is
-     *  switched to the new version.
-     */
-    void serialize(SkWStream*, OldEncodeBitmap) const;
-
 #ifdef SK_BUILD_FOR_ANDROID
     /** Signals that the caller is prematurely done replaying the drawing
         commands. This can be called from a canvas virtual while the picture
         is drawing. Has no effect if the picture is not drawing.
         @deprecated preserving for legacy purposes
     */
     void abortPlayback();
 #endif
 
 protected:
@@ skipping 62 matching lines @@
  */
 class SK_API SkDrawPictureCallback {
 public:
     SkDrawPictureCallback() {}
     virtual ~SkDrawPictureCallback() {}
 
     virtual bool abortDrawing() = 0;
 };
 
 #endif