cc/CCThreadProxy.h - Issue 10917153: Update cc snapshot to r127918

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/CCThreadProxy.h

Issue 10917153: Update cc snapshot to r127918 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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/CCThreadProxy.h

diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h

index bf9c3782aa6f08ed87bfc0186191cfa96aa20b33..aeb4f8af4717eac4f9c7832f51b85ab5c5fe8bb9 100644

--- a/cc/CCThreadProxy.h

+++ b/cc/CCThreadProxy.h

@@ -39,7 +39,6 @@ public:

virtual void setVisible(bool) OVERRIDE;

virtual bool initializeRenderer() OVERRIDE;

virtual bool recreateContext() OVERRIDE;

- virtual int compositorIdentifier() const OVERRIDE;

virtual void implSideRenderingStats(CCRenderingStats&) OVERRIDE;

virtual const RendererCapabilities& rendererCapabilities() const OVERRIDE;

virtual void loseContext() OVERRIDE;

@@ -113,7 +112,7 @@ private:

void requestReadbackOnImplThread(ReadbackRequest*);

void requestStartPageScaleAnimationOnImplThread(IntSize targetPosition, bool useAnchor, float scale, double durationSec);

void finishAllRenderingOnImplThread(CCCompletionEvent*);

- void initializeImplOnImplThread(CCCompletionEvent*);

+ void initializeImplOnImplThread(CCCompletionEvent*, PassOwnPtr<CCInputHandler>);

void setSurfaceReadyOnImplThread();

void setVisibleOnImplThread(CCCompletionEvent*, bool);

void initializeContextOnImplThread(CCGraphicsContext*);

@@ -134,7 +133,6 @@ private:

bool m_forcedCommitRequested;

OwnPtr<CCThreadProxyContextRecreationTimer> m_contextRecreationTimer;

CCLayerTreeHost* m_layerTreeHost;

- int m_compositorIdentifier;

bool m_rendererInitialized;

RendererCapabilities m_RendererCapabilitiesMainThreadCopy;

bool m_started;

« no previous file with comments | « cc/CCTextureUpdateControllerTest.cpp ('k') | cc/CCThreadProxy.cpp » ('j') | no next file with comments »