diff options
| author |  reed <reed@google.com> | 2016-08-20 07:59:19 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-20 07:59:19 -0700 |
| commit | 589a39eb81d25fa7af95e7366db17ac7a70a7d03 (patch) | |
| tree | f1f485df0476ca0af26475c924d35101b9160b6b /src/svg | |
| parent | e2348ccb477b97847cd147161a57fbbbfc8bba10 (diff) | |
store info in basedevice, change getter to non-virtual const&
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2261003003
Review-Url: https://codereview.chromium.org/2261003003
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/SkSVGDevice.cpp | 10 | ||||
| -rw-r--r-- | src/svg/SkSVGDevice.h | 3 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp index 4330901b7e..3ba721ee39 100644 --- a/src/svg/SkSVGDevice.cpp +++ b/src/svg/SkSVGDevice.cpp @@ -570,10 +570,11 @@ SkBaseDevice* SkSVGDevice::Create(const SkISize& size, SkXMLWriter* writer) { } SkSVGDevice::SkSVGDevice(const SkISize& size, SkXMLWriter* writer) - : INHERITED(SkSurfaceProps(0, kUnknown_SkPixelGeometry)) + : INHERITED(SkImageInfo::MakeUnknown(size.fWidth, size.fHeight), + SkSurfaceProps(0, kUnknown_SkPixelGeometry)) , fWriter(writer) , fResourceBucket(new ResourceBucket) - , fSize(size) { +{ SkASSERT(writer); fWriter->writeHeader(); @@ -590,11 +591,6 @@ SkSVGDevice::SkSVGDevice(const SkISize& size, SkXMLWriter* writer) SkSVGDevice::~SkSVGDevice() { } -SkImageInfo SkSVGDevice::imageInfo() const { - SkImageInfo info = SkImageInfo::MakeUnknown(fSize.fWidth, fSize.fHeight); - return info; -} - void SkSVGDevice::drawPaint(const SkDraw& draw, const SkPaint& paint) { AutoElement rect("rect", fWriter, fResourceBucket, draw, paint); rect.addRectAttributes(SkRect::MakeWH(SkIntToScalar(this->width()), diff --git a/src/svg/SkSVGDevice.h b/src/svg/SkSVGDevice.h index bf86e15c51..cb13ffdc8c 100644 --- a/src/svg/SkSVGDevice.h +++ b/src/svg/SkSVGDevice.h @@ -17,8 +17,6 @@ class SkSVGDevice : public SkBaseDevice { public: static SkBaseDevice* Create(const SkISize& size, SkXMLWriter* writer); - SkImageInfo imageInfo() const override; - protected: void drawPaint(const SkDraw&, const SkPaint& paint) override; void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, @@ -68,7 +66,6 @@ private: SkXMLWriter* fWriter; SkAutoTDelete<AutoElement> fRootElement; SkAutoTDelete<ResourceBucket> fResourceBucket; - SkISize fSize; typedef SkBaseDevice INHERITED; }; |