| 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 CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 6 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/threading/non_thread_safe.h" | 12 #include "base/threading/non_thread_safe.h" |
| 13 #include "base/time.h" | 13 #include "base/time.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutput
Surface.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutput
Surface.h" |
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSoftwa
reOutputDevice.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSoftwa
reOutputDevice.h" |
| 16 | 16 |
| 17 namespace WebKit { |
| 18 struct WebCompositorFrameAck; |
| 19 } |
| 20 |
| 17 namespace base { | 21 namespace base { |
| 18 class TaskRunner; | 22 class TaskRunner; |
| 19 } | 23 } |
| 20 | 24 |
| 21 namespace IPC { | 25 namespace IPC { |
| 22 class ForwardingMessageFilter; | 26 class ForwardingMessageFilter; |
| 23 class Message; | 27 class Message; |
| 24 class SyncChannel; | 28 class SyncChannel; |
| 25 } | 29 } |
| 26 | 30 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 friend class base::RefCountedThreadSafe<CompositorOutputSurfaceProxy>; | 68 friend class base::RefCountedThreadSafe<CompositorOutputSurfaceProxy>; |
| 65 ~CompositorOutputSurfaceProxy() {} | 69 ~CompositorOutputSurfaceProxy() {} |
| 66 CompositorOutputSurface* output_surface_; | 70 CompositorOutputSurface* output_surface_; |
| 67 | 71 |
| 68 DISALLOW_COPY_AND_ASSIGN(CompositorOutputSurfaceProxy); | 72 DISALLOW_COPY_AND_ASSIGN(CompositorOutputSurfaceProxy); |
| 69 }; | 73 }; |
| 70 | 74 |
| 71 void OnMessageReceived(const IPC::Message& message); | 75 void OnMessageReceived(const IPC::Message& message); |
| 72 void OnUpdateVSyncParameters( | 76 void OnUpdateVSyncParameters( |
| 73 base::TimeTicks timebase, base::TimeDelta interval); | 77 base::TimeTicks timebase, base::TimeDelta interval); |
| 78 void OnSwapCompositorFrameACK(const WebKit::WebCompositorFrameAck& ack); |
| 79 bool Send(IPC::Message* message); |
| 74 | 80 |
| 75 scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_; | 81 scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_; |
| 76 WebKit::WebCompositorOutputSurfaceClient* client_; | 82 WebKit::WebCompositorOutputSurfaceClient* client_; |
| 77 scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_; | 83 scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_; |
| 78 int routing_id_; | 84 int routing_id_; |
| 79 Capabilities capabilities_; | 85 Capabilities capabilities_; |
| 80 scoped_ptr<WebKit::WebGraphicsContext3D> context3D_; | 86 scoped_ptr<WebKit::WebGraphicsContext3D> context3D_; |
| 81 scoped_ptr<WebKit::WebCompositorSoftwareOutputDevice> software_device_; | 87 scoped_ptr<WebKit::WebCompositorSoftwareOutputDevice> software_device_; |
| 82 }; | 88 }; |
| 83 | 89 |
| 84 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 90 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
| OLD | NEW |