diff options
| -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. |