Index: cc/layers/texture_layer_impl.cc |
diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc |
index 17f6c480a39afcbce87816f66005f4d78919f0e6..7657bb403984d9cb3a5e3204870c6160242a5c35 100644 |
--- a/cc/layers/texture_layer_impl.cc |
+++ b/cc/layers/texture_layer_impl.cc |
@@ -63,14 +63,17 @@ void TextureLayerImpl::PushPropertiesTo(LayerImpl* layer) { |
} |
} |
-void TextureLayerImpl::WillDraw(ResourceProvider* resource_provider) { |
- if (uses_mailbox_ || !texture_id_) |
- return; |
+bool TextureLayerImpl::WillDraw(DrawMode draw_mode, |
+ ResourceProvider* resource_provider) { |
+ if (uses_mailbox_ || !texture_id_ || |
+ draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE) |
+ return false; |
piman
2013/05/30 22:18:18
if uses_mailbox_ and we're not in DRAW_MODE_RESOUR
boliu
2013/05/31 00:09:08
Done.
|
DCHECK(!external_texture_resource_); |
external_texture_resource_ = |
resource_provider->CreateResourceFromExternalTexture( |
GL_TEXTURE_2D, |
texture_id_); |
+ return LayerImpl::WillDraw(draw_mode, resource_provider); |
} |
void TextureLayerImpl::AppendQuads(QuadSink* quad_sink, |
@@ -103,6 +106,7 @@ void TextureLayerImpl::AppendQuads(QuadSink* quad_sink, |
} |
void TextureLayerImpl::DidDraw(ResourceProvider* resource_provider) { |
+ LayerImpl::DidDraw(resource_provider); |
if (uses_mailbox_ || !external_texture_resource_) |
return; |
// FIXME: the following assert will not be true when sending resources to a |