Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h - Issue 9950004: Merge 112446 - [chromium] Scheduler should not tell FrameRateController to begin a frame when we do…

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: Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h

Issue 9950004: Merge 112446 - [chromium] Scheduler should not tell FrameRateController to begin a frame when we do… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/WebCore/platform/graphics/chromium/cc/CCScheduler.cpp ('k') | Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h

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

--- Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h (revision 112607)

+++ Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h (working copy)

@@ -82,8 +82,8 @@

virtual bool canDraw();

virtual bool hasMoreResourceUpdates() const;

virtual void scheduledActionBeginFrame();

- virtual bool scheduledActionDrawAndSwapIfPossible();

- virtual void scheduledActionDrawAndSwapForced();

+ virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossible();

+ virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced();

virtual void scheduledActionUpdateMoreResources();

virtual void scheduledActionCommit();

virtual void scheduledActionBeginContextRecreation();

@@ -127,7 +127,7 @@

void layerTreeHostClosedOnImplThread(CCCompletionEvent*);

void setFullRootLayerDamageOnImplThread();

void recreateContextOnImplThread(CCCompletionEvent*, GraphicsContext3D*, bool* recreateSucceeded, LayerRendererCapabilities*);

- bool scheduledActionDrawAndSwapInternal(bool forcedDraw);

+ CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapInternal(bool forcedDraw);

// Accessed on main thread only.

bool m_animateRequested;