diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 17:54:14 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 17:54:14 +0000 |
| commit | 75fe7f829158c3b62ef42ca641fa6a6e0719a321 (patch) | |
| tree | a0ad96bf86889c8a8b8849a374eb4859e94bad58 /cc/CCRendererSoftware.cpp | |
| parent | 3b794b98d3a3404844638331db206546d27e057d (diff) | |
| download | chromium_src-75fe7f829158c3b62ef42ca641fa6a6e0719a321.zip chromium_src-75fe7f829158c3b62ef42ca641fa6a6e0719a321.tar.gz chromium_src-75fe7f829158c3b62ef42ca641fa6a6e0719a321.tar.bz2 | |
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
Diffstat (limited to 'cc/CCRendererSoftware.cpp')
| -rw-r--r-- | cc/CCRendererSoftware.cpp | 7 |
1 files changed, 3 insertions, 4 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) |