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

src/pdf/SkPDFShader.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.
  */
 
 
 #include "SkPDFShader.h"
 
-#include "SkCanvas.h"
+#include "SkCanvasSimplifier.h"
 #include "SkData.h"
 #include "SkPDFCatalog.h"
 #include "SkPDFDevice.h"
 #include "SkPDFFormXObject.h"
 #include "SkPDFGraphicState.h"
 #include "SkPDFResourceDict.h"
 #include "SkPDFUtils.h"
 #include "SkScalar.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
@@ skipping 840 matching lines @@
     if (tileModes[0] != SkShader::kClamp_TileMode ||
             tileModes[1] != SkShader::kClamp_TileMode) {
         deviceBounds.join(bitmapBounds);
     }
 
     SkMatrix unflip;
     unflip.setTranslate(0, SkScalarRoundToScalar(deviceBounds.height()));
     unflip.preScale(SK_Scalar1, -SK_Scalar1);
     SkISize size = SkISize::Make(SkScalarRound(deviceBounds.width()),
                                  SkScalarRound(deviceBounds.height()));
+    // TODO(edisonn): should we pass here the DCT encoder of the destination device?

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

I would say so.

     SkPDFDevice pattern(size, size, unflip);
-    SkCanvas canvas(&pattern);
+    SkCanvasSimplifier canvas(&pattern);

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

This doesn't help you here.  I think this method will require explicit support
for perspective.  Calculation of the bbox needs to take the perspective into
consideration.

If you look below, canvas is used only with affine transforms - there's no way
that the canvas will see perspective transforms.  Above on line 844/5 is where a
perspective transform might come into the picture, but right now it would just
be passed through to the FormXObject matrix property and won't be handled
properly.

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

Done.

[vandebo (ex-Chrome), 2013/10/07 22:34:10]

Done? how so?

[edisonn, 2013/10/08 17:55:30]

Sorry, is being done in another CL, as it is not related to this work item. I
will leave the comment though, by the time I will check it in.

 
     SkRect patternBBox;
     image->getBounds(&patternBBox);
 
     // Translate the canvas so that the bitmap origin is at (0, 0).
     canvas.translate(-deviceBounds.left(), -deviceBounds.top());
     patternBBox.offset(-deviceBounds.left(), -deviceBounds.top());
     // Undo the translation in the final matrix
     finalMatrix.preTranslate(deviceBounds.left(), deviceBounds.top());
 
@@ skipping 332 matching lines @@
     return false;
 }
 
 void SkPDFShader::State::AllocateGradientInfoStorage() {
     fColorData.set(sk_malloc_throw(
                fInfo.fColorCount * (sizeof(SkColor) + sizeof(SkScalar))));
     fInfo.fColors = reinterpret_cast<SkColor*>(fColorData.get());
     fInfo.fColorOffsets =
             reinterpret_cast<SkScalar*>(fInfo.fColors + fInfo.fColorCount);
 }