37db307153
* chore: bump chromium in DEPS to 461ecae368fd0832f18e0b13e61f3561d83f0031 * update patches * update patches * Remove both vs browser/child split in content gn files. https://chromium-review.googlesource.com/c/chromium/src/+/2157965 * chore: bump chromium in DEPS to 7ff3897f3104563763ef26ad940d4e988d7245dd * update patches * update patches * Add ElectronKioskDelegate for extensions https://chromium-review.googlesource.com/c/chromium/src/+/2159760 Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Electron Bot <anonymous@electronjs.org>
20 lines
829 B
Diff
20 lines
829 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 9e4a61421d3c4980c775f3fa21781b6f8f679ca1..123622e032d7af432e6ee86e357eba5e56574adb 100644
|
|
--- a/content/renderer/render_thread_impl.cc
|
|
+++ b/content/renderer/render_thread_impl.cc
|
|
@@ -1346,7 +1346,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() {
|
|
}
|
|
|
|
bool RenderThreadImpl::IsElasticOverscrollEnabled() {
|
|
- return is_elastic_overscroll_enabled_;
|
|
+ return base::CommandLine::ForCurrentProcess()->HasSwitch("scroll-bounce");
|
|
}
|
|
|
|
bool RenderThreadImpl::IsUseZoomForDSFEnabled() {
|