commit f252f64f17efddf7235682a96d155d7c86c898e3
author reed <reed@chromium.org> Sat Jun 14 04:24:56 2014 -0700
committer Commit bot <commit-bot@chromium.org> Sat Jun 14 04:24:57 2014 -0700
tree 2e840b4d3030b9163c908bb710bb91b0893bd99f
parent 937fdeb8a2c1fde03ffd6df40a673692fd69e768

hide virtuals on device for width/height/isopaque

R=bsalomon@google.com
NOTREECHECKS=True

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/334993002

src/core/SkDevice.cpp

diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 6c5c0f3..6a09c0b 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -49,9 +49,8 @@
     return *fMetaData;
 }
 
-// TODO: should make this guy pure-virtual.
 SkImageInfo SkBaseDevice::imageInfo() const {
-    return SkImageInfo::MakeUnknown(this->width(), this->height());
+    return SkImageInfo::MakeUnknown();
 }
 
 const SkBitmap& SkBaseDevice::accessBitmap(bool changePixels) {

src/gpu/GrPictureUtils.cpp

diff --git a/src/gpu/GrPictureUtils.cpp b/src/gpu/GrPictureUtils.cpp
index 77113ad..6fed2f6 100644
--- a/src/gpu/GrPictureUtils.cpp
+++ b/src/gpu/GrPictureUtils.cpp
@@ -48,9 +48,6 @@
 
     virtual ~GrGatherDevice() { }
 
-    virtual int width() const SK_OVERRIDE { return fInfo.fSize.width(); }
-    virtual int height() const SK_OVERRIDE { return fInfo.fSize.height(); }
-    virtual bool isOpaque() const SK_OVERRIDE { return false; }
     virtual SkImageInfo imageInfo() const SK_OVERRIDE {
         return fEmptyBitmap.info();
     }

src/utils/SkDeferredCanvas.cpp

diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index ea7d71e..641974b 100644
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -157,9 +157,6 @@
     void setMaxRecordingStorage(size_t);
     void recordedDrawCommand();
 
-    virtual int width() const SK_OVERRIDE;
-    virtual int height() const SK_OVERRIDE;
-    virtual bool isOpaque() const SK_OVERRIDE;
     virtual SkImageInfo imageInfo() const SK_OVERRIDE;
 
     virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE;
@@ -426,18 +423,6 @@
     return fSurface ? fSurface->newImageSnapshot() : NULL;
 }
 
-int SkDeferredDevice::width() const {
-    return immediateDevice()->width();
-}
-
-int SkDeferredDevice::height() const {
-    return immediateDevice()->height();
-}
-
-bool SkDeferredDevice::isOpaque() const {
-    return immediateDevice()->isOpaque();
-}
-
 SkImageInfo SkDeferredDevice::imageInfo() const {
     return immediateDevice()->imageInfo();
 }

src/utils/SkGatherPixelRefsAndRects.h

diff --git a/src/utils/SkGatherPixelRefsAndRects.h b/src/utils/SkGatherPixelRefsAndRects.h
index bd6f2e5..df3651e 100644
--- a/src/utils/SkGatherPixelRefsAndRects.h
+++ b/src/utils/SkGatherPixelRefsAndRects.h
@@ -35,9 +35,6 @@
         SkSafeUnref(fPRCont);
     }
 
-    virtual int width() const SK_OVERRIDE { return fSize.width(); }
-    virtual int height() const SK_OVERRIDE { return fSize.height(); }
-    virtual bool isOpaque() const SK_OVERRIDE { return false; }
     virtual SkImageInfo imageInfo() const SK_OVERRIDE {
         return fEmptyBitmap.info();
     }

src/utils/SkPictureUtils.cpp

diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp
index 46a0660..702a78d 100644
--- a/src/utils/SkPictureUtils.cpp
+++ b/src/utils/SkPictureUtils.cpp
@@ -58,9 +58,9 @@
         fPRSet = prset;
     }
 
-    virtual int width() const SK_OVERRIDE { return fSize.width(); }
-    virtual int height() const SK_OVERRIDE { return fSize.height(); }
-    virtual bool isOpaque() const SK_OVERRIDE { return false; }
+    virtual SkImageInfo imageInfo() const SK_OVERRIDE {
+        return SkImageInfo::MakeUnknown(fSize.width(), fSize.height());
+    }
     virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; }
     virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) SK_OVERRIDE {
         return false;