Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp - 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/LayerRendererChromium.cpp

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/LayerRendererChromium.h ('k') | Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

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

--- Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (revision 112607)

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

@@ -1073,13 +1073,13 @@

m_context->finish();

}

-void LayerRendererChromium::swapBuffers(const IntRect& subBuffer)

+bool LayerRendererChromium::swapBuffers(const IntRect& subBuffer)

{

// FIXME: Remove this once gpu process supports ignoring swap buffers command while framebuffer is discarded.

// Alternatively (preferably?), protect all cc code so as not to attempt a swap after a framebuffer discard.

if (m_isFramebufferDiscarded) {

m_client->setFullRootLayerDamage();

- return;

+ return false;

}

TRACE_EVENT("LayerRendererChromium::swapBuffers", this, 0);

@@ -1098,6 +1098,7 @@

m_context->prepareTexture();

m_headsUpDisplay->onSwapBuffers();

+ return true;

}

void LayerRendererChromium::onSwapBuffersComplete()