| Index: content/browser/web_contents/web_contents_view_android.cc
|
| diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
|
| index c5a8e50c394792bbc20cff34d5859c6d7806178d..f5b6743af56214a0192f34810a331431cebf7a8a 100644
|
| --- a/content/browser/web_contents/web_contents_view_android.cc
|
| +++ b/content/browser/web_contents/web_contents_view_android.cc
|
| @@ -251,8 +251,12 @@ void WebContentsViewAndroid::StartDragging(
|
| ScopedJavaLocalRef<jstring> jtext =
|
| ConvertUTF16ToJavaString(env, drop_data.text.string());
|
|
|
| - native_view->StartDragAndDrop(jtext,
|
| - gfx::ConvertToJavaBitmap(image.bitmap()));
|
| + if (!native_view->StartDragAndDrop(
|
| + jtext, gfx::ConvertToJavaBitmap(image.bitmap()))) {
|
| + // Need to clear drag and drop state in blink.
|
| + OnDragEnded();
|
| + return;
|
| + }
|
|
|
| if (content_view_core_)
|
| content_view_core_->HidePopupsAndPreserveSelection();
|
|
|