Allow WebExternalTextureLayers to receive a bitmap along with a mailbox

cc/layers/texture_layer.cc

 // Copyright 2010 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.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "cc/layers/texture_layer_client.h"
@@ skipping 153 matching lines @@
 bool TextureLayer::DrawsContent() const {
   return (client_ || texture_id_ || holder_ref_) &&
          !context_lost_ && Layer::DrawsContent();
 }
 
 void TextureLayer::Update(ResourceUpdateQueue* queue,
                           const OcclusionTracker* occlusion) {
   if (client_) {
     if (uses_mailbox_) {
       TextureMailbox mailbox;
-      if (client_->PrepareTextureMailbox(&mailbox)) {
+      if (client_->PrepareTextureMailbox(
+              &mailbox, !layer_tree_host()->UsingGLRenderer())) {
         if (mailbox.IsTexture())
           DCHECK(client_->Context3d());
         SetTextureMailbox(mailbox);
       }
     } else {
       DCHECK(client_->Context3d());
       texture_id_ = client_->PrepareTexture(queue);
     }
     context_lost_ = client_->Context3d() &&
         client_->Context3d()->getGraphicsResetStatusARB() != GL_NO_ERROR;
@@ skipping 100 matching lines @@
 }
 
 void TextureLayer::MailboxHolder::ReturnAndReleaseOnImplThread(
     unsigned sync_point, bool is_lost) {
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &MailboxHolder::ReturnAndReleaseOnMainThread,
       this, sync_point, is_lost));
 }
 
 }  // namespace cc