Chromium Code Reviews| Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc |
| diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc |
| index 660c9e85f8a146e5dc63e0b470a2b0d90e946cdf..0dc489ce3e3a7c0c5057566dd2b13f297a407ea4 100644 |
| --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc |
| +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc |
| @@ -329,6 +329,13 @@ void DesktopDragDropClientAuraX11::X11DragContext::OnSelectionNotify( |
| return; |
| } |
| DCHECK(drag_drop_client_); |
| + |
| + if (event.property == None) { |
| + // The selection conversion failed. This actually happens in real life. |
| + // http://crbug.com/628099 |
|
Elliot Glaysher
2016/09/27 23:39:10
Should this be an early return or a check around a
pwnall
2016/09/30 20:02:17
Done.
Thank you very much for asking this question
|
| + return; |
| + } |
| + |
| DCHECK_EQ(event.property, atom_cache_->GetAtom(kChromiumDragReciever)); |
| scoped_refptr<base::RefCountedMemory> data; |