| 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <queue> | 9 #include <queue> |
| 10 | 10 |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 void RequestContentClipping(const gfx::Rect& clipping, | 234 void RequestContentClipping(const gfx::Rect& clipping, |
| 235 const gfx::Size& content_size); | 235 const gfx::Size& content_size); |
| 236 | 236 |
| 237 // Returns true when animation ticks are still needed. This avoids a separate | 237 // Returns true when animation ticks are still needed. This avoids a separate |
| 238 // round-trip for requesting follow-up animation. | 238 // round-trip for requesting follow-up animation. |
| 239 bool Animate(base::TimeTicks frame_time); | 239 bool Animate(base::TimeTicks frame_time); |
| 240 | 240 |
| 241 void SynchronousFrameMetadata( | 241 void SynchronousFrameMetadata( |
| 242 const cc::CompositorFrameMetadata& frame_metadata); | 242 const cc::CompositorFrameMetadata& frame_metadata); |
| 243 | 243 |
| 244 void SetOverlayVideoMode(bool enabled); |
| 245 |
| 244 private: | 246 private: |
| 245 void BuffersSwapped(const gpu::Mailbox& mailbox, | 247 void BuffersSwapped(const gpu::Mailbox& mailbox, |
| 246 uint32_t output_surface_id, | 248 uint32_t output_surface_id, |
| 247 const base::Closure& ack_callback); | 249 const base::Closure& ack_callback); |
| 248 | 250 |
| 249 void RunAckCallbacks(); | 251 void RunAckCallbacks(); |
| 250 | 252 |
| 251 void SwapDelegatedFrame(uint32 output_surface_id, | 253 void SwapDelegatedFrame(uint32 output_surface_id, |
| 252 scoped_ptr<cc::DelegatedFrameData> frame_data); | 254 scoped_ptr<cc::DelegatedFrameData> frame_data); |
| 253 void SendDelegatedFrameAck(uint32 output_surface_id); | 255 void SendDelegatedFrameAck(uint32 output_surface_id); |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; | 327 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; |
| 326 | 328 |
| 327 std::queue<base::Closure> ack_callbacks_; | 329 std::queue<base::Closure> ack_callbacks_; |
| 328 | 330 |
| 329 // Used to render overscroll overlays. | 331 // Used to render overscroll overlays. |
| 330 bool overscroll_effect_enabled_; | 332 bool overscroll_effect_enabled_; |
| 331 scoped_ptr<OverscrollGlow> overscroll_effect_; | 333 scoped_ptr<OverscrollGlow> overscroll_effect_; |
| 332 | 334 |
| 333 bool flush_input_requested_; | 335 bool flush_input_requested_; |
| 334 | 336 |
| 337 bool overlay_video_mode_; |
| 338 |
| 335 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); | 339 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); |
| 336 }; | 340 }; |
| 337 | 341 |
| 338 } // namespace content | 342 } // namespace content |
| 339 | 343 |
| 340 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 344 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
| OLD | NEW |