hide discardable factory from public imagegenerator api

tests/ImageDecodingTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkDecodingImageGenerator.h"
 #include "SkDiscardableMemoryPool.h"
 #include "SkForceLinking.h"
 #include "SkGradientShader.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
-#include "SkImageGenerator.h"
+#include "SkImageGeneratorPriv.h"
 #include "SkImagePriv.h"
 #include "SkOSFile.h"
 #include "SkPoint.h"
 #include "SkShader.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "Test.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
@@ skipping 418 matching lines @@
         0xa7, 0xf3, 0xa3, 0xbd, 0x83, 0x8b, 0x2a, 0xc8, 0x58, 0xf5, 0xac, 0x80,
         0xe3, 0xfe, 0x66, 0xa4, 0x7c, 0x1b, 0x6c, 0xd1, 0xa9, 0xd8, 0x14, 0xd0,
         0xc5, 0xb5, 0x39, 0x71, 0x97, 0x19, 0x19, 0x1b
     };
     SkAutoDataUnref encoded(SkData::NewWithCopy(encodedWebP,
                                                 sizeof(encodedWebP)));
     SkBitmap bm;
 
     bool success = SkInstallDiscardablePixelRef(
         SkDecodingImageGenerator::Create(encoded,
-            SkDecodingImageGenerator::Options()), &bm, NULL);
+            SkDecodingImageGenerator::Options()), &bm);
 
     REPORTER_ASSERT(reporter, success);
     if (!success) {
         return;
     }
     SkAutoLockPixels alp(bm);
 
     bool rightSize = ((kExpectedWidth == bm.width())
                       && (kExpectedHeight == bm.height()));
     REPORTER_ASSERT(reporter, rightSize);
     if (rightSize) {
         bool error = false;
         const SkColor* correctPixel = kExpectedPixels;
         for (int y = 0; y < bm.height(); ++y) {
             for (int x = 0; x < bm.width(); ++x) {
                 error |= (*correctPixel != bm.getColor(x, y));
                 ++correctPixel;
             }
         }
         REPORTER_ASSERT(reporter, !error);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // example of how Android will do this inside their BitmapFactory
 static SkPixelRef* install_pixel_ref(SkBitmap* bitmap,

[scroggo, 2014/05/23 19:30:30]

This function shows how Android is supposed to replace SkImageRef.

Right now, it depends on passing an SkDiscardableMemory::Factory to
SkInstallDiscardablePixelRef.

My understand is that Derek does *not* want Android depending on anything inside
src (which fits with my idea of a private header file). Since you've moved the
version that takes a factory into src, how is Android supposed to call it?

[scroggo, 2014/05/23 19:57:12]

Hal has a fix in https://codereview.chromium.org/293283002/

[hal.canary, 2014/05/27 13:33:53]

Which has landed, so you can rebase.

                                      SkStreamRewindable* stream,
                                      int sampleSize, bool ditherImage) {
     SkASSERT(bitmap != NULL);
     SkASSERT(stream != NULL);
     SkASSERT(stream->rewind());
     SkASSERT(stream->unique());
     SkColorType colorType = bitmap->colorType();
     SkDecodingImageGenerator::Options opts(sampleSize, ditherImage, colorType);
     SkAutoTDelete<SkImageGenerator> gen(
         SkDecodingImageGenerator::Create(stream, opts));
@@ skipping 91 matching lines @@
                          SkData* encodedData,
                          bool useData,
                          const SkString& path) {
     SkBitmap bm;
     bool success = false;
     if (useData) {
         if (NULL == encodedData) {
             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
             && (kARGB_4444_SkColorType == opts.fRequestedColorType)) {
             return;  // Ignore known conversion inabilities.
         }
         // If we get here, it's a failure and we will need more
         // information about why it failed.
         ERRORF(reporter, "Bounds decode failed [sampleSize=%d dither=%s "
                "colorType=%s %s]", opts.fSampleSize, yn(opts.fDitherImage),
@@ skipping 115 matching lines @@
                     }
                     SkDecodingImageGenerator::Options options(scaleList[i],
                                                               ditherList[j]);
                     test_options(reporter, options, encodedStream, encodedData,
                                  useDataList[m], path);
                 }
             }
         }
     }
 }