Hide SkMallocPixelRef class befind SkPixelRef factory functions.

src/core/SkMallocPixelRef.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMallocPixelRef.h"
 #include "SkBitmap.h"
 #include "SkReadBuffer.h"
@@ skipping 31 matching lines @@
                                               void* addr,
                                               size_t rowBytes,
                                               SkColorTable* ctable) {
     if (!is_valid(info, ctable)) {
         return NULL;
     }
     return SkNEW_ARGS(SkMallocPixelRef,
                       (info, addr, rowBytes, ctable, NULL, NULL));
 }
 
+
+SkPixelRef* SkPixelRef::NewPrelockedAllocate(
+        const SkImageInfo& info,
+        size_t rowBytes,
+        SkColorTable* ctable) {
+    return SkMallocPixelRef::NewAllocate(info, rowBytes, ctable);
+}
+
 SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,
                                                 size_t requestedRowBytes,
                                                 SkColorTable* ctable) {
     if (!is_valid(info, ctable)) {
         return NULL;
     }
 
     int32_t minRB = SkToS32(info.minRowBytes());
     if (minRB < 0) {
         return NULL;    // allocation will be too large
@@ skipping 19 matching lines @@
     void* addr = sk_malloc_flags(size, 0);
     if (NULL == addr) {
         return NULL;
     }
 
     return SkNEW_ARGS(SkMallocPixelRef,
                       (info, addr, rowBytes, ctable,
                        sk_free_releaseproc, NULL));
 }
 
+SkPixelRef* SkPixelRef::NewPrelockedDirectWithProc(
+        const SkImageInfo& info,
+        size_t rowBytes,
+        SkColorTable* ctable,
+        void* addr,
+        void (*releaseProc)(void* addr, void* context),
+        void* releaseProcContext) {
+    return SkMallocPixelRef::NewWithProc(
+            info, rowBytes, ctable, addr, releaseProc, releaseProcContext);
+}
+
 SkMallocPixelRef* SkMallocPixelRef::NewWithProc(const SkImageInfo& info,
                                                 size_t rowBytes,
                                                 SkColorTable* ctable,
                                                 void* addr,
                                                 SkMallocPixelRef::ReleaseProc proc,
                                                 void* context) {
     if (!is_valid(info, ctable)) {
         return NULL;
     }
     return SkNEW_ARGS(SkMallocPixelRef,
                       (info, addr, rowBytes, ctable, proc, context));
 }
 
 static void sk_data_releaseproc(void*, void* dataPtr) {
     (static_cast<SkData*>(dataPtr))->unref();
 }
 
+SkPixelRef* SkPixelRef::NewPrelockedWithData(
+        const SkImageInfo& info,
+        size_t rowBytes,
+        SkColorTable* ctable,
+        SkData* data,
+        size_t offset) {
+    return SkMallocPixelRef::NewWithData(info, rowBytes, ctable, data, offset);
+}
+
 SkMallocPixelRef* SkMallocPixelRef::NewWithData(const SkImageInfo& info,
                                                 size_t rowBytes,
                                                 SkColorTable* ctable,
                                                 SkData* data,
                                                 size_t offset) {
     SkASSERT(data != NULL);
     SkASSERT(offset <= data->size());
     if (!is_valid(info, ctable)) {
         return NULL;
     }
@@ skipping 121 matching lines @@
 
     this->setPreLocked(fStorage, fRB, fCTable);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info,
                                                 SkColorTable* ctable) {
     return SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), ctable);
 }