rebaseline drawbitmap gms

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.
  *
  * If you make changes to this, re-run the self-tests at gm/tests/run.sh
  * to make sure they still pass... you may need to change the expected
  * results of the self-test.
  */
 
 #include "gm.h"
 #include "gm_error.h"
 #include "gm_expectations.h"
 #include "system_preferences.h"
 #include "SkBitmap.h"
+#include "SkCanvasSimplifier.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkDeferredCanvas.h"
 #include "SkDevice.h"
+#include "SkDocument.h"
 #include "SkDrawFilter.h"
 #include "SkForceLinking.h"
 #include "SkGPipe.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPDFRasterizer.h"
 #include "SkPicture.h"
 #include "SkRefCnt.h"
+#include "SkScalar.h"
 #include "SkStream.h"
 #include "SkTArray.h"
 #include "SkTDict.h"
 #include "SkTileGridPicture.h"
 #include "SamplePipeControllers.h"
 
 #ifdef SK_DEBUG
 static const bool kDebugOnly = true;
 #else
 static const bool kDebugOnly = false;
@@ skipping 566 matching lines @@
             canvas.scale(scale, scale);
             canvas.drawPicture(*pict);
             complete_bitmap(bitmap);
         }
     }
 
     static void generate_pdf(GM* gm, SkDynamicMemoryWStream& pdf) {
 #ifdef SK_SUPPORT_PDF
         SkMatrix initialTransform = gm->getInitialTransform();
         SkISize pageSize = gm->getISize();
-        SkPDFDevice* dev = NULL;
-        if (initialTransform.isIdentity()) {
-            dev = new SkPDFDevice(pageSize, pageSize, initialTransform);
-        } else {
-            SkRect content = SkRect::MakeWH(SkIntToScalar(pageSize.width()),
-                                            SkIntToScalar(pageSize.height()));
-            initialTransform.mapRect(&content);
-            content.intersect(0, 0, SkIntToScalar(pageSize.width()),
-                              SkIntToScalar(pageSize.height()));
-            SkISize contentSize =
-                SkISize::Make(SkScalarRoundToInt(content.width()),
-                              SkScalarRoundToInt(content.height()));
-            dev = new SkPDFDevice(pageSize, contentSize, initialTransform);
-        }
-        dev->setDCTEncoder(encode_to_dct_stream);
-        SkAutoUnref aur(dev);
+        SkSize pageSize2 = SkSize::Make(SkIntToScalar(pageSize.width()), SkIntToScalar(pageSize.height()));
+        SkAutoTUnref<SkDocument> pdfDoc(SkDocument::CreatePDF(&pdf, NULL));
+        SkCanvas* canvas = NULL;
+        canvas = pdfDoc->beginPage(pageSize2);
+        canvas->setMatrix(initialTransform);
 
-        SkCanvas c(dev);
-        invokeGM(gm, &c, true, false);
+        pdfDoc->setDCTEncoder(encode_to_dct_stream);
 
-        SkPDFDocument doc;
-        doc.appendPage(dev);
-        doc.emitPDF(&pdf);
+        invokeGM(gm, canvas, true, false);
+
+        pdfDoc->close();
 #endif
     }
 
     static void generate_xps(GM* gm, SkDynamicMemoryWStream& xps) {
 #ifdef SK_SUPPORT_XPS
         SkISize size = gm->getISize();
 
         SkSize trimSize = SkSize::Make(SkIntToScalar(size.width()),
                                        SkIntToScalar(size.height()));
         static const SkScalar inchesPerMeter = SkScalarDiv(10000, 254);
@@ skipping 1599 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