diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 13:43:59 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 13:43:59 +0000 |
| commit | 5264cde7cec1460e0c0e540829d1a6456639eed1 (patch) | |
| tree | 5b5d6c707be656f60d7cd95edfab424b7fa4150f /ui/base | |
| parent | 3b2528815c7a4a2e6ad7f31e43cacc7ac7b920bc (diff) | |
| download | chromium_src-5264cde7cec1460e0c0e540829d1a6456639eed1.zip chromium_src-5264cde7cec1460e0c0e540829d1a6456639eed1.tar.gz chromium_src-5264cde7cec1460e0c0e540829d1a6456639eed1.tar.bz2 | |
Roll Skia DEPS to r7869
control: https://codereview.chromium.org/12335104/
Review URL: https://codereview.chromium.org/12319120
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/dragdrop/drag_utils_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/base/dragdrop/drag_utils_win.cc b/ui/base/dragdrop/drag_utils_win.cc index f03c9d7..b760fa8 100644 --- a/ui/base/dragdrop/drag_utils_win.cc +++ b/ui/base/dragdrop/drag_utils_win.cc @@ -46,7 +46,7 @@ static HBITMAP CreateHBITMAPFromSkBitmap(const SkBitmap& sk_bitmap) { HBITMAP bitmap = CreateDIBSection(screen_dc, reinterpret_cast<BITMAPINFO*>(&header), DIB_RGB_COLORS, &bits, NULL, 0); - DCHECK(sk_bitmap.rowBytes() == sk_bitmap.width() * 4); + DCHECK_EQ(sk_bitmap.rowBytes(), static_cast<size_t>(sk_bitmap.width() * 4)); SkAutoLockPixels lock(sk_bitmap); memcpy( bits, sk_bitmap.getPixels(), sk_bitmap.height() * sk_bitmap.rowBytes()); |