diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp b/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp index e3f6034df..721be4603 100644 --- a/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp +++ b/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp @@ -423,7 +423,7 @@ void WebPage::setUserScripts(const Vector<String>& scripts) PageGroup* pageGroup = PageGroup::pageGroup(this->pageGroup()->identifier()); pageGroup->removeUserScriptsFromWorld(mainThreadNormalWorld()); for (unsigned i = 0; i < scripts.size(); ++i) - pageGroup->addUserScriptToWorld(mainThreadNormalWorld(), scripts.at(i), KURL(), nullptr, nullptr, InjectAtDocumentEnd, InjectInTopFrameOnly); + pageGroup->addUserScriptToWorld(mainThreadNormalWorld(), scripts.at(i), KURL(), Vector<String>(), Vector<String>(), InjectAtDocumentEnd, InjectInTopFrameOnly); } void WebPage::selectedIndex(int32_t newIndex) @@ -440,21 +440,4 @@ void WebPage::hidePopupMenu() m_activePopupMenu = 0; } -bool WebPage::handleMouseReleaseEvent(const PlatformMouseEvent& platformMouseEvent) -{ -#ifndef QT_NO_CLIPBOARD - if (platformMouseEvent.button() != WebCore::MiddleButton) - return false; - - if (qApp->clipboard()->supportsSelection()) { - WebCore::Frame* focusFrame = m_page->focusController()->focusedOrMainFrame(); - if (focusFrame) { - focusFrame->editor()->command(AtomicString("PasteGlobalSelection")).execute(); - return true; - } - } -#endif - return false; -} - } // namespace WebKit |