Skip drawing unsupported layers in forced software mode

cc/layers/texture_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/texture_layer_impl.h"
 
 #include "base/stringprintf.h"
 #include "cc/layers/quad_sink.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/texture_draw_quad.h"
@@ skipping 45 matching lines @@
   texture_layer->set_vertex_opacity(vertex_opacity_);
   texture_layer->set_premultiplied_alpha(premultiplied_alpha_);
   if (uses_mailbox_ && own_mailbox_) {
     texture_layer->SetTextureMailbox(texture_mailbox_);
     own_mailbox_ = false;
   } else {
     texture_layer->set_texture_id(texture_id_);
   }
 }
 
-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_RESOURCELESS_SOFTWARE we still want
to draw (we just want to skip the CreateResourceFromExternalTexture)

[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,
                                    AppendQuadsData* append_quads_data) {
   if (!external_texture_resource_)
     return;
 
   SharedQuadState* shared_quad_state =
       quad_sink->UseSharedQuadState(CreateSharedQuadState());
   AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data);
@@ skipping 12 matching lines @@
                flipped_);
 
   // Perform explicit clipping on a quad to avoid setting a scissor later.
   if (shared_quad_state->is_clipped && quad->PerformClipping())
     shared_quad_state->is_clipped = false;
   if (!quad->rect.IsEmpty())
     quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 }
 
 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
   // parent compositor. A synchronization scheme (double-buffering or
   // pipelining of updates) for the client will need to exist to solve this.
   DCHECK(!resource_provider->InUseByConsumer(external_texture_resource_));
   resource_provider->DeleteResource(external_texture_resource_);
   external_texture_resource_ = 0;
 }
 
@@ skipping 40 matching lines @@
   } else if (external_texture_resource_) {
     DCHECK(!own_mailbox_);
     ResourceProvider* resource_provider =
         layer_tree_impl()->resource_provider();
     resource_provider->DeleteResource(external_texture_resource_);
     external_texture_resource_ = 0;
   }
 }
 
 }  // namespace cc