getTopDevice is deprecated

Source/platform/graphics/Canvas2DLayerBridge.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 312 matching lines @@
         return false;
     ASSERT(m_layer && !m_isSurfaceValid);
 
     WebGraphicsContext3D* sharedContext = 0;
     m_layer->clearTexture();
     m_contextProvider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
     if (m_contextProvider)
         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();
             m_canvas->setSurface(m_surface.get());
             m_isSurfaceValid = true;
             // FIXME: draw sad canvas picture into new buffer crbug.com/243842
         }
     }
 
     return m_isSurfaceValid;
@@ skipping 168 matching lines @@
     m_didRecordDrawCommand = true;
 }
 
 Platform3DObject Canvas2DLayerBridge::getBackingTexture()
 {
     ASSERT(!m_destructionInProgress);
     if (!checkSurfaceValid())
         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();
     }
     return 0;
 }
 
 PassRefPtr<SkImage> Canvas2DLayerBridge::newImageSnapshot()
 {
     return adoptRef(m_canvas->newImageSnapshot());
 }
 
 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) {
     memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox));
     m_image = other.m_image;
     m_parentLayerBridge = other.m_parentLayerBridge;
 }
 
 } // namespace blink