Remove 'transport' paths from PassThroughImageTransportSurface

content/common/gpu/image_transport_surface_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/common/gpu/image_transport_surface.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
@@ skipping 42 matching lines @@
   void DoWakeUpGpu();
 
   uint32 parent_client_id_;
   base::TimeTicks begin_wake_up_time_;
 };
 
 class DirectSurfaceAndroid : public PassThroughImageTransportSurface {
  public:
   DirectSurfaceAndroid(GpuChannelManager* manager,
                        GpuCommandBufferStub* stub,
-                       gfx::GLSurface* surface,
-                       bool transport);
+                       gfx::GLSurface* surface);
 
   // gfx::GLSurface implementation.
   virtual bool SwapBuffers() OVERRIDE;
 
  protected:
   virtual ~DirectSurfaceAndroid();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DirectSurfaceAndroid);
 };
 
 ImageTransportSurfaceAndroid::ImageTransportSurfaceAndroid(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub,
     gfx::GLSurface* surface,
     uint32 parent_client_id)
-    : PassThroughImageTransportSurface(manager, stub, surface, true),

[piman, 2014/04/25 05:41:14]

This is the only one that was setting it to true.
However, it's been a long time since SwapBuffers, etc. were going through the
"transport" path (e.g. SwapBuffers is actually marked NOTREACHED), so I think
it's ok to assume it could just as well be false.

Let me know if I'm missing something here.

[no sievers, 2014/04/25 17:51:00]

Should be fine. We don't expect glSwapBuffers() or glResizeCHROMIUM() here with
Ubercomp (or previously MailboxOutputSurface), which is the code which you are
removing. It wouldn't even have worked for resize, since we'd have stayed
descheduled and never gotten an ack from the browser.

+    : PassThroughImageTransportSurface(manager, stub, surface),
       parent_client_id_(parent_client_id) {}
 
 ImageTransportSurfaceAndroid::~ImageTransportSurfaceAndroid() {}
 
 bool ImageTransportSurfaceAndroid::Initialize() {
   if (!surface())
     return false;
 
   if (!PassThroughImageTransportSurface::Initialize())
     return false;
@@ skipping 49 matching lines @@
 void ImageTransportSurfaceAndroid::DoWakeUpGpu() {
   if (!GetHelper()->stub()->decoder() ||
       !GetHelper()->stub()->decoder()->MakeCurrent())
     return;
   glFinish();
   DidAccessGpu();
 }
 
 DirectSurfaceAndroid::DirectSurfaceAndroid(GpuChannelManager* manager,
                                            GpuCommandBufferStub* stub,
-                                           gfx::GLSurface* surface,
-                                           bool transport)
-    : PassThroughImageTransportSurface(manager, stub, surface, transport) {}
+                                           gfx::GLSurface* surface)
+    : PassThroughImageTransportSurface(manager, stub, surface) {}
 
 DirectSurfaceAndroid::~DirectSurfaceAndroid() {}
 
 bool DirectSurfaceAndroid::SwapBuffers() {
   DidAccessGpu();
   return PassThroughImageTransportSurface::SwapBuffers();
 }
 
 }  // anonymous namespace
 
@@ skipping 17 matching lines @@
           stub->surface_id());
   scoped_refptr<gfx::GLSurface> surface =
       new gfx::NativeViewGLSurfaceEGL(window);
   bool initialize_success = surface->Initialize();
   if (window)
     ANativeWindow_release(window);
   if (!initialize_success)
     return scoped_refptr<gfx::GLSurface>();
 
   return scoped_refptr<gfx::GLSurface>(
-      new DirectSurfaceAndroid(manager, stub, surface.get(), false));
+      new DirectSurfaceAndroid(manager, stub, surface.get()));
 }
 
 }  // namespace content