Remove SK_SUPPORT_LEGACY_DATA_FACTORIES.

include/core/SkData.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkData_DEFINED
 #define SkData_DEFINED
 
@@ skipping 49 matching lines @@
      *  length to the size of the data. If buffer is NULL, it is ignored, and
      *  only the computed number of bytes is returned.
      */
     size_t copyRange(size_t offset, size_t length, void* buffer) const;
 
     /**
      *  Returns true if these two objects have the same length and contents,
      *  effectively returning 0 == memcmp(...)
      */
     bool equals(const SkData* other) const;
-#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES
-    bool equals(sk_sp<const SkData>& other) const { return this->equals(other.get()); }
-#endif
 
     /**
      *  Function that, if provided, will be called when the SkData goes out
      *  of scope, allowing for custom allocation/freeing of the data's contents.
      */
     typedef void (*ReleaseProc)(const void* ptr, void* context);
 
     /**
      *  Create a new dataref by copying the specified data
      */
@@ skipping 70 matching lines @@
      *  src dataref.
      */
     static sk_sp<SkData> MakeSubset(const SkData* src, size_t offset, size_t length);
 
     /**
      *  Returns a new empty dataref (or a reference to a shared empty dataref).
      *  New or shared, the caller must see that unref() is eventually called.
      */
     static sk_sp<SkData> MakeEmpty();
 
-#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES
-    static SkData* NewWithCopy(const void* data, size_t length) {
-        return MakeWithCopy(data, length).release();
-    }
-    static SkData* NewUninitialized(size_t length) {
-        return MakeUninitialized(length).release();
-    }
-    static SkData* NewWithCString(const char cstr[]) {
-        return MakeWithCString(cstr).release();
-    }
-    static SkData* NewWithProc(const void* ptr, size_t length, ReleaseProc proc, void* context) {
-        return MakeWithProc(ptr, length, proc, context).release();
-    }
-    static SkData* NewWithoutCopy(const void* data, size_t length) {
-        return MakeWithoutCopy(data, length).release();
-    }
-    static SkData* NewFromMalloc(const void* data, size_t length) {
-        return MakeFromMalloc(data, length).release();
-    }
-    static SkData* NewFromFileName(const char path[]) { return MakeFromFileName(path).release(); }
-    static SkData* NewFromFILE(FILE* f) { return MakeFromFILE(f).release(); }
-    static SkData* NewFromFD(int fd) { return MakeFromFD(fd).release(); }
-    static SkData* NewFromStream(SkStream* stream, size_t size) {
-        return MakeFromStream(stream, size).release();
-    }
-    static SkData* NewSubset(const SkData* src, size_t offset, size_t length) {
-        return MakeSubset(src, offset, length).release();
-    }
-    static SkData* NewEmpty() { return MakeEmpty().release(); }
-#endif
-
 private:
     ReleaseProc fReleaseProc;
     void*       fReleaseProcContext;
     void*       fPtr;
     size_t      fSize;
 
     SkData(const void* ptr, size_t size, ReleaseProc, void* context);
     explicit SkData(size_t size);   // inplace new/delete
     virtual ~SkData();
 
@@ skipping 10 matching lines @@
     friend SkData* sk_new_empty_data();
 
     // shared internal factory
     static sk_sp<SkData> PrivateNewWithCopy(const void* srcOrNull, size_t length);
 
     static void DummyReleaseProc(const void*, void*); // {}
 
     typedef SkRefCnt INHERITED;
 };
 
-#ifdef SK_SUPPORT_LEGACY_DATA_FACTORIES
-/** Typedef of SkAutoTUnref<SkData> for automatically unref-ing a SkData. */
-typedef SkAutoTUnref<SkData> SkAutoDataUnref;
 #endif
-
-#endif