End the drag and drop operation properly.

content/browser/web_contents/web_contents_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "content/browser/android/content_view_core_impl.h"
@@ skipping 216 matching lines @@
   if (content_view_core_)
     content_view_core_->HideSelectPopupMenu();
 }
 
 void WebContentsViewAndroid::StartDragging(
     const DropData& drop_data,
     blink::WebDragOperationsMask allowed_ops,
     const gfx::ImageSkia& image,
     const gfx::Vector2d& image_offset,
     const DragEventSourceInfo& event_info) {
-  if (drop_data.text.is_null())
+  if (drop_data.text.is_null()) {
+    // Need to clear drag and drop state in blink.
+    OnDragEnded();
     return;
+  }
 
   gfx::NativeView native_view = GetNativeView();
-  if (!native_view)
+  if (!native_view) {
+    // Need to clear drag and drop state in blink.
+    OnDragEnded();
     return;
+  }
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jtext =
       ConvertUTF16ToJavaString(env, drop_data.text.string());
 
   native_view->StartDragAndDrop(jtext,
                                 gfx::ConvertToJavaBitmap(image.bitmap()));
 
   if (content_view_core_)
     content_view_core_->HidePopupsAndPreserveSelection();
@@ skipping 47 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content