Update the SkDocument interface to allow for 1) abort won't emit pdf, 2) close can report success/f…

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 "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 565 matching lines @@
             installFilter(&canvas);
             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);
+        SkISize pageISize = gm->getISize();
+        SkSize pageSize = SkSize::Make(SkIntToScalar(pageISize.width()), SkIntToScalar(pageISize.height()));
+        SkAutoTUnref<SkDocument> pdfDoc(SkDocument::CreatePDF(&pdf, NULL, encode_to_dct_stream));
+        SkCanvas* canvas = NULL;
+        canvas = pdfDoc->beginPage(pageSize);
+        canvas->setMatrix(initialTransform);

[vandebo (ex-Chrome), 2013/09/27 15:50:17]

Until the old constructor is removed, I think it's best to use the old code
path. There's explicit gm support for initialtranforms because there were bugs
that only showed up with a non-default initialtranform and there are now tests
verifying that doesn't regress. Yes, you are going to remove it, but until then,
It's probably best to keep the test coverage.

[edisonn, 2013/10/04 19:40:37]

Now SkPDFDeviceFlatenable will call the old constructor

[vandebo (ex-Chrome), 2013/10/08 23:37:06]

It doesn't.

[edisonn, 2013/10/09 13:25:55]

Correct, I do not pass now the initialTransform.

But, if there were bugs, we should have had test cases for them, instead of
relying on gms that can actually change without pdf's control. Do you have at
least a list of gms that hit those interesting bugs?

Another option, is to pseudo-randomly use one or the other, so we cover both. I
am not sure what the best course is in this case, as both should be tested

[vandebo (ex-Chrome), 2013/10/09 16:52:32]

I added a gm (and the ability for the gm to specify the initial transform) when
fixing the bug.  The gm is the test.  Grepping for usage, it's 
shaderbounds_linear in shaderbounds.cpp.
A fast, but dirty way to make progress is to use the old code path if there is
an initial transform specified by the gm - that's only one gm right now.  All of
the initial transform code can eventually be removed when Blink is made to work
without it.

If that doesn't work for you, call me and we'll hash it out.

[edisonn, 2013/10/10 18:35:15]

added a new flag to specify if SkDocument will be used. It will be enabled in
android gms for example, while in the rest of gms we will use old way

 
-        SkCanvas c(dev);
-        invokeGM(gm, &c, true, false);
+        invokeGM(gm, canvas, true, false);
 
-        SkPDFDocument doc;
-        doc.appendPage(dev);
-        doc.emitPDF(&pdf);
+        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