Source/WebCore/platform/graphics/GraphicsContext3D.h - 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/platform/graphics/GraphicsContext3D.h

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

« no previous file with comments | « Source/WebCore/html/canvas/WebGLRenderingContext.cpp ('k') | Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/GraphicsContext3D.h

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

--- Source/WebCore/platform/graphics/GraphicsContext3D.h (revision 93076)

+++ Source/WebCore/platform/graphics/GraphicsContext3D.h (working copy)

@@ -95,6 +95,7 @@

#endif

class HostWindow;

class Image;

+class ImageBuffer;

class ImageData;

#if USE(CAIRO)

class PlatformContextCairo;

@@ -779,8 +780,8 @@

void reshape(int width, int height);

#if USE(CG)

- void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,

- int canvasWidth, int canvasHeight, CGContextRef context);

+ static void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,

+ int canvasWidth, int canvasHeight, CGContextRef);

#elif PLATFORM(GTK)

void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,

int canvasWidth, int canvasHeight, PlatformContextCairo* context);

@@ -790,8 +791,9 @@

void markLayerComposited();

bool layerComposited() const;

- void paintRenderingResultsToCanvas(CanvasRenderingContext* context);

+ void paintRenderingResultsToCanvas(CanvasRenderingContext*);

PassRefPtr<ImageData> paintRenderingResultsToImageData();

+ bool paintCompositedResultsToCanvas(CanvasRenderingContext*);

#if PLATFORM(QT)

bool paintsIntoCanvasBuffer() const { return true; }