Skip drawing unsupported layers in forced software mode

cc/layers/io_surface_layer_impl.cc

 // Copyright 2012 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/io_surface_layer_impl.h"
 
 #include "base/stringprintf.h"
 #include "cc/layers/quad_sink.h"
 #include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "cc/output/output_surface.h"
@@ skipping 43 matching lines @@
 }
 
 void IOSurfaceLayerImpl::PushPropertiesTo(LayerImpl* layer) {
   LayerImpl::PushPropertiesTo(layer);
 
   IOSurfaceLayerImpl* io_surface_layer =
       static_cast<IOSurfaceLayerImpl*>(layer);
   io_surface_layer->SetIOSurfaceProperties(io_surface_id_, io_surface_size_);
 }
 
-void IOSurfaceLayerImpl::WillDraw(ResourceProvider* resource_provider) {
-  LayerImpl::WillDraw(resource_provider);
+bool IOSurfaceLayerImpl::WillDraw(DrawMode draw_mode,
+                                  ResourceProvider* resource_provider) {
+  if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE)
+    return false;
 
   if (io_surface_changed_) {
     WebKit::WebGraphicsContext3D* context3d =
         resource_provider->GraphicsContext3D();
     if (!context3d) {
       // FIXME: Implement this path for software compositing.
-      return;
+      return false;
     }
 
     // FIXME: Do this in a way that we can track memory usage.
     if (!io_surface_texture_id_) {
       io_surface_texture_id_ = context3d->createTexture();
       io_surface_resource_id_ =
           resource_provider->CreateResourceFromExternalTexture(
               GL_TEXTURE_RECTANGLE_ARB,
               io_surface_texture_id_);
     }
 
     GLC(context3d,
         context3d->bindTexture(GL_TEXTURE_RECTANGLE_ARB,
                                io_surface_texture_id_));
     context3d->texImageIOSurface2DCHROMIUM(GL_TEXTURE_RECTANGLE_ARB,
                                            io_surface_size_.width(),
                                            io_surface_size_.height(),
                                            io_surface_id_,
                                            0);
     // Do not check for error conditions. texImageIOSurface2DCHROMIUM() is
     // supposed to hold on to the last good IOSurface if the new one is already
     // closed. This is only a possibility during live resizing of plugins.
     // However, it seems that this is not sufficient to completely guard against
     // garbage being drawn. If this is found to be a significant issue, it may
     // be necessary to explicitly tell the embedder when to free the surfaces it
     // has allocated.
     io_surface_changed_ = false;
   }
+
+  return LayerImpl::WillDraw(draw_mode, resource_provider);
 }
 
 void IOSurfaceLayerImpl::AppendQuads(QuadSink* quad_sink,
                                      AppendQuadsData* append_quads_data) {
   SharedQuadState* shared_quad_state =
       quad_sink->UseSharedQuadState(CreateSharedQuadState());
   AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data);
 
   gfx::Rect quad_rect(content_bounds());
   gfx::Rect opaque_rect(contents_opaque() ? quad_rect : gfx::Rect());
@@ skipping 31 matching lines @@
 
   io_surface_id_ = io_surface_id;
   io_surface_size_ = size;
 }
 
 const char* IOSurfaceLayerImpl::LayerTypeAsString() const {
   return "cc::IOSurfaceLayerImpl";
 }
 
 }  // namespace cc