diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 22:16:05 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 22:16:05 +0000 |
| commit | 65a6150d49263ff6e3135c5631f9ba5eb12823df (patch) | |
| tree | 36f5b8624ae02cc69ae29ade9923404f6fec80b3 /webkit/glue/webview_impl.cc | |
| parent | 9f53c7d5f1ce83bb2025b1797300c6d60dd7d8ff (diff) | |
| download | chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.zip chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.tar.gz chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.tar.bz2 | |
Roll webkit deps 48155:48185 and remove a couple of passing tests from test_expectations.txt.
Also, merge in http://codereview.chromium.org/174367 (original author: vandebo@chromium.org), which is the downstream half of r48168.
BUG=4360
BUG=21228
BUG=18792
TEST=none
TBR=eroman
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webview_impl.cc')
| -rw-r--r-- | webkit/glue/webview_impl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index cc9ebbd..f3cf268 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -35,6 +35,7 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "NodeRenderStyle.h" #include "Page.h" #include "PageGroup.h" +#include "Pasteboard.h" #include "PlatformContextSkia.h" #include "PlatformKeyboardEvent.h" #include "PlatformMouseEvent.h" @@ -564,8 +565,11 @@ void WebViewImpl::MouseUp(const WebMouseEvent& event) { ShouldHitTestScrollbars); if (!hit_test_result.scrollbar() && focused) { Editor* editor = focused->editor(); - if (editor && editor->canEdit()) - delegate_->PasteFromSelectionClipboard(); + Pasteboard* pasteboard = Pasteboard::generalPasteboard(); + bool oldSelectionMode = pasteboard->isSelectionMode(); + pasteboard->setSelectionMode(true); + editor->command(AtomicString("Paste")).execute(); + pasteboard->setSelectionMode(oldSelectionMode); } } #endif |