Revert 255481 "Remove --ui-prioritize-in-gpu-process"

trunk/src/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 74 matching lines @@
 
 bool ImageTransportSurfaceAndroid::Initialize() {
   if (!surface())
     return false;
 
   if (!PassThroughImageTransportSurface::Initialize())
     return false;
 
   GpuChannel* parent_channel =
       GetHelper()->manager()->LookupChannel(parent_client_id_);
-  if (parent_channel)
-    GetHelper()->SetPreemptByFlag(parent_channel->GetPreemptionFlag());
+  if (parent_channel) {
+    const CommandLine* command_line = CommandLine::ForCurrentProcess();
+    if (command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess))
+      GetHelper()->SetPreemptByFlag(parent_channel->GetPreemptionFlag());
+  }
 
   return true;
 }
 
 bool ImageTransportSurfaceAndroid::OnMakeCurrent(gfx::GLContext* context) {
   DidAccessGpu();
   return PassThroughImageTransportSurface::OnMakeCurrent(context);
 }
 
 bool ImageTransportSurfaceAndroid::SwapBuffers() {
@@ skipping 75 matching lines @@
   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));
 }
 
 }  // namespace content