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

Side by Side Diff: components/test_runner/event_sender.cc

Issue 2047093002: Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Remove unused, uninitialized variable on mac causing occasional failure Created 4 years, 6 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
« no previous file with comments | « components/test_runner/event_sender.h ('k') | components/test_runner/web_test_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "components/test_runner/event_sender.h" 5 #include "components/test_runner/event_sender.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 WebMouseEvent::ButtonNone; 1189 WebMouseEvent::ButtonNone;
1190 1190
1191 EventSender::SavedEvent::SavedEvent() 1191 EventSender::SavedEvent::SavedEvent()
1192 : type(TYPE_UNSPECIFIED), 1192 : type(TYPE_UNSPECIFIED),
1193 button_type(WebMouseEvent::ButtonNone), 1193 button_type(WebMouseEvent::ButtonNone),
1194 milliseconds(0), 1194 milliseconds(0),
1195 modifiers(0) {} 1195 modifiers(0) {}
1196 1196
1197 EventSender::EventSender(WebTestProxyBase* web_test_proxy_base) 1197 EventSender::EventSender(WebTestProxyBase* web_test_proxy_base)
1198 : web_test_proxy_base_(web_test_proxy_base), 1198 : web_test_proxy_base_(web_test_proxy_base),
1199 send_wheel_gestures_(false),
1200 replaying_saved_events_(false), 1199 replaying_saved_events_(false),
1201 weak_factory_(this) { 1200 weak_factory_(this) {
1202 Reset(); 1201 Reset();
1203 } 1202 }
1204 1203
1205 EventSender::~EventSender() {} 1204 EventSender::~EventSender() {}
1206 1205
1207 void EventSender::Reset() { 1206 void EventSender::Reset() {
1208 DCHECK(current_drag_data_.isNull()); 1207 DCHECK(current_drag_data_.isNull());
1209 current_drag_data_.reset(); 1208 current_drag_data_.reset();
(...skipping 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after
2540 if (!args->PeekNext().IsEmpty()) { 2539 if (!args->PeekNext().IsEmpty()) {
2541 v8::Local<v8::Value> value; 2540 v8::Local<v8::Value> value;
2542 args->GetNext(&value); 2541 args->GetNext(&value);
2543 modifiers = GetKeyModifiersFromV8(args->isolate(), value); 2542 modifiers = GetKeyModifiersFromV8(args->isolate(), value);
2544 if (!args->PeekNext().IsEmpty()) { 2543 if (!args->PeekNext().IsEmpty()) {
2545 args->GetNext(&can_scroll); 2544 args->GetNext(&can_scroll);
2546 } 2545 }
2547 } 2546 }
2548 } 2547 }
2549 } 2548 }
2550 if (can_scroll && send_wheel_gestures_) { 2549 if (can_scroll) {
2551 can_scroll = false; 2550 can_scroll = false;
2552 *send_gestures = true; 2551 *send_gestures = true;
2553 } 2552 }
2554 2553
2555 InitMouseEvent(WebInputEvent::MouseWheel, 2554 InitMouseEvent(WebInputEvent::MouseWheel,
2556 current_pointer_state_[kMousePointerId].pressed_button_, 2555 current_pointer_state_[kMousePointerId].pressed_button_,
2557 current_pointer_state_[kMousePointerId].current_buttons_, 2556 current_pointer_state_[kMousePointerId].current_buttons_,
2558 current_pointer_state_[kMousePointerId].last_pos_, 2557 current_pointer_state_[kMousePointerId].last_pos_,
2559 GetCurrentEventTimeSec(), 2558 GetCurrentEventTimeSec(),
2560 click_count_, 2559 click_count_,
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
2814 2813
2815 const blink::WebView* EventSender::view() const { 2814 const blink::WebView* EventSender::view() const {
2816 return web_test_proxy_base_->web_view(); 2815 return web_test_proxy_base_->web_view();
2817 } 2816 }
2818 2817
2819 blink::WebView* EventSender::view() { 2818 blink::WebView* EventSender::view() {
2820 return web_test_proxy_base_->web_view(); 2819 return web_test_proxy_base_->web_view();
2821 } 2820 }
2822 2821
2823 } // namespace test_runner 2822 } // namespace test_runner
OLDNEW
« no previous file with comments | « components/test_runner/event_sender.h ('k') | components/test_runner/web_test_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698