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

trunk/src/content/common/gpu/texture_image_transport_surface.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/texture_image_transport_surface.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 55 matching lines @@
 
   GpuChannelManager* manager = helper_->manager();
   surface_ = manager->GetDefaultOffscreenSurface();
   if (!surface_.get())
     return false;
 
   if (!helper_->Initialize())
     return false;
 
   GpuChannel* parent_channel = manager->LookupChannel(handle_.parent_client_id);
-  if (parent_channel)
-    helper_->SetPreemptByFlag(parent_channel->GetPreemptionFlag());
+  if (parent_channel) {
+    const CommandLine* command_line = CommandLine::ForCurrentProcess();
+    if (command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess))
+      helper_->SetPreemptByFlag(parent_channel->GetPreemptionFlag());
+  }
 
   return true;
 }
 
 void TextureImageTransportSurface::Destroy() {
   if (surface_.get())
     surface_ = NULL;
 
   helper_->Destroy();
 }
@@ skipping 360 matching lines @@
 
 #ifndef NDEBUG
   GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
   if (status != GL_FRAMEBUFFER_COMPLETE) {
     DLOG(FATAL) << "Framebuffer incomplete: " << status;
   }
 #endif
 }
 
 }  // namespace content