mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
9f80b64617
* chore: bump chromium in DEPS to 147.0.7716.0 * chore: bump chromium in DEPS to 147.0.7717.0 * chore: bump chromium in DEPS to 147.0.7719.0 * chore: update patches Refs https://chromium-review.googlesource.com/c/chromium/src/+/7618634 Refs https://chromium-review.googlesource.com/c/chromium/src/+/7622595 * [Extensions] Track service worker lifecycle more precisely Refs https://chromium-review.googlesource.com/c/chromium/src/+/7567646 * Make Clipboard::ReadAsciiText|ReadData|ReadText|ReadAvailableTypes asynchronous Refs https://chromium-review.googlesource.com/c/chromium/src/+/7609958 https://chromium-review.googlesource.com/c/chromium/src/+/7600360 https://chromium-review.googlesource.com/c/chromium/src/+/7595942 https://chromium-review.googlesource.com/c/chromium/src/+/7594881 * fixup! Make Clipboard::ReadAsciiText|ReadData|ReadText|ReadAvailableTypes asynchronous --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
26 lines
990 B
Diff
26 lines
990 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:49:03 -0700
|
|
Subject: scroll_bounce_flag.patch
|
|
|
|
Patch to make scrollBounce option work.
|
|
|
|
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
|
index 9f16560b06c390ad1fc82001f8c44a64abd1d89a..7c5c60d2a91cc5ffdd1c1eec753a7a1ab4af6036 100644
|
|
--- a/content/renderer/render_thread_impl.cc
|
|
+++ b/content/renderer/render_thread_impl.cc
|
|
@@ -1133,11 +1133,11 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
|
}
|
|
|
|
bool RenderThreadImpl::IsElasticOverscrollEnabledOnRoot() {
|
|
- return is_elastic_overscroll_enabled_on_root_;
|
|
+ return base::CommandLine::ForCurrentProcess()->HasSwitch("scroll-bounce");
|
|
}
|
|
|
|
bool RenderThreadImpl::IsElasticOverscrollSupported() {
|
|
- return is_elastic_overscroll_supported_;
|
|
+ return base::CommandLine::ForCurrentProcess()->HasSwitch("scroll-bounce");
|
|
}
|
|
|
|
blink::scheduler::WebThreadScheduler*
|