Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp - Issue 10377150: Merge 116587 - [chromium] Don't draw when canDraw() is false

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/CCSingleThreadProxy.cpp

Issue 10377150: Merge 116587 - [chromium] Don't draw when canDraw() is false (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 7 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/CCLayerTreeHostImpl.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/CCSingleThreadProxy.cpp

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

--- Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (revision 117086)

+++ Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (working copy)

@@ -325,8 +325,14 @@

DebugScopedSetImplThread impl;

double monotonicTime = monotonicallyIncreasingTime();

double wallClockTime = currentTime();

+ m_layerTreeHostImpl->animate(monotonicTime, wallClockTime);

- m_layerTreeHostImpl->animate(monotonicTime, wallClockTime);

+ // We guard prepareToDraw() with canDraw() because it always returns a valid frame, so can only

+ // be used when such a frame is possible. Since drawLayers() depends on the result of

+ // prepareToDraw(), it is guarded on canDraw() as well.

+ if (!m_layerTreeHostImpl->canDraw())

+ return false;

CCLayerTreeHostImpl::FrameData frame;

m_layerTreeHostImpl->prepareToDraw(frame);

m_layerTreeHostImpl->drawLayers(frame);