From fc7e38903e4ff97fa38d00bc18e70d121e8493a9 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Mon, 9 Nov 2020 14:21:16 -0800 Subject: [PATCH 1/2] chore: cherry-pick 8f24f935c903 from chromium --- patches/chromium/.patches | 1 + .../chromium/cherry-pick-8f24f935c903.patch | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 patches/chromium/cherry-pick-8f24f935c903.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index d126dec5aca47..e9126eb159cc8 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -149,3 +149,4 @@ cherry-pick-30261f9de11e.patch cherry-pick-88f263f401b4.patch cherry-pick-229fdaf8fc05.patch cherry-pick-1ed869ad4bb3.patch +cherry-pick-8f24f935c903.patch diff --git a/patches/chromium/cherry-pick-8f24f935c903.patch b/patches/chromium/cherry-pick-8f24f935c903.patch new file mode 100644 index 0000000000000..ad676463953fa --- /dev/null +++ b/patches/chromium/cherry-pick-8f24f935c903.patch @@ -0,0 +1,41 @@ +From 8f24f935c90374af613965a48525e8c3a7928c95 Mon Sep 17 00:00:00 2001 +From: Adrian Taylor +Date: Thu, 05 Nov 2020 08:50:39 +0000 +Subject: [PATCH] Prevent overflow of drag image on Windows. + +(cherry picked from commit 236b1a349111fc945c741f85e1b1e2e04d9c42ff) + +(cherry picked from commit 5f61af8f3af5efd0d915a51da6df822678d959b9) + +Bug: 1144489 +Change-Id: I130adffc1c69073295537aaff3ce7054260064fc +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2513345 +Reviewed-by: Krishna Govind +Cr-Original-Original-Commit-Position: refs/branch-heads/4310@{#4} +Cr-Original-Original-Branched-From: 3e31ebb7467fdc4295f123385825b8c95ef13332-refs/heads/master@{#822916} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2513349 +Reviewed-by: Adrian Taylor +Commit-Queue: Krishna Govind +Cr-Original-Commit-Position: refs/branch-heads/4240@{#1373} +Cr-Original-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517728 +Reviewed-by: Achuith Bhandarkar +Commit-Queue: Victor-Gabriel Savu +Cr-Commit-Position: refs/branch-heads/4240_112@{#18} +Cr-Branched-From: 427c00d3874b6abcf4c4c2719768835fc3ef26d6-refs/branch-heads/4240@{#1291} +Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218} +--- + +diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc +index f5ec26a..9eb9c8d 100644 +--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc ++++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc +@@ -707,7 +707,7 @@ + int width = unpremul_bitmap.width(); + int height = unpremul_bitmap.height(); + size_t rowbytes = unpremul_bitmap.rowBytes(); +- DCHECK_EQ(rowbytes, static_cast(width) * 4u); ++ CHECK_EQ(rowbytes, static_cast(width) * 4u); + + void* bits; + HBITMAP hbitmap; From 5f47ad0dd7719502c0314025b4082b80696d0ced Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Mon, 9 Nov 2020 22:34:53 +0000 Subject: [PATCH 2/2] update patches --- patches/chromium/cherry-pick-8f24f935c903.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/patches/chromium/cherry-pick-8f24f935c903.patch b/patches/chromium/cherry-pick-8f24f935c903.patch index ad676463953fa..59c4821d546f6 100644 --- a/patches/chromium/cherry-pick-8f24f935c903.patch +++ b/patches/chromium/cherry-pick-8f24f935c903.patch @@ -1,7 +1,7 @@ -From 8f24f935c90374af613965a48525e8c3a7928c95 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Adrian Taylor -Date: Thu, 05 Nov 2020 08:50:39 +0000 -Subject: [PATCH] Prevent overflow of drag image on Windows. +Date: Thu, 5 Nov 2020 08:50:39 +0000 +Subject: Prevent overflow of drag image on Windows. (cherry picked from commit 236b1a349111fc945c741f85e1b1e2e04d9c42ff) @@ -24,13 +24,12 @@ Commit-Queue: Victor-Gabriel Savu Cr-Commit-Position: refs/branch-heads/4240_112@{#18} Cr-Branched-From: 427c00d3874b6abcf4c4c2719768835fc3ef26d6-refs/branch-heads/4240@{#1291} Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218} ---- diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc -index f5ec26a..9eb9c8d 100644 +index c5183eaab9986d668d7b109fef13205f54ff80fa..847920ada50bae2615c964fc82ea3dc696b86e8a 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc -@@ -707,7 +707,7 @@ +@@ -714,7 +714,7 @@ void OSExchangeDataProviderWin::SetDragImage( int width = unpremul_bitmap.width(); int height = unpremul_bitmap.height(); size_t rowbytes = unpremul_bitmap.rowBytes();