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

src/core/SkPicture.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkPictureFlat.h"
@@ skipping 283 matching lines @@
     }
 
     // do this at the end, so that they will be zero if we hit an error.
     fWidth = info.fWidth;
     fHeight = info.fHeight;
     if (success) {
         *success = true;
     }
 }
 
-#define PREVENT_CHROME_BREAKAGE
-#ifdef PREVENT_CHROME_BREAKAGE
-// This block of code is to allow chromium to build until https://codereview.chromium.org/15496006/
-// is submitted. Then it will be reverted.
-#include "SkThread.h"
-
-static SkPicture::OldEncodeBitmap gOldEncodeBitmapFunction;
-
-SK_DECLARE_STATIC_MUTEX(gEncodeFunctionMutex);
-
-static SkData* encode_from_old_encoder(size_t* pixelRefOffset, const SkBitmap& bm) {
-    SkASSERT(gOldEncodeBitmapFunction != NULL);
-    SkDynamicMemoryWStream stream;
-    if (!gOldEncodeBitmapFunction(&stream, bm)) {
-        return NULL;
-    }
-    return stream.copyToData();
-}
-
-void SkPicture::serialize(SkWStream* stream, OldEncodeBitmap oldEncoder) const {
-    SkAutoMutexAcquire ac(gEncodeFunctionMutex);
-    gOldEncodeBitmapFunction = oldEncoder;
-    this->serialize(stream, &encode_from_old_encoder);
-    gOldEncodeBitmapFunction = NULL;
-}
-
-#endif // PREVENT_CHROME_BREAKAGE
-
 void SkPicture::serialize(SkWStream* stream, EncodeBitmap encoder) const {
     SkPicturePlayback* playback = fPlayback;
 
     if (NULL == playback && fRecord) {
         playback = SkNEW_ARGS(SkPicturePlayback, (*fRecord));
     }
 
     SkPictInfo info;
 
     info.fVersion = PICTURE_VERSION;
@@ skipping 21 matching lines @@
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void SkPicture::abortPlayback() {
     if (NULL == fPlayback) {
         return;
     }
     fPlayback->abort();
 }
 #endif