|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Adrian Taylor <adetaylor@chromium.org> |
| 3 | +Date: Thu, 5 Nov 2020 08:50:39 +0000 |
| 4 | +Subject: Prevent overflow of drag image on Windows. |
| 5 | + |
| 6 | +(cherry picked from commit 236b1a349111fc945c741f85e1b1e2e04d9c42ff) |
| 7 | + |
| 8 | +(cherry picked from commit 5f61af8f3af5efd0d915a51da6df822678d959b9) |
| 9 | + |
| 10 | +Bug: 1144489 |
| 11 | +Change-Id: I130adffc1c69073295537aaff3ce7054260064fc |
| 12 | +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2513345 |
| 13 | +Reviewed-by: Krishna Govind <govind@chromium.org> |
| 14 | +Cr-Original-Original-Commit-Position: refs/branch-heads/4310@{#4} |
| 15 | +Cr-Original-Original-Branched-From: 3e31ebb7467fdc4295f123385825b8c95ef13332-refs/heads/master@{#822916} |
| 16 | +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2513349 |
| 17 | +Reviewed-by: Adrian Taylor <adetaylor@chromium.org> |
| 18 | +Commit-Queue: Krishna Govind <govind@chromium.org> |
| 19 | +Cr-Original-Commit-Position: refs/branch-heads/4240@{#1373} |
| 20 | +Cr-Original-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218} |
| 21 | +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517728 |
| 22 | +Reviewed-by: Achuith Bhandarkar <achuith@chromium.org> |
| 23 | +Commit-Queue: Victor-Gabriel Savu <vsavu@google.com> |
| 24 | +Cr-Commit-Position: refs/branch-heads/4240_112@{#18} |
| 25 | +Cr-Branched-From: 427c00d3874b6abcf4c4c2719768835fc3ef26d6-refs/branch-heads/4240@{#1291} |
| 26 | +Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218} |
| 27 | + |
| 28 | +diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc |
| 29 | +index 4b7c0656c60b09f61ab201c2900d5b4d6844f4d2..8bf76629985db49bf431f4ce4da6aee141656cc3 100644 |
| 30 | +--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc |
| 31 | ++++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc |
| 32 | +@@ -714,7 +714,7 @@ void OSExchangeDataProviderWin::SetDragImage( |
| 33 | + int width = unpremul_bitmap.width(); |
| 34 | + int height = unpremul_bitmap.height(); |
| 35 | + size_t rowbytes = unpremul_bitmap.rowBytes(); |
| 36 | +- DCHECK_EQ(rowbytes, static_cast<size_t>(width) * 4u); |
| 37 | ++ CHECK_EQ(rowbytes, static_cast<size_t>(width) * 4u); |
| 38 | + |
| 39 | + void* bits; |
| 40 | + HBITMAP hbitmap; |
0 commit comments