change offset to xy for pixelref subsetting

gm/gmmain.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.
  */
 
 /*
  * Code for the "gm" (Golden Master) rendering comparison tool.
  *
@@ skipping 993 matching lines @@
             recordFlags |= SkPicture::kOptimizeForClippedPlayback_RecordingFlag;
         }
         SkCanvas* cv = pict->beginRecording(width, height, recordFlags);
         cv->scale(scale, scale);
         invokeGM(gm, cv, false, false);
         pict->endRecording();
 
         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);
         SkAutoTUnref<SkStreamAsset> pictReadback(storage.detachAsStream());
         SkPicture* retval = SkPicture::CreateFromStream(pictReadback,
                                                         &SkImageDecoder::DecodeMemory);
         return retval;
     }
 
     // Test: draw into a bitmap or pdf.
     // Depending on flags, possibly compare to an expected image.
     // If writePath is not NULL, also write images (or documents) to the specified path.
     ErrorCombination test_drawing(GM* gm, const ConfigData& gRec,
@@ skipping 428 matching lines @@
 // or probably more readable would be to replace it with a set of a few predicates
 // Like --prerotate 100 200 10 --posttranslate 10, 10
 // Probably define spacial names like centerx, centery, top, bottom, left, right
 // then we can write something reabable like --rotate centerx centery 90
 DEFINE_bool(forcePerspectiveMatrix, false, "Force a perspective matrix.");
 DEFINE_bool(useDocumentInsteadOfDevice, false, "Use SkDocument::CreateFoo instead of SkFooDevice.");
 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;
 
     SkBitmap bm = bitmap;
 #if defined(SK_BUILD_FOR_MAC)
     // Workaround bug #1043 where bitmaps with referenced pixels cause
     // CGImageDestinationFinalize to crash
     SkBitmap copy;
     bitmap.deepCopyTo(&copy, bitmap.config());
     bm = copy;
 #endif
 
     SkPixelRef* pr = bm.pixelRef();
     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);
 }
 
 static int findConfig(const char config[]) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) {
         if (!strcmp(config, gRec[i].fName)) {
             return (int) i;
         }
@@ skipping 865 matching lines @@
     if (FLAGS_forceBWtext) {
         canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
     }
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif