Source/WebCore/html/canvas/WebGLRenderingContext.cpp - Issue 7664004: Merge 92908 - Readback composited webgl results for printing

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/html/canvas/WebGLRenderingContext.cpp

Issue 7664004: Merge 92908 - Readback composited webgl results for printing (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 4 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

Index: Source/WebCore/html/canvas/WebGLRenderingContext.cpp

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

--- Source/WebCore/html/canvas/WebGLRenderingContext.cpp (revision 93076)

+++ Source/WebCore/html/canvas/WebGLRenderingContext.cpp (working copy)

@@ -566,9 +566,10 @@

{

// Until the canvas is written to by the application, the clear that

// happened after it was composited should be ignored by the compositor.

- if (m_context->layerComposited() && !m_attributes.preserveDrawingBuffer)

+ if (m_context->layerComposited() && !m_attributes.preserveDrawingBuffer) {

+ m_context->paintCompositedResultsToCanvas(this);

canvas()->makePresentationCopy();

- else

+ } else

canvas()->clearPresentationCopy();

clearIfComposited();

if (!m_markedCanvasDirty && !m_layerCleared)

« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/platform/graphics/GraphicsContext3D.h » ('j') | no next file with comments »