Skia is deprecating setDevice in favor of factories to create SkCanvas variants

(e.g. raster, gpu, picture, pdf, etc.).

One step in that direction is to remove setBitmapDevice, which is just a wrapper
for setDevice(new SkDevice).
Review URL: https://codereview.chromium.org/11000037

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

4 files changed, 7 insertions, 8 deletions

diff --git a/cc/CCRendererSoftware.cpp b/cc/CCRendererSoftware.cpp
index c6994fa8..e833780 100644
--- a/cc/CCRendererSoftware.cpp
+++ b/cc/CCRendererSoftware.cpp
@@ -63,7 +63,6 @@ CCRendererSoftware::CCRendererSoftware(CCRendererClient* client, CCResourceProvi
     : CCDirectRenderer(client, resourceProvider)
     , m_visible(true)
     , m_outputDevice(outputDevice)
-    , m_skRootCanvas(0)
     , m_skCurrentCanvas(0)
 {
     m_resourceProvider->setDefaultResourceType(CCResourceProvider::Bitmap);
@@ -92,14 +91,14 @@ void CCRendererSoftware::viewportChanged()
 
 void CCRendererSoftware::beginDrawingFrame(DrawingFrame& frame)
 {
-    m_skRootCanvas.setBitmapDevice(m_outputDevice->lock(true)->getSkBitmap());
+    m_skRootCanvas = adoptPtr(new SkCanvas(m_outputDevice->lock(true)->getSkBitmap()));
 }
 
 void CCRendererSoftware::finishDrawingFrame(DrawingFrame& frame)
 {
     m_currentFramebufferLock.clear();
     m_skCurrentCanvas = 0;
-    m_skRootCanvas.setDevice(0);
+    m_skRootCanvas.clear();
     m_outputDevice->unlock();
 }
 
@@ -115,7 +114,7 @@ void CCRendererSoftware::finish()
 void CCRendererSoftware::bindFramebufferToOutputSurface(DrawingFrame& frame)
 {
     m_currentFramebufferLock.clear();
-    m_skCurrentCanvas = &m_skRootCanvas;
+    m_skCurrentCanvas = m_skRootCanvas.get();
 }
 
 bool CCRendererSoftware::bindFramebufferToTexture(DrawingFrame& frame, const CCScopedTexture* texture, const IntRect& framebufferRect)
diff --git a/cc/CCRendererSoftware.h b/cc/CCRendererSoftware.h
index cf9476b..a7b36d5 100644
--- a/cc/CCRendererSoftware.h
+++ b/cc/CCRendererSoftware.h
@@ -63,7 +63,7 @@ private:
     bool m_visible;
 
     WebKit::WebCompositorSoftwareOutputDevice* m_outputDevice;
-    SkCanvas m_skRootCanvas;
+    OwnPtr<SkCanvas> m_skRootCanvas;
     SkCanvas* m_skCurrentCanvas;
     SkPaint m_skCurrentPaint;
     OwnPtr<CCResourceProvider::ScopedWriteLockSoftware> m_currentFramebufferLock;
diff --git a/cc/CCResourceProvider.cpp b/cc/CCResourceProvider.cpp
index b9b768d..2a95edd 100644
--- a/cc/CCResourceProvider.cpp
+++ b/cc/CCResourceProvider.cpp
@@ -453,7 +453,7 @@ CCResourceProvider::ScopedWriteLockSoftware::ScopedWriteLockSoftware(CCResourceP
     , m_resourceId(resourceId)
 {
     CCResourceProvider::populateSkBitmapWithResource(&m_skBitmap, resourceProvider->lockForWrite(resourceId));
-    m_skCanvas.setBitmapDevice(m_skBitmap);
+    m_skCanvas = adoptPtr(new SkCanvas(m_skBitmap));
 }
 
 CCResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware()
diff --git a/cc/CCResourceProvider.h b/cc/CCResourceProvider.h
index 1857a96..91a6d77 100644
--- a/cc/CCResourceProvider.h
+++ b/cc/CCResourceProvider.h
@@ -206,13 +206,13 @@ public:
         ScopedWriteLockSoftware(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedWriteLockSoftware();
 
-        SkCanvas* skCanvas() { return &m_skCanvas; }
+        SkCanvas* skCanvas() { return m_skCanvas.get(); }
 
     private:
         CCResourceProvider* m_resourceProvider;
         CCResourceProvider::ResourceId m_resourceId;
         SkBitmap m_skBitmap;
-        SkCanvas m_skCanvas;
+        OwnPtr<SkCanvas> m_skCanvas;
     };
 
 private: