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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2737943002: Temporarily disable GestureFlingStart input DCHECK. (Closed)
Patch Set: Created 3 years, 9 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "content/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <set> 9 #include <set>
10 #include <tuple> 10 #include <tuple>
(...skipping 1079 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 bool* is_in_gesture_scroll = 1090 bool* is_in_gesture_scroll =
1091 gesture_event.sourceDevice == 1091 gesture_event.sourceDevice ==
1092 blink::WebGestureDevice::WebGestureDeviceTouchpad 1092 blink::WebGestureDevice::WebGestureDeviceTouchpad
1093 ? &is_in_touchpad_gesture_scroll_ 1093 ? &is_in_touchpad_gesture_scroll_
1094 : &is_in_touchscreen_gesture_scroll_; 1094 : &is_in_touchscreen_gesture_scroll_;
1095 if (gesture_event.type() == blink::WebInputEvent::GestureScrollBegin) { 1095 if (gesture_event.type() == blink::WebInputEvent::GestureScrollBegin) {
1096 DCHECK(!(*is_in_gesture_scroll)); 1096 DCHECK(!(*is_in_gesture_scroll));
1097 *is_in_gesture_scroll = true; 1097 *is_in_gesture_scroll = true;
1098 } else if (gesture_event.type() == blink::WebInputEvent::GestureScrollEnd || 1098 } else if (gesture_event.type() == blink::WebInputEvent::GestureScrollEnd ||
1099 gesture_event.type() == blink::WebInputEvent::GestureFlingStart) { 1099 gesture_event.type() == blink::WebInputEvent::GestureFlingStart) {
1100 DCHECK(*is_in_gesture_scroll || 1100 // TODO(wjmaclean): Re-enable the following DCHECK once crbug.com/695187
1101 (gesture_event.type() == blink::WebInputEvent::GestureFlingStart && 1101 // is fixed.
1102 gesture_event.sourceDevice == 1102 // DCHECK(*is_in_gesture_scroll ||
1103 blink::WebGestureDevice::WebGestureDeviceTouchpad)); 1103 // (gesture_event.type() == blink::WebInputEvent::GestureFlingStart &&
1104 // gesture_event.sourceDevice ==
1105 // blink::WebGestureDevice::WebGestureDeviceTouchpad));
1104 *is_in_gesture_scroll = false; 1106 *is_in_gesture_scroll = false;
1105 } 1107 }
1106 1108
1107 bool scroll_update_needs_wrapping = 1109 bool scroll_update_needs_wrapping =
1108 gesture_event.type() == blink::WebInputEvent::GestureScrollUpdate && 1110 gesture_event.type() == blink::WebInputEvent::GestureScrollUpdate &&
1109 gesture_event.resendingPluginId != -1 && !(*is_in_gesture_scroll); 1111 gesture_event.resendingPluginId != -1 && !(*is_in_gesture_scroll);
1110 1112
1111 // TODO(crbug.com/544782): Fix WebViewGuestScrollTest.TestGuestWheelScrolls- 1113 // TODO(crbug.com/544782): Fix WebViewGuestScrollTest.TestGuestWheelScrolls-
1112 // Bubble to test the resending logic of gesture events. 1114 // Bubble to test the resending logic of gesture events.
1113 if (scroll_update_needs_wrapping) { 1115 if (scroll_update_needs_wrapping) {
(...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after
2515 // different from the receiver's. 2517 // different from the receiver's.
2516 file_system_file.url = 2518 file_system_file.url =
2517 GURL(storage::GetIsolatedFileSystemRootURIString( 2519 GURL(storage::GetIsolatedFileSystemRootURIString(
2518 file_system_url.origin(), filesystem_id, std::string()) 2520 file_system_url.origin(), filesystem_id, std::string())
2519 .append(register_name)); 2521 .append(register_name));
2520 file_system_file.filesystem_id = filesystem_id; 2522 file_system_file.filesystem_id = filesystem_id;
2521 } 2523 }
2522 } 2524 }
2523 2525
2524 } // namespace content 2526 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698