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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 ~RenderWidgetHostViewAura() override; | 357 ~RenderWidgetHostViewAura() override; |
358 | 358 |
359 // Exposed for tests. | 359 // Exposed for tests. |
360 aura::Window* window() { return window_; } | 360 aura::Window* window() { return window_; } |
361 SkColorType PreferredReadbackFormat() override; | 361 SkColorType PreferredReadbackFormat() override; |
362 DelegatedFrameHost* GetDelegatedFrameHost() const { | 362 DelegatedFrameHost* GetDelegatedFrameHost() const { |
363 return delegated_frame_host_.get(); | 363 return delegated_frame_host_.get(); |
364 } | 364 } |
365 const ui::MotionEventAura& pointer_state() const { return pointer_state_; } | 365 const ui::MotionEventAura& pointer_state() const { return pointer_state_; } |
366 | 366 |
| 367 // Reset unchange touch point to StateStationary for touchmove and |
| 368 // touchcancel. |
| 369 void MarkUnchangedTouchPointsAsStationary(blink::WebTouchEvent* event, |
| 370 int touch_id); |
| 371 |
367 private: | 372 private: |
368 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 373 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
369 PopupRetainsCaptureAfterMouseRelease); | 374 PopupRetainsCaptureAfterMouseRelease); |
370 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); | 375 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); |
371 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); | 376 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); |
372 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 377 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
373 TouchEventPositionsArentRounded); | 378 TouchEventPositionsArentRounded); |
374 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); | 379 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); |
375 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, Resize); | 380 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, Resize); |
376 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); | 381 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 // compositing surface and showing the disambiguation popup. | 675 // compositing surface and showing the disambiguation popup. |
671 gfx::Vector2dF disambiguation_scroll_offset_; | 676 gfx::Vector2dF disambiguation_scroll_offset_; |
672 | 677 |
673 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 678 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
674 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 679 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
675 }; | 680 }; |
676 | 681 |
677 } // namespace content | 682 } // namespace content |
678 | 683 |
679 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 684 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |