Android: Don't instantiate TextureImageTransportSurface

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 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 "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 37 matching lines @@
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
 
 namespace content {
 
 namespace {
 
 const int kUndefinedOutputSurfaceId = -1;
 const int kMinimumPointerDistance = 50;
 
-void InsertSyncPointAndAckForGpu(
-    int gpu_host_id, int route_id, const std::string& return_mailbox) {
-  uint32 sync_point =
-      ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint();
-  AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
-  ack_params.mailbox_name = return_mailbox;
-  ack_params.sync_point = sync_point;
-  RenderWidgetHostImpl::AcknowledgeBufferPresent(
-      route_id, gpu_host_id, ack_params);
-}
-
 void InsertSyncPointAndAckForCompositor(
     int renderer_host_id,
     uint32 output_surface_id,
     int route_id,
     const gpu::Mailbox& return_mailbox,
     const gfx::Size return_size) {
   cc::CompositorFrameAck ack;
   ack.gl_frame_data.reset(new cc::GLFrameData());
   if (!return_mailbox.IsZero()) {
     ack.gl_frame_data->mailbox = return_mailbox;
@@ skipping 742 matching lines @@
         frame_metadata.viewport_size,
         frame_metadata.location_bar_offset,
         frame_metadata.location_bar_content_translation,
         frame_metadata.overdraw_bottom_height);
   }
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
-  NOTREACHED() << "Deprecated. Use --composite-to-mailbox.";
-
-  if (params.mailbox_name.empty())
-    return;
-
-  std::string return_mailbox;
-  if (!current_mailbox_.IsZero()) {
-    return_mailbox.assign(
-        reinterpret_cast<const char*>(current_mailbox_.name),
-        sizeof(current_mailbox_.name));
-  }
-
-  base::Closure callback = base::Bind(&InsertSyncPointAndAckForGpu,
-                                      gpu_host_id, params.route_id,
-                                      return_mailbox);
-
-  gpu::Mailbox mailbox;
-  std::copy(params.mailbox_name.data(),
-            params.mailbox_name.data() + params.mailbox_name.length(),
-            reinterpret_cast<char*>(mailbox.name));
-
-  texture_size_in_layer_ = params.size;
-  content_size_in_layer_ = params.size;
-
-  BuffersSwapped(mailbox, kUndefinedOutputSurfaceId, callback);
+  NOTREACHED() << "Need --composite-to-mailbox or --enable-delegated-renderer";
 }
 
 void RenderWidgetHostViewAndroid::BuffersSwapped(
     const gpu::Mailbox& mailbox,
     uint32_t output_surface_id,
     const base::Closure& ack_callback) {
   ImageTransportFactoryAndroid* factory =
       ImageTransportFactoryAndroid::GetInstance();
 
   // TODO(sievers): When running the impl thread in the browser we
@@ skipping 127 matching lines @@
   RenderWidgetHostViewBase::GetDefaultScreenInfo(result);
 }
 
 // TODO(jrg): Find out the implications and answer correctly here,
 // as we are returning the WebView and not root window bounds.
 gfx::Rect RenderWidgetHostViewAndroid::GetBoundsInRootWindow() {
   return GetViewBounds();
 }
 
 gfx::GLSurfaceHandle RenderWidgetHostViewAndroid::GetCompositingSurface() {
-  return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::TEXTURE_TRANSPORT);
+  return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NATIVE_TRANSPORT);
 }
 
 void RenderWidgetHostViewAndroid::ProcessAckedTouchEvent(
     const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) {
   if (content_view_core_)
     content_view_core_->ConfirmTouchEvent(ack_result);
 }
 
 void RenderWidgetHostViewAndroid::SetHasHorizontalScrollbar(
     bool has_horizontal_scrollbar) {
@@ skipping 387 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content