Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 1120293003: Make sure send one WebTouchEvent ack per ui::TouchEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use touch_id and add unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 SetTouchPointStateStationary(blink::WebTouchEvent* event, int touch_id);
jdduke (slow) 2015/05/08 02:20:32 If we need this let's go ahead and make it static.
370
367 private: 371 private:
368 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 372 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
369 PopupRetainsCaptureAfterMouseRelease); 373 PopupRetainsCaptureAfterMouseRelease);
370 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); 374 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText);
371 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); 375 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState);
372 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 376 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
373 TouchEventPositionsArentRounded); 377 TouchEventPositionsArentRounded);
374 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); 378 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync);
375 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, Resize); 379 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, Resize);
376 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); 380 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow);
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 // compositing surface and showing the disambiguation popup. 674 // compositing surface and showing the disambiguation popup.
671 gfx::Vector2dF disambiguation_scroll_offset_; 675 gfx::Vector2dF disambiguation_scroll_offset_;
672 676
673 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 677 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
674 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 678 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
675 }; 679 };
676 680
677 } // namespace content 681 } // namespace content
678 682
679 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 683 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698