getTopDevice is deprecated

Source/platform/graphics/Canvas2DLayerBridge.cpp

Index: Source/platform/graphics/Canvas2DLayerBridge.cpp
diff --git a/Source/platform/graphics/Canvas2DLayerBridge.cpp b/Source/platform/graphics/Canvas2DLayerBridge.cpp
index 5f69ce1ae65fd30757fd11a10d477fabbf969210..a44254c41b5313410576d54207fc2ae432a9f873 100644
--- a/Source/platform/graphics/Canvas2DLayerBridge.cpp
+++ b/Source/platform/graphics/Canvas2DLayerBridge.cpp
@@ -330,7 +330,8 @@ bool Canvas2DLayerBridge::restoreSurface()
         sharedContext = m_contextProvider->context3d();
 
     if (sharedContext && !sharedContext->isContextLost()) {
-        IntSize size(m_canvas->getTopDevice()->width(), m_canvas->getTopDevice()->height());
+        SkISize skSize = m_canvas->getBaseLayerSize();
+        IntSize size(skSize.width(), skSize.height());
         RefPtr<SkSurface> surface(createSkSurface(m_contextProvider->grContext(), size, m_msaaSampleCount, m_opacityMode));
         if (surface.get()) {
             m_surface = surface.release();
@@ -519,7 +520,7 @@ Platform3DObject Canvas2DLayerBridge::getBackingTexture()
         return 0;
     m_canvas->flush();
     context()->flush();
-    GrRenderTarget* renderTarget = m_canvas->getTopDevice()->accessRenderTarget();
+    GrRenderTarget* renderTarget = m_canvas->getDevice()->accessRenderTarget();

[f(malita), 2015/06/10 22:14:21]

Are these really interchangeable?

IIUC getDevice() returns the root device while getTopDevice returns the top-most
device.  It seems these would be backed by different pixels/textures, no?

[Justin Novosad, 2015/06/12 16:11:48]

2D canvas never uses saveLayer, So I think this is fine.

     if (renderTarget) {
         return renderTarget->asTexture()->getTextureHandle();
     }