mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
dd5dd2a426
* chore: bump chromium in DEPS to 93.0.4536.0 * chore: update patches * Make InkDrop a View class property Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918475 Replace old views::Button::ink_drop() calls with views::InkDrop::Get() * Convert use of gfx::ImageSkia to ui::ImageModel for WidgetDelegates Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2935942 Update GetWindowIcon(), GetWindowAppIcon(), and GetDevToolsWindowIcon() to return ui::ImageModel instead of gfx::ImageSkia. Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.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 3a5834f68dadd0de9071c8e7c7bd416d59d40d55..dbaa8c95ab0a5572b2194c02a73ae54b8f676ac7 100644
|
|
--- a/content/renderer/render_thread_impl.cc
|
|
+++ b/content/renderer/render_thread_impl.cc
|
|
@@ -1259,7 +1259,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
|
}
|
|
|
|
bool RenderThreadImpl::IsElasticOverscrollEnabled() {
|
|
- return is_elastic_overscroll_enabled_;
|
|
+ return base::CommandLine::ForCurrentProcess()->HasSwitch("scroll-bounce");
|
|
}
|
|
|
|
gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
|