| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 ui { | 63 namespace ui { |
| 64 class CompositorLock; | 64 class CompositorLock; |
| 65 class CompositorVSyncManager; |
| 65 class InputMethod; | 66 class InputMethod; |
| 66 class LocatedEvent; | 67 class LocatedEvent; |
| 67 class Texture; | 68 class Texture; |
| 68 } | 69 } |
| 69 | 70 |
| 70 namespace content { | 71 namespace content { |
| 71 #if defined(OS_WIN) | 72 #if defined(OS_WIN) |
| 72 class LegacyRenderWidgetHostHWND; | 73 class LegacyRenderWidgetHostHWND; |
| 73 #endif | 74 #endif |
| 74 | 75 |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 633 base::string16 tooltip_; | 634 base::string16 tooltip_; |
| 634 | 635 |
| 635 std::vector<base::Closure> on_compositing_did_commit_callbacks_; | 636 std::vector<base::Closure> on_compositing_did_commit_callbacks_; |
| 636 | 637 |
| 637 // The current frontbuffer texture. | 638 // The current frontbuffer texture. |
| 638 scoped_refptr<ui::Texture> current_surface_; | 639 scoped_refptr<ui::Texture> current_surface_; |
| 639 | 640 |
| 640 // This holds the current software framebuffer, if any. | 641 // This holds the current software framebuffer, if any. |
| 641 scoped_ptr<SoftwareFrameManager> software_frame_manager_; | 642 scoped_ptr<SoftwareFrameManager> software_frame_manager_; |
| 642 | 643 |
| 644 // The vsync manager we are observing for changes, if any. |
| 645 scoped_refptr<ui::CompositorVSyncManager> vsync_manager_; |
| 646 |
| 643 // With delegated renderer, this is the last output surface, used to | 647 // With delegated renderer, this is the last output surface, used to |
| 644 // disambiguate resources with the same id coming from different output | 648 // disambiguate resources with the same id coming from different output |
| 645 // surfaces. | 649 // surfaces. |
| 646 uint32 last_output_surface_id_; | 650 uint32 last_output_surface_id_; |
| 647 | 651 |
| 648 // The number of delegated frame acks that are pending, to delay resource | 652 // The number of delegated frame acks that are pending, to delay resource |
| 649 // returns until the acks are sent. | 653 // returns until the acks are sent. |
| 650 int pending_delegated_ack_count_; | 654 int pending_delegated_ack_count_; |
| 651 | 655 |
| 652 // The damage in the previously presented buffer. | 656 // The damage in the previously presented buffer. |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 782 // etc. | 786 // etc. |
| 783 scoped_ptr<content::LegacyRenderWidgetHostHWND> | 787 scoped_ptr<content::LegacyRenderWidgetHostHWND> |
| 784 legacy_render_widget_host_HWND_; | 788 legacy_render_widget_host_HWND_; |
| 785 #endif | 789 #endif |
| 786 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 790 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 787 }; | 791 }; |
| 788 | 792 |
| 789 } // namespace content | 793 } // namespace content |
| 790 | 794 |
| 791 #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 |