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/threading/platform_thread.h" | 13 #include "base/threading/platform_thread.h" |
14 #include "base/time.h" | 14 #include "base/time.h" |
| 15 #include "cc/output/begin_frame_args.h" |
15 #include "cc/output/output_surface.h" | 16 #include "cc/output/output_surface.h" |
16 #include "ipc/ipc_sync_message_filter.h" | 17 #include "ipc/ipc_sync_message_filter.h" |
17 | 18 |
18 namespace base { | 19 namespace base { |
19 class TaskRunner; | 20 class TaskRunner; |
20 } | 21 } |
21 | 22 |
22 namespace IPC { | 23 namespace IPC { |
23 class ForwardingMessageFilter; | 24 class ForwardingMessageFilter; |
24 class Message; | 25 class Message; |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 ~CompositorOutputSurfaceProxy() {} | 81 ~CompositorOutputSurfaceProxy() {} |
81 CompositorOutputSurface* output_surface_; | 82 CompositorOutputSurface* output_surface_; |
82 | 83 |
83 DISALLOW_COPY_AND_ASSIGN(CompositorOutputSurfaceProxy); | 84 DISALLOW_COPY_AND_ASSIGN(CompositorOutputSurfaceProxy); |
84 }; | 85 }; |
85 | 86 |
86 void OnMessageReceived(const IPC::Message& message); | 87 void OnMessageReceived(const IPC::Message& message); |
87 void OnUpdateVSyncParameters( | 88 void OnUpdateVSyncParameters( |
88 base::TimeTicks timebase, base::TimeDelta interval); | 89 base::TimeTicks timebase, base::TimeDelta interval); |
89 #if defined(OS_ANDROID) | 90 #if defined(OS_ANDROID) |
90 void OnBeginFrame(base::TimeTicks frame_time); | 91 void OnBeginFrame(const cc::BeginFrameArgs& args); |
91 #endif | 92 #endif |
92 bool Send(IPC::Message* message); | 93 bool Send(IPC::Message* message); |
93 | 94 |
94 bool use_swap_compositor_frame_message_; | 95 bool use_swap_compositor_frame_message_; |
95 | 96 |
96 scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_; | 97 scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_; |
97 scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_; | 98 scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_; |
98 scoped_refptr<IPC::SyncMessageFilter> message_sender_; | 99 scoped_refptr<IPC::SyncMessageFilter> message_sender_; |
99 int routing_id_; | 100 int routing_id_; |
100 bool prefers_smoothness_; | 101 bool prefers_smoothness_; |
101 base::PlatformThreadHandle main_thread_handle_; | 102 base::PlatformThreadHandle main_thread_handle_; |
102 }; | 103 }; |
103 | 104 |
104 } // namespace content | 105 } // namespace content |
105 | 106 |
106 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 107 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
OLD | NEW |