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 19 matching lines...) Expand all Loading... |
30 #include "third_party/skia/include/core/SkRegion.h" | 30 #include "third_party/skia/include/core/SkRegion.h" |
31 #include "ui/aura/client/activation_change_observer.h" | 31 #include "ui/aura/client/activation_change_observer.h" |
32 #include "ui/aura/client/activation_delegate.h" | 32 #include "ui/aura/client/activation_delegate.h" |
33 #include "ui/aura/client/cursor_client_observer.h" | 33 #include "ui/aura/client/cursor_client_observer.h" |
34 #include "ui/aura/client/focus_change_observer.h" | 34 #include "ui/aura/client/focus_change_observer.h" |
35 #include "ui/aura/root_window_observer.h" | 35 #include "ui/aura/root_window_observer.h" |
36 #include "ui/aura/window_delegate.h" | 36 #include "ui/aura/window_delegate.h" |
37 #include "ui/base/ime/text_input_client.h" | 37 #include "ui/base/ime/text_input_client.h" |
38 #include "ui/compositor/compositor.h" | 38 #include "ui/compositor/compositor.h" |
39 #include "ui/compositor/compositor_observer.h" | 39 #include "ui/compositor/compositor_observer.h" |
| 40 #include "ui/compositor/compositor_vsync_manager.h" |
40 #include "ui/gfx/display_observer.h" | 41 #include "ui/gfx/display_observer.h" |
41 #include "ui/gfx/rect.h" | 42 #include "ui/gfx/rect.h" |
42 #include "webkit/common/cursors/webcursor.h" | 43 #include "webkit/common/cursors/webcursor.h" |
43 | 44 |
44 namespace aura { | 45 namespace aura { |
45 class WindowTracker; | 46 class WindowTracker; |
46 namespace client { | 47 namespace client { |
47 class ScopedTooltipDisabler; | 48 class ScopedTooltipDisabler; |
48 } | 49 } |
49 } | 50 } |
(...skipping 22 matching lines...) Expand all Loading... |
72 #endif | 73 #endif |
73 | 74 |
74 class RenderWidgetHostImpl; | 75 class RenderWidgetHostImpl; |
75 class RenderWidgetHostView; | 76 class RenderWidgetHostView; |
76 class ResizeLock; | 77 class ResizeLock; |
77 | 78 |
78 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h. | 79 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h. |
79 class CONTENT_EXPORT RenderWidgetHostViewAura | 80 class CONTENT_EXPORT RenderWidgetHostViewAura |
80 : public RenderWidgetHostViewBase, | 81 : public RenderWidgetHostViewBase, |
81 public ui::CompositorObserver, | 82 public ui::CompositorObserver, |
| 83 public ui::CompositorVSyncManager::Observer, |
82 public ui::TextInputClient, | 84 public ui::TextInputClient, |
83 public gfx::DisplayObserver, | 85 public gfx::DisplayObserver, |
84 public aura::RootWindowObserver, | 86 public aura::RootWindowObserver, |
85 public aura::WindowDelegate, | 87 public aura::WindowDelegate, |
86 public aura::client::ActivationDelegate, | 88 public aura::client::ActivationDelegate, |
87 public aura::client::ActivationChangeObserver, | 89 public aura::client::ActivationChangeObserver, |
88 public aura::client::FocusChangeObserver, | 90 public aura::client::FocusChangeObserver, |
89 public aura::client::CursorClientObserver, | 91 public aura::client::CursorClientObserver, |
90 public ImageTransportFactoryObserver, | 92 public ImageTransportFactoryObserver, |
91 public BrowserAccessibilityDelegate, | 93 public BrowserAccessibilityDelegate, |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 void UnlockResources(); | 367 void UnlockResources(); |
366 | 368 |
367 // Overridden from ui::CompositorObserver: | 369 // Overridden from ui::CompositorObserver: |
368 virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE; | 370 virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE; |
369 virtual void OnCompositingStarted(ui::Compositor* compositor, | 371 virtual void OnCompositingStarted(ui::Compositor* compositor, |
370 base::TimeTicks start_time) OVERRIDE; | 372 base::TimeTicks start_time) OVERRIDE; |
371 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; | 373 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; |
372 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE; | 374 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE; |
373 virtual void OnCompositingLockStateChanged( | 375 virtual void OnCompositingLockStateChanged( |
374 ui::Compositor* compositor) OVERRIDE; | 376 ui::Compositor* compositor) OVERRIDE; |
375 virtual void OnUpdateVSyncParameters(ui::Compositor* compositor, | 377 |
376 base::TimeTicks timebase, | 378 // Overridden from ui::CompositorVSyncManager::Observer |
| 379 virtual void OnUpdateVSyncParameters(base::TimeTicks timebase, |
377 base::TimeDelta interval) OVERRIDE; | 380 base::TimeDelta interval) OVERRIDE; |
378 | 381 |
379 private: | 382 private: |
380 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); | 383 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); |
381 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); | 384 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); |
382 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); | 385 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); |
383 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); | 386 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); |
384 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 387 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
385 SkippedDelegatedFrames); | 388 SkippedDelegatedFrames); |
386 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); | 389 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
779 // etc. | 782 // etc. |
780 scoped_ptr<content::LegacyRenderWidgetHostHWND> | 783 scoped_ptr<content::LegacyRenderWidgetHostHWND> |
781 legacy_render_widget_host_HWND_; | 784 legacy_render_widget_host_HWND_; |
782 #endif | 785 #endif |
783 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 786 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
784 }; | 787 }; |
785 | 788 |
786 } // namespace content | 789 } // namespace content |
787 | 790 |
788 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 791 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |