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

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

Issue 12041062: Have a common implementation of cc::OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 57b344ae5ed9b2b773b5e1c6adbef1879ee3ccb5..8fc05020809247f22e6aa9487fa8a1b6f59efb20 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -12,7 +12,6 @@
#include "base/threading/non_thread_safe.h"
#include "base/time.h"
#include "cc/output_surface.h"
-#include "cc/software_output_device.h"
namespace base {
class TaskRunner;
@@ -41,9 +40,6 @@ class CompositorOutputSurface
// cc::OutputSurface implementation.
virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE;
- virtual const struct Capabilities& Capabilities() const OVERRIDE;
- virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE;
- virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE;
virtual void SendFrameToParentCompositor(cc::CompositorFrame*) OVERRIDE;
private:
@@ -73,12 +69,8 @@ class CompositorOutputSurface
bool Send(IPC::Message* message);
scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_;
- cc::OutputSurfaceClient* client_;
scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_;
int routing_id_;
- struct Capabilities capabilities_;
- scoped_ptr<WebKit::WebGraphicsContext3D> context3D_;
- scoped_ptr<cc::SoftwareOutputDevice> software_device_;
};
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698