mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 520c02b46668fc608927e0fcd79b6a90885a48bf
* chore: bump chromium in DEPS to 90.0.4414.0
* resolve chromium conflicts
* resolve v8 conflicts
* fix node gn files
* 2673502: Remove RenderViewCreated use from ExtensionHost.
https://chromium-review.googlesource.com/c/chromium/src/+/2673502
* 2676903: [mojo] Remove most legacy Binding classes.
https://chromium-review.googlesource.com/c/chromium/src/+/2676903
* 2644847: Move self-deleting URLLoaderFactory base into //services/network.
https://chromium-review.googlesource.com/c/chromium/src/+/2644847
* 2664006: Remove from mojo::DataPipe.
https://chromium-review.googlesource.com/c/chromium/src/+/2664006
* 2674530: Remove CertVerifierService feature
https://chromium-review.googlesource.com/c/chromium/src/+/2674530
* 2668748: Move OnSSLCertificateError to a new interface.
https://chromium-review.googlesource.com/c/chromium/src/+/2668748
* 2672923: Remove RAPPOR reporting infrastructure.
https://chromium-review.googlesource.com/c/chromium/src/+/2672923
* 2673502: Remove RenderViewCreated use from ExtensionHost.
https://chromium-review.googlesource.com/c/chromium/src/+/2673502
* 2655126: Convert FrameHostMsg_ContextMenu and FrameMsg_ContextMenuClosed|CustomContextMenuAction to Mojo
https://chromium-review.googlesource.com/c/chromium/src/+/2655126
* 2628705: Window Placement: Implement screen.isExtended and change event
https://chromium-review.googlesource.com/c/chromium/src/+/2628705
* 2643161: Refactor storage::kFileSystem*Native*
https://chromium-review.googlesource.com/c/chromium/src/+/2643161
* fix build
* only remove the biggest subdir of //ios
* chore: bump chromium in DEPS to 90.0.4415.0
* update patches
* update sysroots
* 2686147: Remove WebContentsObserver::RenderViewCreated().
https://chromium-review.googlesource.com/c/chromium/src/+/2686147
* 2596429: Fixing how extension's split and spanning modes affect OriginAccessList.
https://chromium-review.googlesource.com/c/chromium/src/+/2596429
* 2686026: [mojo] Delete AssociatedInterfacePtr (replaced by AssociatedRemote)
https://chromium-review.googlesource.com/c/chromium/src/+/2686026
* 2651705: Move ui/base/dragdrop/file_info to ui/base/clipboard
https://chromium-review.googlesource.com/c/chromium/src/+/2651705
* 358217: drawBitmap is deprecated
https://skia-review.googlesource.com/c/skia/+/358217
* fix gn check
* 2678098: Use gen/front_end as input to generate_devtools_grd
https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2678098
* 2674530: Remove CertVerifierService feature
https://chromium-review.googlesource.com/c/chromium/src/+/2674530
* fixup 2664006: Remove from mojo::DataPipe.
https://chromium-review.googlesource.com/c/chromium/src/+/2664006
* fixup build_add_electron_tracing_category.patch
* 2673415: [base] Prepare CrashReporterClient for string16 switch
https://chromium-review.googlesource.com/c/chromium/src/+/2673415
* 2673413: Add CursorFactoryWin to handle Cursors on Windows
https://chromium-review.googlesource.com/c/chromium/src/+/2673413
* 2668748: Move OnSSLCertificateError to a new interface.
https://chromium-review.googlesource.com/c/chromium/src/+/2668748
* fix mas gn check
* update patch after merge
* Update node for .mjs files
* build: load v8_prof_processor dependencies as ESM
* chore: add patch to fix linux 32bit
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
(cherry picked from commit ca75bca667)
Co-authored-by: Electron Bot <electron@github.com>
77 lines
3.5 KiB
Diff
77 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Heilig Benedek <benecene@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:47:54 -0700
|
|
Subject: disable-redraw-lock.patch
|
|
|
|
Chromium uses a custom window titlebar implementation on Windows when DWM
|
|
is disabled (Windows 7 and earlier, non Aero theme). The native titlebar
|
|
sometimes painted over this custom titlebar, so a workaround was put in
|
|
place to lock redraws in reaction to certain events if DWM is disabled,
|
|
since the code assumes that in that case, the custom titlebar is painted.
|
|
Electron forces the use of the native titlebar, which the workaround doesn't
|
|
take into account, and still locks redraws, causing weird repainting issues
|
|
in electron (and other applications). This patch provides a way to disable
|
|
the redraw locking mechanism, which fixes these issues. The electron issue
|
|
can be found at https://github.com/electron/electron/issues/1821
|
|
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
|
index 0a3940b751709585b94e356e0beb02cd81f6e871..1013375edabb6e59338bcd9266f04ee09668098e 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -305,6 +305,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
|
|
|
|
} // namespace
|
|
|
|
+bool HWNDMessageHandlerDelegate::HasNativeFrame() const {
|
|
+ return false;
|
|
+}
|
|
+
|
|
// A scoping class that prevents a window from being able to redraw in response
|
|
// to invalidations that may occur within it for the lifetime of the object.
|
|
//
|
|
@@ -356,6 +360,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
|
|
cancel_unlock_(false),
|
|
should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
|
|
::IsWindow(hwnd_) &&
|
|
+ !owner_->HasNativeFrame() &&
|
|
(!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
|
|
!ui::win::IsAeroGlassEnabled())) {
|
|
if (should_lock_)
|
|
@@ -971,6 +976,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
|
|
return scoped_enable;
|
|
}
|
|
|
|
+bool HWNDMessageHandler::HasNativeFrame() {
|
|
+ return delegate_->HasNativeFrame();
|
|
+}
|
|
+
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// HWNDMessageHandler, gfx::WindowImpl overrides:
|
|
|
|
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
|
|
index 042392a659fd6934e84d66cc985d25863e365e34..5e88e780c3da4805eae7870291188e636423042e 100644
|
|
--- a/ui/views/win/hwnd_message_handler.h
|
|
+++ b/ui/views/win/hwnd_message_handler.h
|
|
@@ -202,6 +202,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
|
|
using TouchIDs = std::set<DWORD>;
|
|
enum class DwmFrameState { kOff, kOn };
|
|
|
|
+ bool HasNativeFrame();
|
|
+
|
|
// Overridden from WindowImpl:
|
|
HICON GetDefaultWindowIcon() const override;
|
|
HICON GetSmallWindowIcon() const override;
|
|
diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
|
|
index 7344cdd4cf7d68da617b81cbdf464a859a40fb09..9ec1f23b26b41e10a46be0ca5d254583b6534ecb 100644
|
|
--- a/ui/views/win/hwnd_message_handler_delegate.h
|
|
+++ b/ui/views/win/hwnd_message_handler_delegate.h
|
|
@@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
|
|
// True if the widget associated with this window has a non-client view.
|
|
virtual bool HasNonClientView() const = 0;
|
|
|
|
+ virtual bool HasNativeFrame() const;
|
|
+
|
|
// Returns who we want to be drawing the frame. Either the system (Windows)
|
|
// will handle it or Chrome will custom draw it.
|
|
virtual FrameMode GetFrameMode() const = 0;
|