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

The problem is that the page changes the focused area in the mouse release handler.

Even after this fix, it is possible to paste into the wrong place. The place that gets the text is whichever text input is focused when the browser sends back the clipboard contents, not the text input that is focused when the middle click is handled. This has always been true but seems harmless in most cases.

BUG=17504
TEST=open gmail chat. Put something in your PRIMARY. Click in the text entry area. Middle click in the chat display area. The selection shouldn't paste into the text entry. Otherwise, middle click paste should still work.
TEST=the reduction in the bug acts as expected
Review URL: http://codereview.chromium.org/160065

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21553 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 19 deletions

diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 17ff9eb..78d4610 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -543,20 +543,10 @@ void WebViewImpl::MouseUp(const WebMouseEvent& event) {
   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.
@@ -572,15 +562,24 @@ void WebViewImpl::MouseUp(const WebMouseEvent& event) {
   // 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) {