mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
5d80264944
* chore: bump chromium in DEPS to 145.0.7620.0 * chore: bump chromium in DEPS to 145.0.7622.0 * chore: bump chromium in DEPS to 145.0.7624.0 * chore: bump chromium in DEPS to 145.0.7626.0 * chore: bump chromium in DEPS to 145.0.7628.0 * 7362759: Migrate various base::Contains() to contains() in ui | https://chromium-review.googlesource.com/c/chromium/src/+/7362759 * chore: update patches * 7411324: url: Mark deprecated functions as UNSAFE_BUFFER_USAGE https://chromium-review.googlesource.com/c/chromium/src/+/7411324 * 7366867: Store property info in CSSParserLocalContext for random() https://chromium-review.googlesource.com/c/chromium/src/+/7366867 * 7277406: Exclude PiP from getDisplayMedia picker thumbnails https://chromium-review.googlesource.com/c/chromium/src/+/7277406 * 7253489: activity_reporter: Create stub module owned by browser_process https://chromium-review.googlesource.com/c/chromium/src/+/7253489 * 7404514: Create device parental controls delegate https://chromium-review.googlesource.com/c/chromium/src/+/7404514 * 7269504: Update histograms to use the updated MediaStreamRequestResult enum https://chromium-review.googlesource.com/c/chromium/src/+/7269504 * fixup! 7253489: activity_reporter: Create stub module owned by browser_process * 7368549: Reland "Use native rollup" https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7368549 * 4803165: Enable suppressing input event dispatch while paint-holding. https://chromium-review.googlesource.com/c/chromium/src/+/4803165 * chore: make device_parental_controls lazy --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Shelley Vohr <shelley.vohr@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 16057c4a0ed0f700262c1c5835ca93a1db96bf6f..7d87c92682e4f7b5e5ee5e51850ce57eaf5d0cf2 100644
|
|
--- a/content/renderer/render_thread_impl.cc
|
|
+++ b/content/renderer/render_thread_impl.cc
|
|
@@ -1154,11 +1154,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*
|