diff options
| -rw-r--r-- | webkit/glue/webview_impl.cc | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index d057b09..e40d27b 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -477,21 +477,6 @@ void WebViewImpl::MouseDown(const WebMouseEvent& event) { 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. - if (event.button == WebMouseEvent::ButtonMiddle) { - Frame* focused = GetFocusedWebCoreFrame(); - if (!focused) - return; - Editor* editor = focused->editor(); - if (!editor || !editor->canEdit()) - return; - - delegate_->PasteFromSelectionClipboard(); - } -#endif } void WebViewImpl::MouseContextMenu(const WebMouseEvent& event) { @@ -535,6 +520,34 @@ void WebViewImpl::MouseUp(const WebMouseEvent& event) { 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. + // + // This code is in the mouse up handler. There is some debate about putting + // this here, as opposed to the mouse down handler. + // xterm: pastes on up. + // GTK: pastes on down. + // Firefox: pastes on up. + // Midori: couldn't paste at all with 0.1.2 + // + // There is something of a webcompat angle to this well, as highlighted by + // crbug.com/14608. Pages can clear text boxes 'onclick' and, if we paste on + // down then the text is pasted just before the onclick handler runs and + // clears the text box. So it's important this happens after the + // 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(); + } +#endif } void WebViewImpl::MouseWheel(const WebMouseWheelEvent& event) { |