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

chore: remove desktop_screen_win.patch (#15232)

Browse source 
that function is never called with a null argument (all call-sites are guarded)
This commit is contained in:
Jeremy Apthorp 2018-10-17 16:59:46 -07:00 • committed by GitHub
parent af9cbb4514
commit ac6d815c0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/common/chromium/.patches.yaml
View file

@ -100,10 +100,6 @@ patches:
author: null author: null
file: compositor_delegate.patch file: compositor_delegate.patch
description: null description: null
-
author: null
file: desktop_screen_win.patch
description: null
- -
author: Cheng Zhao <zcbenz@gmail.com> author: Cheng Zhao <zcbenz@gmail.com>
file: disable_hidden.patch file: disable_hidden.patch

22
patches/common/chromium/desktop_screen_win.patch
View file

@ -1,22 +0,0 @@
From 0dbac64c4877f7783726d3bc04f332a1491285b7 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@electronjs.org>
Date: Thu, 20 Sep 2018 17:45:44 -0700
Subject: desktop_screen_win.patch
diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.cc b/ui/views/widget/desktop_aura/desktop_screen_win.cc
index f772f64d656e..7d13f9f81b6c 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_win.cc
@@ -32,6 +32,8 @@ display::Display DesktopScreenWin::GetDisplayMatching(
}
HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
+ if (!window)
+ return NULL;
aura::WindowTreeHost* host = window->GetHost();
return host ? host->GetAcceleratedWidget() : NULL;
}
--
2.17.0