Manually merge 188038

cc/thread_proxy.cc

 // Copyright 2011 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 "cc/thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/delay_based_time_source.h"
@@ skipping 1009 matching lines @@
 {
     TRACE_EVENT0("cc", "ThreadProxy::initializeRendererOnImplThread");
     DCHECK(isImplThread());
     DCHECK(m_outputSurfaceBeforeInitializationOnImplThread.get());
     *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_outputSurfaceBeforeInitializationOnImplThread.Pass());
     if (*initializeSucceeded) {
         *capabilities = m_layerTreeHostImpl->rendererCapabilities();
         m_schedulerOnImplThread->setSwapBuffersCompleteSupported(
                 capabilities->usingSwapCompleteCallback);
 
-        int maxFramesPending = FrameRateController::kDefaultMaxFramesPending;
+        int maxFramesPending = m_layerTreeHostImpl->outputSurface()->Capabilities().max_frames_pending;
+        if (maxFramesPending <= 0)
+            maxFramesPending = FrameRateController::kDefaultMaxFramesPending;
         if (m_layerTreeHostImpl->outputSurface()->Capabilities().has_parent_compositor)
             maxFramesPending = 1;
         m_schedulerOnImplThread->setMaxFramesPending(maxFramesPending);
     }
 
     completion->signal();
 }
 
 void ThreadProxy::layerTreeHostClosedOnImplThread(CompletionEvent* completion)
 {
@@ skipping 148 matching lines @@
 
 void ThreadProxy::renewTreePriorityOnImplThread()
 {
     DCHECK(m_renewTreePriorityOnImplThreadPending);
     m_renewTreePriorityOnImplThreadPending = false;
 
     renewTreePriority();
 }
 
 }  // namespace cc