diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/qt')
7 files changed, 39 insertions, 25 deletions
diff --git a/Source/WebKit2/UIProcess/qt/TextCheckerQt.cpp b/Source/WebKit2/UIProcess/qt/TextCheckerQt.cpp index 2e124d5..a28b867 100644 --- a/Source/WebKit2/UIProcess/qt/TextCheckerQt.cpp +++ b/Source/WebKit2/UIProcess/qt/TextCheckerQt.cpp @@ -26,8 +26,8 @@ #include "config.h" #include "TextChecker.h" -#include "NotImplemented.h" #include "TextCheckerState.h" +#include <WebCore/NotImplemented.h> using namespace WebCore; @@ -81,6 +81,11 @@ void TextChecker::updateSpellingUIWithMisspelledWord(const String& misspelledWor notImplemented(); } +void TextChecker::updateSpellingUIWithGrammarString(const String& badGrammarPhrase, const GrammarDetail& grammarDetail) +{ + notImplemented(); +} + void TextChecker::getGuessesForWord(int64_t spellDocumentTag, const String& word, const String& context, Vector<String>& guesses) { notImplemented(); diff --git a/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp index 09638b6..777f98c 100644 --- a/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp @@ -28,6 +28,7 @@ #include "WebContextMenuProxyQt.h" #include <IntPoint.h> +#include <OwnPtr.h> #include <WebContextMenuItemData.h> #include <qmenu.h> #include <qwkpage.h> @@ -81,19 +82,24 @@ PassRefPtr<WebContextMenuProxyQt> WebContextMenuProxyQt::create(QWKPage* page) void WebContextMenuProxyQt::showContextMenu(const IntPoint& position, const Vector<WebContextMenuItemData>& items) { - if (QMenu* menu = createContextMenu(items)) { - menu->move(position); - emit m_page->showContextMenu(menu); - } + OwnPtr<QMenu> menu = createContextMenu(items); + + // We send the signal, even with no items, because the client should be able to show custom items + // even if WebKit has nothing to show. + if (!menu) + menu = adoptPtr(new QMenu); + + menu->move(position); + emit m_page->showContextMenu(QSharedPointer<QMenu>(menu.leakPtr())); } void WebContextMenuProxyQt::hideContextMenu() { } -QMenu* WebContextMenuProxyQt::createContextMenu(const Vector<WebContextMenuItemData>& items) +PassOwnPtr<QMenu> WebContextMenuProxyQt::createContextMenu(const Vector<WebContextMenuItemData>& items) const { - QMenu* menu = new QMenu; + OwnPtr<QMenu> menu = adoptPtr(new QMenu); for (int i = 0; i < items.size(); ++i) { const WebContextMenuItemData& item = items.at(i); switch (item.type()) { @@ -114,9 +120,11 @@ QMenu* WebContextMenuProxyQt::createContextMenu(const Vector<WebContextMenuItemD menu->addSeparator(); break; case WebCore::SubmenuType: - if (QMenu *subMenu = createContextMenu(item.submenu())) { + if (OwnPtr<QMenu> subMenu = createContextMenu(item.submenu())) { + subMenu->setParent(menu.get()); + QMenu* const subMenuPtr = subMenu.leakPtr(); subMenu->setTitle(item.title()); - menu->addAction(subMenu->menuAction()); + menu->addMenu(subMenuPtr); } break; @@ -124,22 +132,19 @@ QMenu* WebContextMenuProxyQt::createContextMenu(const Vector<WebContextMenuItemD } // Do not show sub-menus with just disabled actions. - if (menu->isEmpty()) { - delete menu; - return 0; - } + if (menu->isEmpty()) + return PassOwnPtr<QMenu>(); + bool isAnyActionEnabled = false; QList<QAction *> actions = menu->actions(); for (int i = 0; i < actions.count(); ++i) { if (actions.at(i)->isVisible()) isAnyActionEnabled |= actions.at(i)->isEnabled(); } - if (!isAnyActionEnabled) { - delete menu; - return 0; - } + if (!isAnyActionEnabled) + return PassOwnPtr<QMenu>(); - return menu; + return menu.release(); } } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h b/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h index 435204f..60d83a5 100644 --- a/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h +++ b/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h @@ -28,6 +28,7 @@ #define WebContextMenuProxyQt_h #include "WebContextMenuProxy.h" +#include <PassOwnPtr.h> class QMenu; class QWKPage; @@ -45,7 +46,7 @@ private: virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&); virtual void hideContextMenu(); - QMenu* createContextMenu(const Vector<WebContextMenuItemData>& items); + PassOwnPtr<QMenu> createContextMenu(const Vector<WebContextMenuItemData>& items) const; QWKPage* const m_page; }; diff --git a/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp index fe0dac5..6e3d9eb 100644 --- a/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebInspectorProxyQt.cpp @@ -28,11 +28,9 @@ #if ENABLE(INSPECTOR) +#include <WebCore/NotImplemented.h> #include <wtf/text/WTFString.h> -#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1 -#include "NotImplemented.h" - namespace WebKit { WebPageProxy* WebInspectorProxy::platformCreateInspectorPage() @@ -51,6 +49,11 @@ void WebInspectorProxy::platformClose() notImplemented(); } +void WebInspectorProxy::platformInspectedURLChanged(const String&) +{ + notImplemented(); +} + String WebInspectorProxy::inspectorPageURL() const { notImplemented(); diff --git a/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp index 1fa90bb..d6e8639 100644 --- a/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp @@ -31,7 +31,7 @@ namespace WebKit { String WebPageProxy::standardUserAgent(const String& applicationNameForUserAgent) { // FIXME: This should not be hard coded. - return "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6; en-us) AppleWebKit/531.4 (KHTML, like Gecko) Version/4.0.3 Safari/531.4"; + return "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6) AppleWebKit/531.4 (KHTML, like Gecko) Version/4.0.3 Safari/531.4"; } } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp index a79cc3c..1e97d74 100644 --- a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp @@ -42,7 +42,7 @@ WebPopupMenuProxyQt::~WebPopupMenuProxyQt() { } -void WebPopupMenuProxyQt::showPopupMenu(const IntRect& rect, WebCore::TextDirection, const Vector<WebPopupItem>& items, const PlatformPopupMenuData&, int32_t selectedIndex) +void WebPopupMenuProxyQt::showPopupMenu(const IntRect& rect, WebCore::TextDirection, double, const Vector<WebPopupItem>& items, const PlatformPopupMenuData&, int32_t selectedIndex) { } diff --git a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h index f41432c..e7197d5 100644 --- a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h +++ b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h @@ -38,7 +38,7 @@ public: } ~WebPopupMenuProxyQt(); - virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex); + virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, double scaleFactor, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex); virtual void hidePopupMenu(); private: |