Chromium Code Reviews| Index: Source/platform/graphics/Canvas2DLayerBridge.cpp |
| diff --git a/Source/platform/graphics/Canvas2DLayerBridge.cpp b/Source/platform/graphics/Canvas2DLayerBridge.cpp |
| index a44254c41b5313410576d54207fc2ae432a9f873..1b2abc1ea9a423408b573c85161671c7816b1119 100644 |
| --- a/Source/platform/graphics/Canvas2DLayerBridge.cpp |
| +++ b/Source/platform/graphics/Canvas2DLayerBridge.cpp |
| @@ -513,18 +513,14 @@ void Canvas2DLayerBridge::finalizeFrame(const FloatRect &dirtyRect) |
| m_didRecordDrawCommand = true; |
| } |
| -Platform3DObject Canvas2DLayerBridge::getBackingTexture() |
| +PassRefPtr<SkImage> Canvas2DLayerBridge::getBackingTextureImage() |
| { |
| - ASSERT(!m_destructionInProgress); |
| if (!checkSurfaceValid()) |
|
f(malita)
2015/06/18 16:33:00
This is the only place where getBackingTextureImag
Justin Novosad
2015/06/22 18:22:03
The check is necessary here, and does not make sen
|
| - return 0; |
| - m_canvas->flush(); |
| + return nullptr; |
| + |
| context()->flush(); |
| - GrRenderTarget* renderTarget = m_canvas->getDevice()->accessRenderTarget(); |
| - if (renderTarget) { |
| - return renderTarget->asTexture()->getTextureHandle(); |
| - } |
| - return 0; |
| + |
| + return adoptRef(m_canvas->newImageSnapshot()); |
| } |
| PassRefPtr<SkImage> Canvas2DLayerBridge::newImageSnapshot() |