| 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 18 matching lines...) Expand all Loading... |
| 68 | 69 |
| 69 namespace content { | 70 namespace content { |
| 70 class RenderWidgetHostImpl; | 71 class RenderWidgetHostImpl; |
| 71 class RenderWidgetHostView; | 72 class RenderWidgetHostView; |
| 72 class ResizeLock; | 73 class ResizeLock; |
| 73 | 74 |
| 74 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h. | 75 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h. |
| 75 class CONTENT_EXPORT RenderWidgetHostViewAura | 76 class CONTENT_EXPORT RenderWidgetHostViewAura |
| 76 : public RenderWidgetHostViewBase, | 77 : public RenderWidgetHostViewBase, |
| 77 public ui::CompositorObserver, | 78 public ui::CompositorObserver, |
| 79 public ui::CompositorVSyncManager::Observer, |
| 78 public ui::TextInputClient, | 80 public ui::TextInputClient, |
| 79 public gfx::DisplayObserver, | 81 public gfx::DisplayObserver, |
| 80 public aura::RootWindowObserver, | 82 public aura::RootWindowObserver, |
| 81 public aura::WindowDelegate, | 83 public aura::WindowDelegate, |
| 82 public aura::client::ActivationDelegate, | 84 public aura::client::ActivationDelegate, |
| 83 public aura::client::ActivationChangeObserver, | 85 public aura::client::ActivationChangeObserver, |
| 84 public aura::client::FocusChangeObserver, | 86 public aura::client::FocusChangeObserver, |
| 85 public aura::client::CursorClientObserver, | 87 public aura::client::CursorClientObserver, |
| 86 public ImageTransportFactoryObserver, | 88 public ImageTransportFactoryObserver, |
| 87 public BrowserAccessibilityDelegate, | 89 public BrowserAccessibilityDelegate, |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 void UnlockResources(); | 363 void UnlockResources(); |
| 362 | 364 |
| 363 // Overridden from ui::CompositorObserver: | 365 // Overridden from ui::CompositorObserver: |
| 364 virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE; | 366 virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE; |
| 365 virtual void OnCompositingStarted(ui::Compositor* compositor, | 367 virtual void OnCompositingStarted(ui::Compositor* compositor, |
| 366 base::TimeTicks start_time) OVERRIDE; | 368 base::TimeTicks start_time) OVERRIDE; |
| 367 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; | 369 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; |
| 368 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE; | 370 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE; |
| 369 virtual void OnCompositingLockStateChanged( | 371 virtual void OnCompositingLockStateChanged( |
| 370 ui::Compositor* compositor) OVERRIDE; | 372 ui::Compositor* compositor) OVERRIDE; |
| 371 virtual void OnUpdateVSyncParameters(ui::Compositor* compositor, | 373 |
| 372 base::TimeTicks timebase, | 374 // Overridden from ui::CompositorVSyncManager::Observer |
| 375 virtual void OnUpdateVSyncParameters(base::TimeTicks timebase, |
| 373 base::TimeDelta interval) OVERRIDE; | 376 base::TimeDelta interval) OVERRIDE; |
| 374 | 377 |
| 375 private: | 378 private: |
| 376 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); | 379 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); |
| 377 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); | 380 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); |
| 378 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); | 381 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); |
| 379 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); | 382 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); |
| 380 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 383 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 381 SkippedDelegatedFrames); | 384 SkippedDelegatedFrames); |
| 382 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); | 385 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 772 // passed to windowless plugins like Flash/Silverlight, etc as the | 775 // passed to windowless plugins like Flash/Silverlight, etc as the |
| 773 // container window. | 776 // container window. |
| 774 HWND plugin_parent_window_; | 777 HWND plugin_parent_window_; |
| 775 #endif | 778 #endif |
| 776 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 779 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 777 }; | 780 }; |
| 778 | 781 |
| 779 } // namespace content | 782 } // namespace content |
| 780 | 783 |
| 781 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 784 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |