Reland 179911 and 179910

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 56 matching lines @@
   if (!surface_.get())
     return false;
 
   if (!helper_->Initialize())
     return false;
 
   GpuChannel* parent_channel = manager->LookupChannel(handle_.parent_client_id);
   if (parent_channel) {
     const CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess))
-      helper_->SetPreemptByCounter(parent_channel->MessagesPendingCount());
+      helper_->SetPreemptByFlag(parent_channel->GetPreemptionFlag());
   }
 
   return true;
 }
 
 void TextureImageTransportSurface::Destroy() {
   if (surface_.get())
     surface_ = NULL;
 
   helper_->Destroy();
@@ skipping 393 matching lines @@
   // at which point we consume the correct texture back.
   mailbox_manager_->ProduceTexture(
       GL_TEXTURE_2D,
       mailbox_name(texture.surface_handle),
       definition.release(),
       NULL);
   texture.service_id = 0;
 }
 
 }  // namespace content