diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 16:27:28 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 16:27:28 +0000 |
| commit | 2abd00dd89a5cbc9af4a88a59269fdf9f988cf12 (patch) | |
| tree | cc689f58674cc2004100a01aa88cf6bf2e8ac9e7 /chrome/browser/views/tab_contents | |
| parent | a00b0322403064d54f84165be0911eb81d3e44dd (diff) | |
| download | chromium_src-2abd00dd89a5cbc9af4a88a59269fdf9f988cf12.zip chromium_src-2abd00dd89a5cbc9af4a88a59269fdf9f988cf12.tar.gz chromium_src-2abd00dd89a5cbc9af4a88a59269fdf9f988cf12.tar.bz2 | |
Fix crash when dragging thumbnail on NTP.
BUG=11457
TEST=Drag thumbnail on NTP. Shouldn't dcheck.
Review URL: http://codereview.chromium.org/2807023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tab_contents')
| -rw-r--r-- | chrome/browser/views/tab_contents/tab_contents_drag_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc index f1e22da..54a16fa 100644 --- a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc @@ -292,8 +292,10 @@ void TabContentsDragWin::DoDragging(const WebDropData& drop_data, } // Set drag image. - drag_utils::SetDragImageOnDataObject( - image, gfx::Size(image.width(), image.height()), image_offset, &data); + if (!image.isNull()) { + drag_utils::SetDragImageOnDataObject( + image, gfx::Size(image.width(), image.height()), image_offset, &data); + } // Keep a local reference to drag_source_ in case that EndDragging is called // before DoDragDrop returns. |