mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
56f042f5e5
* chore: bump chromium in DEPS to 110.0.5481.24 * chore: update patches * 4098946: Migrate Extension::Create() argument to base::Value::Dict (part 4 of 4) https://chromium-review.googlesource.com/c/chromium/src/+/4098946 (cherry picked from commit716a0f66f6) * chore: bump chromium in DEPS to 110.0.5481.30 * chore: update patches * chore: cleanup password from keychain after test (cherry picked from commit6c3b0f84c5) * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
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 2ac91dcba1d7af4878822dd476843b8205fd37e7..bdcede45d246b7d89e21c5a2e23f89b9a6dd8eff 100644
|
|
--- a/content/renderer/render_thread_impl.cc
|
|
+++ b/content/renderer/render_thread_impl.cc
|
|
@@ -1336,7 +1336,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
|
}
|
|
|
|
bool RenderThreadImpl::IsElasticOverscrollEnabled() {
|
|
- return is_elastic_overscroll_enabled_;
|
|
+ return base::CommandLine::ForCurrentProcess()->HasSwitch("scroll-bounce");
|
|
}
|
|
|
|
gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
|