| 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 base::TimeTicks start_time) OVERRIDE; | 377 base::TimeTicks start_time) OVERRIDE; |
| 378 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; | 378 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE; |
| 379 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE; | 379 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE; |
| 380 virtual void OnCompositingLockStateChanged( | 380 virtual void OnCompositingLockStateChanged( |
| 381 ui::Compositor* compositor) OVERRIDE; | 381 ui::Compositor* compositor) OVERRIDE; |
| 382 | 382 |
| 383 // Overridden from ui::CompositorVSyncManager::Observer | 383 // Overridden from ui::CompositorVSyncManager::Observer |
| 384 virtual void OnUpdateVSyncParameters(base::TimeTicks timebase, | 384 virtual void OnUpdateVSyncParameters(base::TimeTicks timebase, |
| 385 base::TimeDelta interval) OVERRIDE; | 385 base::TimeDelta interval) OVERRIDE; |
| 386 | 386 |
| 387 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; |
| 388 |
| 387 private: | 389 private: |
| 388 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); | 390 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); |
| 389 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); | 391 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); |
| 390 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); | 392 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); |
| 391 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); | 393 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); |
| 392 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 394 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 393 SkippedDelegatedFrames); | 395 SkippedDelegatedFrames); |
| 394 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); | 396 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); |
| 395 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 397 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 396 DiscardDelegatedFrames); | 398 DiscardDelegatedFrames); |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 // etc. | 792 // etc. |
| 791 scoped_ptr<content::LegacyRenderWidgetHostHWND> | 793 scoped_ptr<content::LegacyRenderWidgetHostHWND> |
| 792 legacy_render_widget_host_HWND_; | 794 legacy_render_widget_host_HWND_; |
| 793 #endif | 795 #endif |
| 794 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 796 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 795 }; | 797 }; |
| 796 | 798 |
| 797 } // namespace content | 799 } // namespace content |
| 798 | 800 |
| 799 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 801 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |