Revert of Move AW renderer compositor context to gpu thread

gpu/command_buffer/service/async_pixel_transfer_manager_android.cc

 // Copyright 2013 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 "gpu/command_buffer/service/async_pixel_transfer_manager.h"
 
 #include "base/command_line.h"
 #include "base/sys_info.h"
 #include "base/trace_event/trace_event.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_egl.h"
@@ skipping 59 matching lines @@
 // - Bind EGLImages to OpenGL textures (GL_OES_EGL_image)
 // - Use fences (to test for upload completion).
 // - The heap size is large enough.
 // TODO(kaanb|epenner): Remove the IsImagination() check pending the
 // resolution of crbug.com/249147
 // TODO(kaanb|epenner): Remove the IsLowEndDevice() check pending the
 // resolution of crbug.com/271929
 AsyncPixelTransferManager* AsyncPixelTransferManager::Create(
     gfx::GLContext* context) {
   DCHECK(context->IsCurrent(NULL));
-  base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
-
   // Threaded mailbox uses EGLImage which conflicts with EGL uploader.
   // The spec only allows one EGL image per sibling group, but currently the
   // image handle cannot be shared between the threaded mailbox code and
   // AsyncPixelTransferManagerEGL.
   bool uses_threaded_mailboxes =
-      cl->HasSwitch(switches::kEnableThreadedTextureMailboxes);
-  // TexImage2D orphans the EGLImage used for threaded mailbox sharing.
-  bool use_teximage2d_over_texsubimage2d = !uses_threaded_mailboxes;
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableThreadedTextureMailboxes);
   switch (gfx::GetGLImplementation()) {
     case gfx::kGLImplementationEGLGLES2:
       DCHECK(context);
       if (!base::SysInfo::IsLowEndDevice() &&
           context->HasExtension("EGL_KHR_fence_sync") &&
           context->HasExtension("EGL_KHR_image") &&
           context->HasExtension("EGL_KHR_image_base") &&
           context->HasExtension("EGL_KHR_gl_texture_2D_image") &&
           context->HasExtension("GL_OES_EGL_image") &&
-          !uses_threaded_mailboxes && AllowTransferThreadForGpu()) {
+          !uses_threaded_mailboxes &&
+          AllowTransferThreadForGpu()) {
         TRACE_EVENT0("gpu", "AsyncPixelTransferManager_CreateWithThread");
         return new AsyncPixelTransferManagerEGL;
       }
-      return new AsyncPixelTransferManagerIdle(
-          use_teximage2d_over_texsubimage2d);
+      return new AsyncPixelTransferManagerIdle;
     case gfx::kGLImplementationOSMesaGL: {
       TRACE_EVENT0("gpu", "AsyncPixelTransferManager_CreateIdle");
-      return new AsyncPixelTransferManagerIdle(
-          use_teximage2d_over_texsubimage2d);
+      return new AsyncPixelTransferManagerIdle;
     }
     case gfx::kGLImplementationMockGL:
       return new AsyncPixelTransferManagerStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gpu