mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
f8c7408279
* chore: bump chromium in DEPS to 100.0.4896.56 * chore: update patches Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
21 lines
829 B
Diff
21 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 03b92fd7a6218d3469648b96f273377d84c2f13f..d7ca333c81fd5765da047acf54aaeb5e07ab4c26 100644
|
|
--- a/content/renderer/render_thread_impl.cc
|
|
+++ b/content/renderer/render_thread_impl.cc
|
|
@@ -1344,7 +1344,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
|
}
|
|
|
|
bool RenderThreadImpl::IsElasticOverscrollEnabled() {
|
|
- return is_elastic_overscroll_enabled_;
|
|
+ return base::CommandLine::ForCurrentProcess()->HasSwitch("scroll-bounce");
|
|
}
|
|
|
|
gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
|