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 3f4ed8837d989af14c3b495e3fc7c60207f3d4ff..d40526621e6c8d170b870bcf6b3583a22d1b107e 100644 |
--- a/content/renderer/gpu/compositor_output_surface.h |
+++ b/content/renderer/gpu/compositor_output_surface.h |
@@ -11,6 +11,7 @@ |
#include "base/memory/ref_counted.h" |
#include "base/threading/non_thread_safe.h" |
#include "base/time.h" |
+#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurfaceSoftware.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurface.h" |
namespace base { |
@@ -33,7 +34,8 @@ class CompositorOutputSurface |
base::TaskRunner* target_task_runner); |
CompositorOutputSurface(int32 routing_id, |
- WebKit::WebGraphicsContext3D* context3d); |
+ WebKit::WebGraphicsContext3D* context3d, |
+ WebKit::WebCompositorOutputSurfaceSoftware* software); |
virtual ~CompositorOutputSurface(); |
// WebCompositorOutputSurface implementation. |
@@ -41,6 +43,8 @@ class CompositorOutputSurface |
WebKit::WebCompositorOutputSurfaceClient* client) OVERRIDE; |
virtual const Capabilities& capabilities() const OVERRIDE; |
virtual WebKit::WebGraphicsContext3D* context3D() const OVERRIDE; |
+ virtual WebKit::WebCompositorOutputSurfaceSoftware* surfaceSoftware() |
+ const OVERRIDE; |
jamesr
2012/08/28 23:38:14
please do not OVERRIDE for implementations in chro
aelias_OOO_until_Jul13
2012/08/28 23:53:11
Removed OVERRIDE on my new method, should I also r
|
virtual void sendFrameToParentCompositor( |
const WebKit::WebCompositorFrame&) OVERRIDE; |
@@ -54,7 +58,7 @@ class CompositorOutputSurface |
int routing_id_; |
Capabilities capabilities_; |
scoped_ptr<WebKit::WebGraphicsContext3D> context3D_; |
+ scoped_ptr<WebKit::WebCompositorOutputSurfaceSoftware> surfaceSoftware_; |
piman
2012/08/28 23:26:59
nit: surface_software_
|
}; |
#endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
- |