Removal of redundant method, PlatformDevice::IsVectorial.

Callers should use SkDevice::getDeviceCapabilities() to determine if a device is vectorial.

BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/7077008

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

17 files changed, 22 insertions, 54 deletions

diff --git a/skia/ext/bitmap_platform_device_linux.cc b/skia/ext/bitmap_platform_device_linux.cc
index 5372c55..a32fafb 100644
--- a/skia/ext/bitmap_platform_device_linux.cc
+++ b/skia/ext/bitmap_platform_device_linux.cc
@@ -143,10 +143,6 @@ BitmapPlatformDevice::BitmapPlatformDevice(
 BitmapPlatformDevice::~BitmapPlatformDevice() {
 }
 
-bool BitmapPlatformDevice::IsVectorial() {
-  return false;
-}
-
 SkDeviceFactory* BitmapPlatformDevice::onNewDeviceFactory() {
   return SkNEW(BitmapPlatformDeviceFactory);
 }
diff --git a/skia/ext/bitmap_platform_device_linux.h b/skia/ext/bitmap_platform_device_linux.h
index 927bd43..edbd137 100644
--- a/skia/ext/bitmap_platform_device_linux.h
+++ b/skia/ext/bitmap_platform_device_linux.h
@@ -95,7 +95,6 @@ class BitmapPlatformDevice : public PlatformDevice {
                              const SkClipStack&);
 
   // Overridden from PlatformDevice:
-  virtual bool IsVectorial();
   virtual cairo_t* BeginPlatformPaint();
 
  protected:
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index 8276545..b15a042 100644
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -257,10 +257,6 @@ void BitmapPlatformDevice::DrawToNativeContext(CGContextRef context, int x,
     data_->ReleaseBitmapContext();
 }
 
-bool BitmapPlatformDevice::IsVectorial() {
-  return false;
-}
-
 void BitmapPlatformDevice::onAccessBitmap(SkBitmap*) {
   // Not needed in CoreGraphics
 }
diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h
index 565bbcf..67ef633 100644
--- a/skia/ext/bitmap_platform_device_mac.h
+++ b/skia/ext/bitmap_platform_device_mac.h
@@ -66,7 +66,6 @@ class BitmapPlatformDevice : public PlatformDevice {
   virtual void DrawToNativeContext(CGContextRef context, int x, int y,
                                    const CGRect* src_rect);
   virtual void MakeOpaque(int x, int y, int width, int height);
-  virtual bool IsVectorial();
 
   // SkDevice overrides
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index 7197d16..335bb94 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -77,7 +77,6 @@ class SK_API BitmapPlatformDevice : public PlatformDevice {
 
   virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect);
   virtual void MakeOpaque(int x, int y, int width, int height);
-  virtual bool IsVectorial() { return false; }
 
   // Loads the given transform and clipping region into the HDC. This is
   // overridden from SkDevice.
diff --git a/skia/ext/platform_device.cc b/skia/ext/platform_device.cc
index eff5d4f..a08f525 100644
--- a/skia/ext/platform_device.cc
+++ b/skia/ext/platform_device.cc
@@ -41,14 +41,6 @@ void EndPlatformPaint(SkDevice* device) {
     return platform_device->EndPlatformPaint();
 }
 
-bool IsVectorial(SkDevice* device) {
-  PlatformDevice* platform_device = GetPlatformDevice(device);
-  if (platform_device)
-    return platform_device->IsVectorial();
-
-  return device->getDeviceCapabilities() & SkDevice::kVector_Capability;
-}
-
 bool IsNativeFontRenderingAllowed(SkDevice* device) {
   PlatformDevice* platform_device = GetPlatformDevice(device);
   if (platform_device)
diff --git a/skia/ext/platform_device.h b/skia/ext/platform_device.h
index 4f876d9..d6683788 100644
--- a/skia/ext/platform_device.h
+++ b/skia/ext/platform_device.h
@@ -59,11 +59,6 @@ SK_API void SetPlatformDevice(SkDevice* device,
                               PlatformDevice* platform_device);
 SK_API PlatformDevice* GetPlatformDevice(SkDevice* device);
 
-// Returns if the preferred rendering engine is vectorial or bitmap based.
-// Forwards to PlatformDevice::IsVectorial, if a PlatformDevice is bound,
-// otherwise falls-back to the SkDevice::getDeviceCapabilities routine.
-SK_API bool IsVectorial(SkDevice* device);
-
 // Returns if the native font rendering engine is allowed to render text to
 // this device.
 SK_API bool IsNativeFontRenderingAllowed(SkDevice* device);
diff --git a/skia/ext/platform_device_linux.h b/skia/ext/platform_device_linux.h
index d10d795..51c292f 100644
--- a/skia/ext/platform_device_linux.h
+++ b/skia/ext/platform_device_linux.h
@@ -16,9 +16,6 @@ class PlatformDevice : public SkDevice {
  public:
   typedef cairo_t* PlatformSurface;
 
-  // Returns if the preferred rendering engine is vectorial or bitmap based.
-  virtual bool IsVectorial() = 0;
-
   // Returns if native platform APIs are allowed to render text to this device.
   virtual bool IsNativeFontRenderingAllowed();
 
diff --git a/skia/ext/platform_device_mac.h b/skia/ext/platform_device_mac.h
index 0aa8d9d..9c7551d 100644
--- a/skia/ext/platform_device_mac.h
+++ b/skia/ext/platform_device_mac.h
@@ -47,9 +47,6 @@ class PlatformDevice : public SkDevice {
   // Sets the opacity of each pixel in the specified region to be opaque.
   virtual void MakeOpaque(int x, int y, int width, int height) { }
 
-  // Returns if the preferred rendering engine is vectorial or bitmap based.
-  virtual bool IsVectorial() = 0;
-
   // Returns if native platform APIs are allowed to render text to this device.
   virtual bool IsNativeFontRenderingAllowed();
 
diff --git a/skia/ext/platform_device_win.h b/skia/ext/platform_device_win.h
index 2452fc2..a5445aa 100644
--- a/skia/ext/platform_device_win.h
+++ b/skia/ext/platform_device_win.h
@@ -49,9 +49,6 @@ class SK_API PlatformDevice : public SkDevice {
   // Sets the opacity of each pixel in the specified region to be opaque.
   virtual void MakeOpaque(int x, int y, int width, int height) { }
 
-  // Returns if the preferred rendering engine is vectorial or bitmap based.
-  virtual bool IsVectorial() = 0;
-
   // Returns if GDI is allowed to render text to this device.
   virtual bool IsNativeFontRenderingAllowed() { return true; }
 
diff --git a/skia/ext/vector_canvas.cc b/skia/ext/vector_canvas.cc
index dbf303f..980ca30 100644
--- a/skia/ext/vector_canvas.cc
+++ b/skia/ext/vector_canvas.cc
@@ -31,7 +31,8 @@ SkDrawFilter* VectorCanvas::setDrawFilter(SkDrawFilter* filter) {
 }
 
 bool VectorCanvas::IsTopDeviceVectorial() const {
-  return IsVectorial(GetTopDevice(*this));
+  SkDevice* device = GetTopDevice(*this);
+  return device->getDeviceCapabilities() & SkDevice::kVector_Capability;
 }
 
 }  // namespace skia
diff --git a/skia/ext/vector_platform_device_cairo_linux.cc b/skia/ext/vector_platform_device_cairo_linux.cc
index 10089b4..f804178 100644
--- a/skia/ext/vector_platform_device_cairo_linux.cc
+++ b/skia/ext/vector_platform_device_cairo_linux.cc
@@ -133,15 +133,15 @@ SkDeviceFactory* VectorPlatformDeviceCairo::onNewDeviceFactory() {
   return SkNEW(VectorPlatformDeviceCairoFactory);
 }
 
-bool VectorPlatformDeviceCairo::IsVectorial() {
-  return true;
-}
-
 PlatformDevice::PlatformSurface
 VectorPlatformDeviceCairo::BeginPlatformPaint() {
   return context_;
 }
 
+uint32_t VectorPlatformDeviceCairo::getDeviceCapabilities() {
+  return SkDevice::getDeviceCapabilities() | kVector_Capability;
+}
+
 void VectorPlatformDeviceCairo::drawBitmap(const SkDraw& draw,
                                            const SkBitmap& bitmap,
                                            const SkIRect* srcRectOrNull,
diff --git a/skia/ext/vector_platform_device_cairo_linux.h b/skia/ext/vector_platform_device_cairo_linux.h
index da7fbe1..6e5cbcd 100644
--- a/skia/ext/vector_platform_device_cairo_linux.h
+++ b/skia/ext/vector_platform_device_cairo_linux.h
@@ -43,7 +43,8 @@ class SK_API VectorPlatformDeviceCairo : public PlatformDevice {
   // this class.
   static void ClearFontCache();
 
-  // Overridden from PlatformDevice:
+  // Overridden from SkDevice
+  virtual uint32_t getDeviceCapabilities();
   virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) OVERRIDE;
   virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
                           size_t count, const SkPoint[],
@@ -79,8 +80,9 @@ class SK_API VectorPlatformDeviceCairo : public PlatformDevice {
 
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
                              const SkClipStack&);
+
+  // Overridden from PlatformDevice
   virtual PlatformSurface BeginPlatformPaint();
-  virtual bool IsVectorial();
 
  protected:
   explicit VectorPlatformDeviceCairo(PlatformSurface context,
diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc
index 8b181bf..6684913 100644
--- a/skia/ext/vector_platform_device_emf_win.cc
+++ b/skia/ext/vector_platform_device_emf_win.cc
@@ -123,6 +123,10 @@ HDC VectorPlatformDeviceEmf::BeginPlatformPaint() {
   return hdc_;
 }
 
+uint32_t VectorPlatformDeviceEmf::getDeviceCapabilities() {
+  return SkDevice::getDeviceCapabilities() | kVector_Capability;
+}
+
 void VectorPlatformDeviceEmf::drawPaint(const SkDraw& draw,
                                         const SkPaint& paint) {
   // TODO(maruel):  Bypass the current transformation matrix.
diff --git a/skia/ext/vector_platform_device_emf_win.h b/skia/ext/vector_platform_device_emf_win.h
index 1a27041..580f240 100644
--- a/skia/ext/vector_platform_device_emf_win.h
+++ b/skia/ext/vector_platform_device_emf_win.h
@@ -35,8 +35,12 @@ class VectorPlatformDeviceEmf : public PlatformDevice {
   VectorPlatformDeviceEmf(HDC dc, const SkBitmap& bitmap);
   virtual ~VectorPlatformDeviceEmf();
 
+  // PlatformDevice methods
   virtual PlatformSurface BeginPlatformPaint();
+  virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect);
 
+  // SkDevice methods.
+  virtual uint32_t getDeviceCapabilities();
   virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) OVERRIDE;
   virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
                           size_t count, const SkPoint[],
@@ -70,11 +74,8 @@ class VectorPlatformDeviceEmf : public PlatformDevice {
   virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
                           const SkPaint&) OVERRIDE;
 
-
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
                              const SkClipStack&);
-  virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect);
-  virtual bool IsVectorial() { return true; }
 
   void LoadClipRegion();
   bool alpha_blend_used() const { return alpha_blend_used_; }
diff --git a/skia/ext/vector_platform_device_skia.cc b/skia/ext/vector_platform_device_skia.cc
index ab99873..499d9ae 100644
--- a/skia/ext/vector_platform_device_skia.cc
+++ b/skia/ext/vector_platform_device_skia.cc
@@ -40,10 +40,6 @@ VectorPlatformDeviceSkia::VectorPlatformDeviceSkia(SkPDFDevice* pdf_device)
 VectorPlatformDeviceSkia::~VectorPlatformDeviceSkia() {
 }
 
-bool VectorPlatformDeviceSkia::IsVectorial() {
-  return true;
-}
-
 bool VectorPlatformDeviceSkia::IsNativeFontRenderingAllowed() {
   return false;
 }
@@ -87,7 +83,7 @@ void VectorPlatformDeviceSkia::EndPlatformPaint() {
 }
 
 uint32_t VectorPlatformDeviceSkia::getDeviceCapabilities() {
-  return kVector_Capability;
+  return SkDevice::getDeviceCapabilities() | kVector_Capability;
 }
 
 int VectorPlatformDeviceSkia::width() const {
diff --git a/skia/ext/vector_platform_device_skia.h b/skia/ext/vector_platform_device_skia.h
index 4a126e5..1998f59 100644
--- a/skia/ext/vector_platform_device_skia.h
+++ b/skia/ext/vector_platform_device_skia.h
@@ -39,15 +39,16 @@ class VectorPlatformDeviceSkia : public PlatformDevice {
   SkPDFDevice* PdfDevice() { return pdf_device_.get(); }
 
   // PlatformDevice methods.
-  virtual bool IsVectorial();
   virtual bool IsNativeFontRenderingAllowed();
 
   virtual PlatformSurface BeginPlatformPaint();
   virtual void EndPlatformPaint();
+#if defined(OS_WIN)
+  virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect);
+#endif
 
   // SkDevice methods.
   virtual uint32_t getDeviceCapabilities();
-
   virtual int width() const;
   virtual int height() const;
   virtual void setMatrixClip(const SkMatrix& matrix, const SkRegion& region,
@@ -83,10 +84,6 @@ class VectorPlatformDeviceSkia : public PlatformDevice {
   virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
                           const SkPaint&);
 
-#if defined(OS_WIN)
-  virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect);
-#endif
-
  protected:
   // Override from SkDevice (through PlatformDevice).
   virtual SkDeviceFactory* onNewDeviceFactory();