Paste at the beginning of a middle click rather than after letting the page h...

webkit/glue/webview_impl.cc

Index: webkit/glue/webview_impl.cc
===================================================================
--- webkit/glue/webview_impl.cc	(revision 21448)
+++ webkit/glue/webview_impl.cc	(working copy)
@@ -542,20 +542,10 @@
   if (!main_frame() || !main_frame()->frameview())
     return;
 
-  mouseCaptureLost();
-  main_frame()->frame()->eventHandler()->handleMouseReleaseEvent(
-      MakePlatformMouseEvent(main_frame()->frameview(), event));
-
-#if defined(OS_WIN)
-  // Dispatch the contextmenu event regardless of if the click was swallowed.
-  // On Mac/Linux, we handle it on mouse down, not up.
-  if (event.button == WebMouseEvent::ButtonRight)
-    MouseContextMenu(event);
-#endif
-
 #if defined(OS_LINUX)
   // If the event was a middle click, attempt to copy text into the focused
-  // frame.
+  // frame. We execute this before we let the page have a go at the event
+  // because the page may change what is focused during in its event handler.
   //
   // This code is in the mouse up handler. There is some debate about putting
   // this here, as opposed to the mouse down handler.
@@ -571,15 +561,24 @@
   // handleMouseReleaseEvent() earlier in this function
   if (event.button == WebMouseEvent::ButtonMiddle) {
     Frame* focused = GetFocusedWebCoreFrame();
-    if (!focused)
-      return;
-    Editor* editor = focused->editor();
-    if (!editor || !editor->canEdit())
-      return;
-
-    delegate_->PasteFromSelectionClipboard();
+    if (focused) {
+      Editor* editor = focused->editor();
+      if (editor && editor->canEdit())
+        delegate_->PasteFromSelectionClipboard();
+    }
   }
 #endif
+
+  mouseCaptureLost();
+  main_frame()->frame()->eventHandler()->handleMouseReleaseEvent(
+      MakePlatformMouseEvent(main_frame()->frameview(), event));
+
+#if defined(OS_WIN)
+  // Dispatch the contextmenu event regardless of if the click was swallowed.
+  // On Mac/Linux, we handle it on mouse down, not up.
+  if (event.button == WebMouseEvent::ButtonRight)
+    MouseContextMenu(event);
+#endif
 }
 
 void WebViewImpl::MouseWheel(const WebMouseWheelEvent& event) {