Allow WebExternalTextureLayers to receive a bitmap along with a mailbox

cc/trees/layer_tree_host.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/trees/layer_tree_host.h"
 
 #include <algorithm>
 #include <stack>
 
 #include "base/bind.h"
@@ skipping 106 matching lines @@
   return InitializeProxy(proxy_for_testing.Pass());
 }
 
 bool LayerTreeHost::InitializeProxy(scoped_ptr<Proxy> proxy) {
   TRACE_EVENT0("cc", "LayerTreeHost::InitializeForReal");
 
   scoped_ptr<OutputSurface> output_surface(CreateOutputSurface());
   if (!output_surface)
     return false;
 
+  using_software_renderer_ = !output_surface->context3d();

[danakj, 2013/06/26 19:09:57]

This would be wrong on WebView when they defer initialization of GL until later
on. They'd end up with a GLRenderer, but getting software WebGL stuff. Maybe
that's okay though?

[boliu, 2013/06/28 01:27:29]

For android webview, we should strive to make GL mode always work correctly at
the expense of software mode. So this condition should be

!output_surface->context3d() &&
!output_surface->capabilities().deferred_gl_initialization

There is the caveat that context3d() may always be null even if
using_software_renderer_ is false, but I don't think any null checks are needed
in this patch. I think the actual usage of the mailbox resource is in
TextureLayerImpl only, which is skipped in webview software mode already.

+
   proxy_ = proxy.Pass();
   proxy_->Start(output_surface.Pass());
   return true;
 }
 
 LayerTreeHost::~LayerTreeHost() {
   TRACE_EVENT0("cc", "LayerTreeHost::~LayerTreeHost");
   if (root_layer_.get())
     root_layer_->SetLayerTreeHost(NULL);
 
@@ skipping 563 matching lines @@
     bool update_total_num_cc_layers_will_use_lcd_text) {
   lcd_text_metrics_.total_num_cc_layers++;
   if (update_total_num_cc_layers_can_use_lcd_text)
     lcd_text_metrics_.total_num_cc_layers_can_use_lcd_text++;
   if (update_total_num_cc_layers_will_use_lcd_text) {
     DCHECK(update_total_num_cc_layers_can_use_lcd_text);
     lcd_text_metrics_.total_num_cc_layers_will_use_lcd_text++;
   }
 }
 
+bool LayerTreeHost::UsingSoftwareRenderer() {
+  return using_software_renderer_;
+}
+
 void LayerTreeHost::UpdateLayers(Layer* root_layer,
                                  ResourceUpdateQueue* queue) {
   TRACE_EVENT1("cc", "LayerTreeHost::UpdateLayers",
                "commit_number", commit_number());
 
   LayerList update_list;
   {
     UpdateHudLayer();
 
     Layer* root_scroll = FindFirstScrollableLayer(root_layer);
@@ skipping 360 matching lines @@
     bool start_ready_animations = true;
     (*iter).second->UpdateState(start_ready_animations, NULL);
   }
 }
 
 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() {
   return proxy_->CapturePicture();
 }
 
 }  // namespace cc