commit 2d970b5128f7270cd01a93e4ce68d0c3ea67ac71
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 27 14:14:22 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 27 14:14:22 2014 +0000
tree 2592f202dfb36d05e42004ecdb237ddd4471ef9e
parent 851155c28e18e3f5b702ef15ee7bfb12f3cbacda

hide discardable factory from public imagegenerator api

BUG=skia:
R=halcanary@google.com, scroggo@google.com, djsollen@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/295243006

git-svn-id: http://skia.googlecode.com/svn/trunk@14889 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/CachedDecodingPixelRefTest.cpp

diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index 705f066..10e33ba 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -12,6 +12,7 @@
 #include "SkDecodingImageGenerator.h"
 #include "SkDiscardableMemoryPool.h"
 #include "SkImageDecoder.h"
+#include "SkImageGeneratorPriv.h"
 #include "SkScaledImageCache.h"
 #include "SkStream.h"
 #include "SkUtils.h"
@@ -152,7 +153,7 @@
     // Use system-default discardable memory.
     return SkInstallDiscardablePixelRef(
         SkDecodingImageGenerator::Create(
-            encoded, SkDecodingImageGenerator::Options()), dst, NULL);
+            encoded, SkDecodingImageGenerator::Options()), dst);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -276,7 +277,7 @@
     SkBitmap bm;
     SkImageGenerator* ig = new TestImageGenerator(
         TestImageGenerator::kSucceedGetPixels_TestType, reporter);
-    SkInstallDiscardablePixelRef(ig, &bm, NULL);
+    SkInstallDiscardablePixelRef(ig, &bm);
     bm.pixelRef()->lockPixels();
 }
 

tests/DrawBitmapRectTest.cpp

diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index e6cc781..f294ae7 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -9,7 +9,7 @@
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDiscardableMemoryPool.h"
-#include "SkImageGenerator.h"
+#include "SkImageGeneratorPriv.h"
 #include "SkMatrixUtils.h"
 #include "SkPaint.h"
 #include "SkRandom.h"

tests/ImageDecodingTest.cpp

diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index 7f9ff30..21c7747 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -16,7 +16,7 @@
 #include "SkGradientShader.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
-#include "SkImageGenerator.h"
+#include "SkImageGeneratorPriv.h"
 #include "SkImagePriv.h"
 #include "SkOSFile.h"
 #include "SkPoint.h"
@@ -455,7 +455,7 @@
 
     bool success = SkInstallDiscardablePixelRef(
         SkDecodingImageGenerator::Create(encoded,
-            SkDecodingImageGenerator::Options()), &bm, NULL);
+            SkDecodingImageGenerator::Options()), &bm);
 
     REPORTER_ASSERT(reporter, success);
     if (!success) {
@@ -584,14 +584,13 @@
             return;
         }
         success = SkInstallDiscardablePixelRef(
-            SkDecodingImageGenerator::Create(encodedData, opts), &bm, NULL);
+            SkDecodingImageGenerator::Create(encodedData, opts), &bm);
     } else {
         if (NULL == encodedStream) {
             return;
         }
         success = SkInstallDiscardablePixelRef(
-            SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts),
-            &bm, NULL);
+            SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts), &bm);
     }
     if (!success) {
         if (opts.fUseRequestedColorType

tests/PictureTest.cpp

diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 8467d6a..ac44a5c 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1113,7 +1113,7 @@
 
     SkBitmap bm;
     bool installSuccess = SkInstallDiscardablePixelRef(
-         SkDecodingImageGenerator::Create(data, SkDecodingImageGenerator::Options()), &bm, NULL);
+         SkDecodingImageGenerator::Create(data, SkDecodingImageGenerator::Options()), &bm);
     REPORTER_ASSERT(reporter, installSuccess);
 
     // Write both bitmaps to pictures, and ensure that the resulting data streams are the same.