Browse Source

chore: remove disable_scroll_begin_dcheck.patch (#15233)

Jeremy Apthorp 6 years ago
parent
commit
af339f44f4

+ 0 - 7
patches/common/chromium/.patches.yaml

@@ -243,13 +243,6 @@ patches:
     https://chromium.googlesource.com/chromium/src/+/f47b361887a31cccf42a6e21a82bccf28372bdaa%5E%21
     In the long term we should investigate why it happened, and take a more
     formal fix. But for now I'm just make this assertion silently pass away.
--
-  author: Cheng Zhao <[email protected]>
-  file: disable_scroll_begin_dcheck.patch
-  description: |
-    When testing https://github.com/electron/electron/issues/13137 I have met
-    these assertions. I grouped them together since they are all related to the
-    ScrollBegin event.
 -
   author: Jeremy Apthorp <[email protected]>
   file: libgtkui_export.patch

+ 0 - 40
patches/common/chromium/disable_scroll_begin_dcheck.patch

@@ -1,40 +0,0 @@
-From 56f1078f33969f1d3c097b398a10d251ea774add Mon Sep 17 00:00:00 2001
-From: Cheng Zhao <[email protected]>
-Date: Thu, 20 Sep 2018 17:48:27 -0700
-Subject: disable_scroll_begin_dcheck.patch
-
-When testing https://github.com/electron/electron/issues/13137 I have met
-these assertions. I grouped them together since they are all related to the
-ScrollBegin event.
-
-diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
-index 702915772e4f..71fb66a7401c 100644
---- a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
-+++ b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
-@@ -295,7 +295,7 @@ void MouseWheelEventQueue::SendScrollEnd(WebGestureEvent update_event,
- void MouseWheelEventQueue::SendScrollBegin(
-     const WebGestureEvent& gesture_update,
-     bool synthetic) {
--  DCHECK(!client_->IsWheelScrollInProgress());
-+  // DCHECK(!client_->IsWheelScrollInProgress());
- 
-   WebGestureEvent scroll_begin(gesture_update);
-   scroll_begin.SetType(WebInputEvent::kGestureScrollBegin);
-diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 28879dc5e9bb..222b5d7e91ec 100644
---- a/content/browser/renderer_host/render_widget_host_impl.cc
-+++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -1321,8 +1321,8 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
-     // GSB and GSU events instead of sending them to the renderer and continues
-     // to progress the fling. So, the renderer doesn't receive two GSB events
-     // without any GSE in between.
--    DCHECK(!is_in_gesture_scroll_[gesture_event.SourceDevice()] ||
--           FlingCancellationIsDeferred());
-+    // DCHECK(!is_in_gesture_scroll_[gesture_event.SourceDevice()] ||
-+    //        FlingCancellationIsDeferred());
-     is_in_gesture_scroll_[gesture_event.SourceDevice()] = true;
-   } else if (gesture_event.GetType() ==
-              blink::WebInputEvent::kGestureScrollEnd) {
--- 
-2.17.0
-