| 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_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 namespace cc { | 38 namespace cc { |
| 39 class DelegatedFrameData; | 39 class DelegatedFrameData; |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace gfx { | 42 namespace gfx { |
| 43 class Canvas; | 43 class Canvas; |
| 44 class Display; | 44 class Display; |
| 45 } | 45 } |
| 46 | 46 |
| 47 namespace gpu { |
| 48 struct Mailbox; |
| 49 } |
| 50 |
| 47 namespace ui { | 51 namespace ui { |
| 48 class CompositorLock; | 52 class CompositorLock; |
| 49 class InputMethod; | 53 class InputMethod; |
| 50 class Texture; | 54 class Texture; |
| 51 } | 55 } |
| 52 | 56 |
| 53 namespace content { | 57 namespace content { |
| 54 class RenderWidgetHostImpl; | 58 class RenderWidgetHostImpl; |
| 55 class RenderWidgetHostView; | 59 class RenderWidgetHostView; |
| 56 | 60 |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 | 357 |
| 354 // Converts |rect| from window coordinate to screen coordinate. | 358 // Converts |rect| from window coordinate to screen coordinate. |
| 355 gfx::Rect ConvertRectToScreen(const gfx::Rect& rect); | 359 gfx::Rect ConvertRectToScreen(const gfx::Rect& rect); |
| 356 | 360 |
| 357 typedef base::Callback<void(bool, const scoped_refptr<ui::Texture>&)> | 361 typedef base::Callback<void(bool, const scoped_refptr<ui::Texture>&)> |
| 358 BufferPresentedCallback; | 362 BufferPresentedCallback; |
| 359 | 363 |
| 360 // The common entry point for full buffer updates from renderer | 364 // The common entry point for full buffer updates from renderer |
| 361 // and GPU process. | 365 // and GPU process. |
| 362 void BuffersSwapped(const gfx::Size& size, | 366 void BuffersSwapped(const gfx::Size& size, |
| 363 const std::string& mailbox_name, | 367 const gpu::Mailbox& mailbox_name, |
| 364 const BufferPresentedCallback& ack_callback); | 368 const BufferPresentedCallback& ack_callback); |
| 365 | 369 |
| 366 bool SwapBuffersPrepare(const gfx::Rect& surface_rect, | 370 bool SwapBuffersPrepare(const gfx::Rect& surface_rect, |
| 367 const gfx::Rect& damage_rect, | 371 const gfx::Rect& damage_rect, |
| 368 const std::string& mailbox_name, | 372 const gpu::Mailbox& mailbox_name, |
| 369 const BufferPresentedCallback& ack_callback); | 373 const BufferPresentedCallback& ack_callback); |
| 370 | 374 |
| 371 void SwapBuffersCompleted( | 375 void SwapBuffersCompleted( |
| 372 const BufferPresentedCallback& ack_callback, | 376 const BufferPresentedCallback& ack_callback, |
| 373 const scoped_refptr<ui::Texture>& texture_to_return); | 377 const scoped_refptr<ui::Texture>& texture_to_return); |
| 374 | 378 |
| 375 void SwapDelegatedFrame( | 379 void SwapDelegatedFrame( |
| 376 scoped_ptr<cc::DelegatedFrameData> frame, | 380 scoped_ptr<cc::DelegatedFrameData> frame, |
| 377 float device_scale_factor); | 381 float device_scale_factor); |
| 378 void SendDelegatedFrameAck(); | 382 void SendDelegatedFrameAck(); |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 #endif | 537 #endif |
| 534 | 538 |
| 535 base::TimeTicks last_draw_ended_; | 539 base::TimeTicks last_draw_ended_; |
| 536 | 540 |
| 537 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 541 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 538 }; | 542 }; |
| 539 | 543 |
| 540 } // namespace content | 544 } // namespace content |
| 541 | 545 |
| 542 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 546 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |