commit 9f61f40ffa9460db13280f83b6cf8b801ab99ef7
author Hal Canary <halcanary@google.com> Mon Sep 10 15:06:24 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 11 15:26:22 2018 +0000
tree eadbb1a5e5fc29fd68507a10731f9bb914d1cdde
parent 2473d947204985023240fe465beb64f3eeea11cd

SkPDF:  Device subclass no longer tracks size.

Change-Id: I13ad631a80d3ca2f4ad5bb2db21d670444650b0f
Reviewed-on: https://skia-review.googlesource.com/153140
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

src/pdf/SkPDFDevice.cpp

diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index f321284..eaf75e1 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -549,7 +549,6 @@
 SkPDFDevice::SkPDFDevice(SkISize pageSize, SkPDFDocument* doc)
     : INHERITED(SkImageInfo::MakeUnknown(pageSize.width(), pageSize.height()),
                 SkSurfaceProps(0, kUnknown_SkPixelGeometry))
-    , fPageSize(pageSize)
     , fInitialTransform(SkMatrix::I())
     , fDocument(doc)
 {
@@ -563,7 +562,7 @@
     // don't do it when layering.
     SkScalar rasterScale = SkPDFUtils::kDpiForRasterScaleOne / fDocument->rasterDpi();
     fInitialTransform.setConcat(SkMatrix::MakeScale(rasterScale, -rasterScale),
-                                SkMatrix::MakeTrans(0, -fPageSize.fHeight));
+                                SkMatrix::MakeTrans(0, -this->height()));
 }
 
 SkPDFDevice::~SkPDFDevice() = default;
@@ -636,7 +635,7 @@
     if (!contentEntry) {
         return;
     }
-    SkRect bbox = SkRect::Make(fPageSize);
+    SkRect bbox = SkRect::Make(this->imageInfo().dimensions());
     SkMatrix inverse;
     if (!contentEntry->fState.fMatrix.invert(&inverse)) {
         return;
@@ -1474,8 +1473,8 @@
     mediaBox->reserve(4);
     mediaBox->appendInt(0);
     mediaBox->appendInt(0);
-    mediaBox->appendInt(fPageSize.width());
-    mediaBox->appendInt(fPageSize.height());
+    mediaBox->appendInt(this->width());
+    mediaBox->appendInt(this->height());
     return mediaBox;
 }
 
@@ -2045,7 +2044,7 @@
             return;
         }
         this->addSMaskGraphicState(std::move(maskDevice), content.stream());
-        SkPDFUtils::AppendRectangle(SkRect::Make(fPageSize), content.stream());
+        SkPDFUtils::AppendRectangle(SkRect::Make(this->imageInfo().dimensions()), content.stream());
         SkPDFUtils::PaintPath(SkPaint::kFill_Style, SkPath::kWinding_FillType, content.stream());
         this->clearMaskOnGraphicState(content.stream());
         return;

src/pdf/SkPDFDevice.h

diff --git a/src/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h
index 3ae04de..d02c671 100644
--- a/src/pdf/SkPDFDevice.h
+++ b/src/pdf/SkPDFDevice.h
@@ -62,7 +62,7 @@
     void setFlip();
 
     sk_sp<SkPDFDevice> makeCongruentDevice() {
-        return sk_make_sp<SkPDFDevice>(fPageSize, fDocument);
+        return sk_make_sp<SkPDFDevice>(this->imageInfo().dimensions(), fDocument);
     }
 
     ~SkPDFDevice() override;
@@ -176,7 +176,6 @@
     // order to get the right access levels without using friend.
     friend class ScopedContentEntry;
 
-    SkISize fPageSize;
     SkMatrix fInitialTransform;
     SkClipStack fExistingClipStack;