| Index: Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp
|
| diff --git a/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp b/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp
|
| index 8dc281fa16fec3e68dbf961c6abcfa40d73e32c0..b25aac76e29bd06356a7f50773482bed2c0fdc8d 100644
|
| --- a/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp
|
| +++ b/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp
|
| @@ -170,9 +170,10 @@ WebGraphicsContext3D* Canvas2DLayerBridge::context()
|
| return m_context->webContext();
|
| }
|
|
|
| -bool Canvas2DLayerBridge::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox)
|
| +bool Canvas2DLayerBridge::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox, WebKit::WebExternalBitmap* bitmap)
|
| {
|
| #if ENABLE(CANVAS_USES_MAILBOX)
|
| + ASSERT(!bitmap);
|
| // Release to skia textures that were previouosly released by the
|
| // compositor. We do this before acquiring the next snapshot in
|
| // order to cap maximum gpu memory consumption.
|
|
|