| 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 <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 class CopyOutputRequest; | 53 class CopyOutputRequest; |
| 54 class CopyOutputResult; | 54 class CopyOutputResult; |
| 55 class DelegatedFrameData; | 55 class DelegatedFrameData; |
| 56 } | 56 } |
| 57 | 57 |
| 58 namespace gfx { | 58 namespace gfx { |
| 59 class Canvas; | 59 class Canvas; |
| 60 class Display; | 60 class Display; |
| 61 } | 61 } |
| 62 | 62 |
| 63 namespace gpu { | |
| 64 struct Mailbox; | |
| 65 } | |
| 66 | |
| 67 namespace ui { | 63 namespace ui { |
| 68 class CompositorLock; | 64 class CompositorLock; |
| 69 class CompositorVSyncManager; | 65 class CompositorVSyncManager; |
| 70 class InputMethod; | 66 class InputMethod; |
| 71 class LocatedEvent; | 67 class LocatedEvent; |
| 72 class Texture; | 68 class Texture; |
| 73 } | 69 } |
| 74 | 70 |
| 75 namespace content { | 71 namespace content { |
| 76 #if defined(OS_WIN) | 72 #if defined(OS_WIN) |
| (...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 527 gfx::Rect ConvertRectFromScreen(const gfx::Rect& rect) const; | 523 gfx::Rect ConvertRectFromScreen(const gfx::Rect& rect) const; |
| 528 | 524 |
| 529 typedef base::Callback<void(bool, const scoped_refptr<ui::Texture>&)> | 525 typedef base::Callback<void(bool, const scoped_refptr<ui::Texture>&)> |
| 530 BufferPresentedCallback; | 526 BufferPresentedCallback; |
| 531 | 527 |
| 532 // The common entry point for buffer updates from renderer | 528 // The common entry point for buffer updates from renderer |
| 533 // and GPU process. | 529 // and GPU process. |
| 534 void BuffersSwapped(const gfx::Size& surface_size, | 530 void BuffersSwapped(const gfx::Size& surface_size, |
| 535 const gfx::Rect& damage_rect, | 531 const gfx::Rect& damage_rect, |
| 536 float surface_scale_factor, | 532 float surface_scale_factor, |
| 537 const gpu::Mailbox& mailbox, | 533 const std::string& mailbox_name, |
| 538 const std::vector<ui::LatencyInfo>& latency_info, | 534 const std::vector<ui::LatencyInfo>& latency_info, |
| 539 const BufferPresentedCallback& ack_callback); | 535 const BufferPresentedCallback& ack_callback); |
| 540 | 536 |
| 541 bool SwapBuffersPrepare(const gfx::Rect& surface_rect, | 537 bool SwapBuffersPrepare(const gfx::Rect& surface_rect, |
| 542 float surface_scale_factor, | 538 float surface_scale_factor, |
| 543 const gfx::Rect& damage_rect, | 539 const gfx::Rect& damage_rect, |
| 544 const gpu::Mailbox& mailbox, | 540 const std::string& mailbox_name, |
| 545 const BufferPresentedCallback& ack_callback); | 541 const BufferPresentedCallback& ack_callback); |
| 546 | 542 |
| 547 void SwapBuffersCompleted( | 543 void SwapBuffersCompleted( |
| 548 const BufferPresentedCallback& ack_callback, | 544 const BufferPresentedCallback& ack_callback, |
| 549 const scoped_refptr<ui::Texture>& texture_to_return); | 545 const scoped_refptr<ui::Texture>& texture_to_return); |
| 550 | 546 |
| 551 void SwapDelegatedFrame( | 547 void SwapDelegatedFrame( |
| 552 uint32 output_surface_id, | 548 uint32 output_surface_id, |
| 553 scoped_ptr<cc::DelegatedFrameData> frame_data, | 549 scoped_ptr<cc::DelegatedFrameData> frame_data, |
| 554 float frame_device_scale_factor, | 550 float frame_device_scale_factor, |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 // etc. | 786 // etc. |
| 791 scoped_ptr<content::LegacyRenderWidgetHostHWND> | 787 scoped_ptr<content::LegacyRenderWidgetHostHWND> |
| 792 legacy_render_widget_host_HWND_; | 788 legacy_render_widget_host_HWND_; |
| 793 #endif | 789 #endif |
| 794 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 790 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 795 }; | 791 }; |
| 796 | 792 |
| 797 } // namespace content | 793 } // namespace content |
| 798 | 794 |
| 799 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 795 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |