change offset to xy for pixelref subsetting

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 0e43c554c69829cd186c9ca723fd24e6d4e60cd9..e4c1c301102124233ca8e2395cd034e2ab2fc498 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1011,21 +1011,9 @@ public:
         return pict;
     }
 
-    static SkData* bitmap_encoder(size_t* pixelRefOffset, const SkBitmap& bm) {
-        SkPixelRef* pr = bm.pixelRef();
-        if (pr != NULL) {
-            SkData* data = pr->refEncodedData();
-            if (data != NULL) {
-                *pixelRefOffset = bm.pixelRefOffset();
-                return data;
-            }
-        }
-        return NULL;
-    }
-
     static SkPicture* stream_to_new_picture(const SkPicture& src) {
         SkDynamicMemoryWStream storage;
-        src.serialize(&storage, &bitmap_encoder);
+        src.serialize(&storage, NULL);

[scroggo, 2014/01/07 22:11:33]

Is this just temporary? If so, can you add a comment?

This probably makes little difference, actually, since I think it will only
affect gm/factory.cpp (I think that's the only one to use an SkPixelRef that
overrides onRefEncodedData)

[reed1, 2014/01/07 22:37:59]

Are you looking for the following:

// we don't want to encode images during serialzation, so we pass null.

I can, though not sure that we have such a comment when we want "default"
behavior in other places.

[scroggo, 2014/01/08 13:31:39]

Oh, no, I didn't realize that was the desired behavior. I thought you were
planning to use a new function once we had a new signature. No comment is
necessary for the default behavior.

         SkAutoTUnref<SkStreamAsset> pictReadback(storage.detachAsStream());
         SkPicture* retval = SkPicture::CreateFromStream(pictReadback,
                                                         &SkImageDecoder::DecodeMemory);
@@ -1474,7 +1462,7 @@ DEFINE_int32(pdfRasterDpi, 72, "Scale at which at which the non suported "
              "features in PDF are rasterized. Must be be in range 0-10000. "
              "Default is 72. N = 0 will disable rasterizing features like "
              "text shadows or perspective bitmaps.");
-static SkData* encode_to_dct_data(size_t* pixelRefOffset, const SkBitmap& bitmap) {
+static SkData* encode_to_dct_data(size_t*, const SkBitmap& bitmap) {
     // Filter output of warnings that JPEG is not available for the image.
     if (bitmap.width() >= 65500 || bitmap.height() >= 65500) return NULL;
     if (FLAGS_pdfJpegQuality == -1) return NULL;
@@ -1492,12 +1480,10 @@ static SkData* encode_to_dct_data(size_t* pixelRefOffset, const SkBitmap& bitmap
     if (pr != NULL) {
         SkData* data = pr->refEncodedData();
         if (data != NULL) {
-            *pixelRefOffset = bm.pixelRefOffset();
             return data;
         }
     }
 
-    *pixelRefOffset = 0;
     return SkImageEncoder::EncodeData(bm,
                                       SkImageEncoder::kJPEG_Type,
                                       FLAGS_pdfJpegQuality);