Fix print preview clipping issues due to scaling.

BUG=79941
TEST=none
Review URL: http://codereview.chromium.org/6879098

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83657 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 9 deletions

diff --git a/skia/ext/vector_platform_device_skia.cc b/skia/ext/vector_platform_device_skia.cc
index ba9a312..c480c89 100644
--- a/skia/ext/vector_platform_device_skia.cc
+++ b/skia/ext/vector_platform_device_skia.cc
@@ -25,7 +25,11 @@ SkDevice* VectorPlatformDeviceSkiaFactory::newDevice(SkCanvas* noUsed,
     initialTransform.setTranslate(0, height);
     initialTransform.preScale(1, -1);
   }
-  return new VectorPlatformDeviceSkia(width, height, initialTransform);
+  SkISize size = SkISize::Make(width, height);
+  SkRefPtr<SkPDFDevice> pdf_device =
+      new SkPDFDevice(size, size, initialTransform);
+  pdf_device->unref();  // SkRefPtr and new both took a reference.
+  return new VectorPlatformDeviceSkia(pdf_device.get());
 }
 
 static inline SkBitmap makeABitmap(int width, int height) {
@@ -34,11 +38,9 @@ static inline SkBitmap makeABitmap(int width, int height) {
   return bitmap;
 }
 
-VectorPlatformDeviceSkia::VectorPlatformDeviceSkia(
-    int width, int height, const SkMatrix& initialTransform)
-    : PlatformDevice(makeABitmap(width, height)),
-      pdf_device_(new SkPDFDevice(width, height, initialTransform)) {
-  pdf_device_->unref();  // SkRefPtr and new both took a reference.
+VectorPlatformDeviceSkia::VectorPlatformDeviceSkia(SkPDFDevice* pdf_device)
+    : PlatformDevice(makeABitmap(pdf_device->width(), pdf_device->height())),
+      pdf_device_(pdf_device) {
 }
 
 VectorPlatformDeviceSkia::~VectorPlatformDeviceSkia() {
diff --git a/skia/ext/vector_platform_device_skia.h b/skia/ext/vector_platform_device_skia.h
index dad129d..4fcd315d 100644
--- a/skia/ext/vector_platform_device_skia.h
+++ b/skia/ext/vector_platform_device_skia.h
@@ -31,9 +31,7 @@ class VectorPlatformDeviceSkiaFactory : public SkDeviceFactory {
 
 class VectorPlatformDeviceSkia : public PlatformDevice {
  public:
-  SK_API VectorPlatformDeviceSkia(int width,
-                                  int height,
-                                  const SkMatrix& initialTransform);
+  SK_API VectorPlatformDeviceSkia(SkPDFDevice* pdf_device);
   ~VectorPlatformDeviceSkia();
 
   SkPDFDevice* PdfDevice() { return pdf_device_.get(); }