Manually merge 188038

content/browser/renderer_host/image_transport_factory.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/browser/renderer_host/image_transport_factory.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/threading/non_thread_safe.h"
 #include "cc/output_surface.h"
 #include "cc/output_surface_client.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ skipping 268 matching lines @@
       public base::NonThreadSafe {
  public:
   explicit BrowserCompositorOutputSurface(
       WebGraphicsContext3DCommandBufferImpl* context,
       int surface_id,
       BrowserCompositorOutputSurfaceProxy* output_surface_proxy)
       : context3D_(context),
         surface_id_(surface_id),
         client_(NULL),
         output_surface_proxy_(output_surface_proxy) {
+    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    if (command_line->HasSwitch(switches::kUIMaxFramesPending)) {
+      std::string string_value = command_line->GetSwitchValueASCII(
+        switches::kUIMaxFramesPending);
+      int int_value;
+      if (base::StringToInt(string_value, &int_value))
+        capabilities_.max_frames_pending = int_value;
+      else
+        LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending;
+    }
     DetachFromThread();
   }
 
   virtual ~BrowserCompositorOutputSurface() {
     DCHECK(CalledOnValidThread());
     if (!client_)
       return;
     output_surface_proxy_->RemoveSurface(surface_id_);
   }
 
@@ skipping 325 matching lines @@
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }
 
 }  // namespace content