Source/WebCore/platform/graphics/gpu/DrawingBuffer.h - Issue 7671031: Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages

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/gpu/DrawingBuffer.h

Issue 7671031: Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages (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/platform/graphics/chromium/WebGLLayerChromium.cpp ('k') | Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/gpu/DrawingBuffer.h

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

--- Source/WebCore/platform/graphics/gpu/DrawingBuffer.h (revision 93254)

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

@@ -90,19 +90,6 @@

void publishToPlatformLayer();

#endif

-#if PLATFORM(CHROMIUM)

- class WillPublishCallback {

- WTF_MAKE_NONCOPYABLE(WillPublishCallback);

- public:

- WillPublishCallback() { }

- virtual ~WillPublishCallback() { }

- virtual void willPublish() = 0;

- };

- void setWillPublishCallback(PassOwnPtr<WillPublishCallback> callback) { m_callback = callback; }

-#endif

#if USE(SKIA)

void setGrContext(GrContext* ctx);

void getGrPlatformSurfaceDesc(GrPlatformSurfaceDesc*);

@@ -115,9 +102,6 @@

DrawingBuffer(GraphicsContext3D*, const IntSize&, bool multisampleExtensionSupported, bool packedDepthStencilExtensionSupported);

- // Platform specific function called after reset() so each platform can do extra work if needed

- void didReset();

RefPtr<GraphicsContext3D> m_context;

IntSize m_size;

bool m_multisampleExtensionSupported;

@@ -137,7 +121,6 @@

Platform3DObject m_multisampleColorBuffer;

#if PLATFORM(CHROMIUM)

- OwnPtr<WillPublishCallback> m_callback;

#if USE(ACCELERATED_COMPOSITING)

RefPtr<Canvas2DLayerChromium> m_platformLayer;

#endif