2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
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
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
2022-08-17 18:35:53 +00:00
|
|
|
index 7438cdf5604e237b46a22a2dd808aa6d031aea5f..fe882b31026b527df28d384e6e7e7cccaee61d61 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
2022-08-17 18:35:53 +00:00
|
|
|
@@ -309,6 +309,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
|
2018-09-14 18:03:43 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
} // namespace
|
2018-09-14 18:03:43 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
+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.
|
|
|
|
//
|
2022-08-17 18:35:53 +00:00
|
|
|
@@ -359,7 +363,8 @@ class HWNDMessageHandler::ScopedRedrawLock {
|
2022-06-01 06:12:47 +00:00
|
|
|
hwnd_(owner_->hwnd()),
|
2018-09-14 05:02:16 +00:00
|
|
|
cancel_unlock_(false),
|
|
|
|
should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
|
2022-06-01 06:12:47 +00:00
|
|
|
- ::IsWindow(hwnd_) && !owner_->IsHeadless() &&
|
|
|
|
+ ::IsWindow(hwnd_) && !owner_->HasNativeFrame() &&
|
|
|
|
+ !owner_->IsHeadless() &&
|
2018-09-14 05:02:16 +00:00
|
|
|
(!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
|
|
|
|
!ui::win::IsAeroGlassEnabled())) {
|
|
|
|
if (should_lock_)
|
2022-08-17 18:35:53 +00:00
|
|
|
@@ -1052,6 +1057,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
|
2019-10-18 19:57:34 +00:00
|
|
|
return scoped_enable;
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
2018-09-14 18:03:43 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
+bool HWNDMessageHandler::HasNativeFrame() {
|
|
|
|
+ return delegate_->HasNativeFrame();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// HWNDMessageHandler, gfx::WindowImpl overrides:
|
2018-09-14 18:03:43 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
|
2022-08-17 18:35:53 +00:00
|
|
|
index cdc283b7e1aa89c8a273c4df97ad8aea55024743..caa02c07b371569be5ac5ac3ce7efe40359cd017 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/ui/views/win/hwnd_message_handler.h
|
|
|
|
+++ b/ui/views/win/hwnd_message_handler.h
|
2022-06-27 20:50:08 +00:00
|
|
|
@@ -207,6 +207,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
|
2019-03-21 22:45:52 +00:00
|
|
|
using TouchIDs = std::set<DWORD>;
|
2019-08-24 01:14:23 +00:00
|
|
|
enum class DwmFrameState { kOff, kOn };
|
2018-09-14 18:03:43 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
+ 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
|
2022-06-27 20:50:08 +00:00
|
|
|
index d8e0f1d3131aef80c9fcb6069df7d7f986af6605..5dbb192d0840ca0ded61397c399b774a8cb05cce 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/ui/views/win/hwnd_message_handler_delegate.h
|
|
|
|
+++ b/ui/views/win/hwnd_message_handler_delegate.h
|
2019-01-16 18:07:52 +00:00
|
|
|
@@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
|
2018-09-14 05:02:16 +00:00
|
|
|
// True if the widget associated with this window has a non-client view.
|
|
|
|
virtual bool HasNonClientView() const = 0;
|
2018-09-14 18:03:43 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
+ 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;
|