| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE | 5 #ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE |
| 6 #define WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE | 6 #define WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/output_surface.h" | 9 #include "cc/output_surface.h" |
| 10 #include "webkit/compositor_bindings/web_compositor_support_software_output_devi
ce.h" | 10 #include "webkit/compositor_bindings/web_compositor_support_software_output_devi
ce.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 virtual ~WebCompositorSupportOutputSurface(); | 30 virtual ~WebCompositorSupportOutputSurface(); |
| 31 | 31 |
| 32 virtual bool BindToClient(cc::OutputSurfaceClient*) OVERRIDE; | 32 virtual bool BindToClient(cc::OutputSurfaceClient*) OVERRIDE; |
| 33 | 33 |
| 34 virtual const struct Capabilities& Capabilities() const OVERRIDE; | 34 virtual const struct Capabilities& Capabilities() const OVERRIDE; |
| 35 | 35 |
| 36 virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE; | 36 virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE; |
| 37 virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE; | 37 virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE; |
| 38 | 38 |
| 39 virtual void SendFrameToParentCompositor(const cc::CompositorFrame&) OVERRIDE; | 39 virtual void SendFrameToParentCompositor(cc::CompositorFrame&) OVERRIDE; |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebCompositorSupportOutputSurface( | 42 WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebCompositorSupportOutputSurface( |
| 43 scoped_ptr<WebKit::WebGraphicsContext3D> context3d); | 43 scoped_ptr<WebKit::WebGraphicsContext3D> context3d); |
| 44 WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebCompositorSupportOutputSurface( | 44 WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebCompositorSupportOutputSurface( |
| 45 scoped_ptr<cc::SoftwareOutputDevice> software_device); | 45 scoped_ptr<cc::SoftwareOutputDevice> software_device); |
| 46 | 46 |
| 47 struct cc::OutputSurface::Capabilities capabilities_; | 47 struct cc::OutputSurface::Capabilities capabilities_; |
| 48 scoped_ptr<WebKit::WebGraphicsContext3D> context3d_; | 48 scoped_ptr<WebKit::WebGraphicsContext3D> context3d_; |
| 49 scoped_ptr<cc::SoftwareOutputDevice> software_device_; | 49 scoped_ptr<cc::SoftwareOutputDevice> software_device_; |
| 50 }; | 50 }; |
| 51 | 51 |
| 52 } // namespace webkit | 52 } // namespace webkit |
| 53 | 53 |
| 54 #endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE | 54 #endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE |
| OLD | NEW |