1bbb407dc9
* chore: bump chromium in DEPS to 99e60beb593ecf98f8a441e3f03a13b68cfcb311 * update patches * chore: bump chromium in DEPS to b1abadda21f417ba5e8276c4dd779d31445d16cd * update patches * 2146532: gtkui: Fix standalone Ozone/Wayland configuration https://chromium-review.googlesource.com/c/chromium/src/+/2146532 * 2145152: Pass source URL when setting a cookie https://chromium-review.googlesource.com/c/chromium/src/+/2145152 * lint * chore: bump chromium in DEPS to 8897189f1da5a3670bbe32d343767fd71f80d779 * chore: bump chromium in DEPS to 8ac51eeee93a02ed5b81f47e28627079edeecde0 * chore: bump chromium in DEPS to e897b8003f3a5f3c8d654eee9b03c513046ae7ea * chore: bump chromium in DEPS to 7b80f9c82122600291d041c530698616a4716cdf * Update patches * Move definition of WebInputEvent enums into mojo https://chromium-review.googlesource.com/c/chromium/src/+/2152777 * update patches Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net> Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
76 lines
3.5 KiB
Diff
76 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 0328f536a10de1ff4b6fd0a70c1b80c260aa7b87..2bb93842c74feb1d3f33d4589b7a75ceff8858ef 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -306,6 +306,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.
|
|
//
|
|
@@ -357,6 +361,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_)
|
|
@@ -969,6 +974,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 4da6edd086c9df20af7cdcb5c6020cd61166fbea..81b300c2533a3aaa6e0c343405a6040351061e27 100644
|
|
--- a/ui/views/win/hwnd_message_handler.h
|
|
+++ b/ui/views/win/hwnd_message_handler.h
|
|
@@ -203,6 +203,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 98efa2b7c4033c9ce8c73f7201e68e85baf05bba..4f0897ecc675d3e366ec07df28e09698c6b6e4cf 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;
|