Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1526)

Unified Diff: content/renderer/gpu/compositor_output_surface.h

Issue 20185002: ContextProvider in OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: contextprovider: don't access Context3d() in OutputSurface contructors, it's not bound yet Created 7 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: content/renderer/gpu/compositor_output_surface.h
diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
index ff598725e65decd7efb20b1ce3132df69c1b8139..46c69acecc7fe1b46931f1645c667ab522a10911 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -31,8 +31,7 @@ class CompositorFrameAck;
}
namespace content {
-
-class WebGraphicsContext3DCommandBufferImpl;
+class ContextProviderCommandBuffer;
// This class can be created only on the main thread, but then becomes pinned
// to a fixed thread when bindToClient is called.
@@ -43,11 +42,12 @@ class CompositorOutputSurface
static IPC::ForwardingMessageFilter* CreateFilter(
base::TaskRunner* target_task_runner);
- CompositorOutputSurface(int32 routing_id,
- uint32 output_surface_id,
- WebGraphicsContext3DCommandBufferImpl* context3d,
- cc::SoftwareOutputDevice* software,
- bool use_swap_compositor_frame_message);
+ CompositorOutputSurface(
+ int32 routing_id,
+ uint32 output_surface_id,
+ const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
+ scoped_ptr<cc::SoftwareOutputDevice> software,
+ bool use_swap_compositor_frame_message);
virtual ~CompositorOutputSurface();
// cc::OutputSurface implementation.
« no previous file with comments | « content/common/gpu/client/context_provider_command_buffer.cc ('k') | content/renderer/gpu/compositor_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698