cc/thread_proxy.cc - Issue 12760005: Manually merge 188038

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/thread_proxy.cc

Issue 12760005: Manually merge 188038 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/

Patch Set: Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: cc/thread_proxy.cc

===================================================================

--- cc/thread_proxy.cc (revision 186868)

+++ cc/thread_proxy.cc (working copy)

@@ -1027,7 +1027,9 @@

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);

« no previous file with comments | « cc/output_surface.h ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »