mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

rebase chromium patches on M70

Browse source
This commit is contained in:
Jeremy Apthorp 2018-10-24 16:25:48 -07:00 • committed by deepak1556
parent 559fd5cb31
commit 3b4e706758
51 changed files with 234 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/common/chromium/disable-redraw-lock.patch
View file

@ -15,10 +15,10 @@ 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 d5f442f71da7ad3b7087af40967d6df0579803f5..a8f39b0601157dc75d35460eccff67f36bc07941 100644
index 54eb0fcd0bf79bef4c7bfbd07bea27b005e73f61..90a11451be65a152f7bcc77eef360b1b41e41a28 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -281,6 +281,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -282,6 +282,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;
} // namespace
@ -29,7 +29,7 @@ index d5f442f71da7ad3b7087af40967d6df0579803f5..a8f39b0601157dc75d35460eccff67f3
// 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.
//
@@ -332,6 +336,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
@@ -333,6 +337,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
cancel_unlock_(false),
should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
::IsWindow(hwnd_) &&
@ -37,7 +37,7 @@ index d5f442f71da7ad3b7087af40967d6df0579803f5..a8f39b0601157dc75d35460eccff67f3
(!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
!ui::win::IsAeroGlassEnabled())) {
if (should_lock_)
@@ -940,6 +945,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() {
@@ -933,6 +938,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() {
hwnd());
}
@ -49,10 +49,10 @@ index d5f442f71da7ad3b7087af40967d6df0579803f5..a8f39b0601157dc75d35460eccff67f3
// HWNDMessageHandler, gfx::WindowImpl overrides:
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
index 91afedec8e2951e3f0176fce2e84261a3846d218..fa514d102538e141f48ff6af5f5c8fc4d6da17b0 100644
index 593c3c0e95b50c9847994af705c053586e78689f..43e4a26502d837972d8acc68a1e7e7550766ddf6 100644
--- a/ui/views/win/hwnd_message_handler.h
+++ b/ui/views/win/hwnd_message_handler.h
@@ -181,6 +181,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
@@ -182,6 +182,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
typedef std::set<DWORD> TouchIDs;
enum class DwmFrameState { OFF, ON };
@ -62,7 +62,7 @@ index 91afedec8e2951e3f0176fce2e84261a3846d218..fa514d102538e141f48ff6af5f5c8fc4
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 1b2d98a857385d31b5f401d685fd9524da228726..dd080180aebda193ef885bf7f41587802787a3c6 100644
index b3f670dddf8936e29932345ef0516318b904d0ef..a63d727930a43c680ef3672921e63c35fc34191d 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 {