Remove the last remnants of Qt from WebKit2
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Oct 2013 18:38:40 +0000 (18:38 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Oct 2013 18:38:40 +0000 (18:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=122290

Reviewed by Andreas Kling.

* Platform/PlatformProcessIdentifier.h:
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
(WebKit::toImpl):
* Shared/Downloads/Download.cpp:
(WebKit::Download::Download):
* Shared/Downloads/Download.h:
* Shared/Downloads/DownloadManager.cpp:
* Shared/Downloads/DownloadManager.h:
* Shared/EditorState.cpp:
(WebKit::EditorState::encode):
(WebKit::EditorState::decode):
* Shared/EditorState.h:
(WebKit::EditorState::EditorState):
* Shared/LayerTreeContext.h:
* Shared/NativeWebKeyboardEvent.h:
* Shared/NativeWebMouseEvent.h:
* Shared/NativeWebWheelEvent.h:
* Shared/PlatformPopupMenuData.cpp:
(WebKit::PlatformPopupMenuData::encode):
(WebKit::PlatformPopupMenuData::decode):
* Shared/PlatformPopupMenuData.h:
* Shared/ShareableBitmap.h:
* Shared/WebPreferencesStore.h:
* UIProcess/Downloads/DownloadProxy.cpp:
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/PageClient.h:
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::didFinishLaunching):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::download):
* UIProcess/WebFullScreenManagerProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::performDragControllerAction):
(WebKit::WebPageProxy::receivedPolicyDecision):
(WebKit::WebPageProxy::editorStateChanged):
(WebKit::WebPageProxy::showPopupMenu):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebPopupMenuProxy.h:
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/WebCoreSupport/WebDragClient.cpp:
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::respondToChangedSelection):
(WebKit::WebEditorClient::willSetInputMethodState):
(WebKit::WebEditorClient::supportsGlobalSelection):
* WebProcess/WebCoreSupport/WebEditorClient.h:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::shouldFallBack):
* WebProcess/WebCoreSupport/WebPopupMenu.cpp:
(WebKit::WebPopupMenu::didChangeSelectedIndex):
* WebProcess/WebCoreSupport/WebPopupMenu.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::editorState):
(WebKit::WebPage::performDragControllerAction):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:
* config.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156847 268f45cc-cd09-0410-ab3c-d52691b4dbfc

41 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Platform/PlatformProcessIdentifier.h
Source/WebKit2/Shared/API/c/WKSharedAPICast.h
Source/WebKit2/Shared/Downloads/Download.cpp
Source/WebKit2/Shared/Downloads/Download.h
Source/WebKit2/Shared/Downloads/DownloadManager.cpp
Source/WebKit2/Shared/Downloads/DownloadManager.h
Source/WebKit2/Shared/EditorState.cpp
Source/WebKit2/Shared/EditorState.h
Source/WebKit2/Shared/LayerTreeContext.h
Source/WebKit2/Shared/NativeWebKeyboardEvent.h
Source/WebKit2/Shared/NativeWebMouseEvent.h
Source/WebKit2/Shared/NativeWebWheelEvent.h
Source/WebKit2/Shared/PlatformPopupMenuData.cpp
Source/WebKit2/Shared/PlatformPopupMenuData.h
Source/WebKit2/Shared/ShareableBitmap.h
Source/WebKit2/Shared/WebPreferencesStore.h
Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
Source/WebKit2/UIProcess/PageClient.h
Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
Source/WebKit2/UIProcess/WebContext.cpp
Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/UIProcess/WebPageProxy.messages.in
Source/WebKit2/UIProcess/WebPopupMenuProxy.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/WebProcess.h
Source/WebKit2/WebProcess/WebProcess.messages.in
Source/WebKit2/config.h

index fc20eb1..692028b 100644 (file)
@@ -1,5 +1,76 @@
 2013-10-03  Anders Carlsson  <andersca@apple.com>
 
+        Remove the last remnants of Qt from WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=122290
+
+        Reviewed by Andreas Kling.
+
+        * Platform/PlatformProcessIdentifier.h:
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::toAPI):
+        (WebKit::toImpl):
+        * Shared/Downloads/Download.cpp:
+        (WebKit::Download::Download):
+        * Shared/Downloads/Download.h:
+        * Shared/Downloads/DownloadManager.cpp:
+        * Shared/Downloads/DownloadManager.h:
+        * Shared/EditorState.cpp:
+        (WebKit::EditorState::encode):
+        (WebKit::EditorState::decode):
+        * Shared/EditorState.h:
+        (WebKit::EditorState::EditorState):
+        * Shared/LayerTreeContext.h:
+        * Shared/NativeWebKeyboardEvent.h:
+        * Shared/NativeWebMouseEvent.h:
+        * Shared/NativeWebWheelEvent.h:
+        * Shared/PlatformPopupMenuData.cpp:
+        (WebKit::PlatformPopupMenuData::encode):
+        (WebKit::PlatformPopupMenuData::decode):
+        * Shared/PlatformPopupMenuData.h:
+        * Shared/ShareableBitmap.h:
+        * Shared/WebPreferencesStore.h:
+        * UIProcess/Downloads/DownloadProxy.cpp:
+        * UIProcess/Downloads/DownloadProxy.h:
+        * UIProcess/PageClient.h:
+        * UIProcess/Plugins/PluginProcessProxy.cpp:
+        (WebKit::PluginProcessProxy::didFinishLaunching):
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::download):
+        * UIProcess/WebFullScreenManagerProxy.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::performDragControllerAction):
+        (WebKit::WebPageProxy::receivedPolicyDecision):
+        (WebKit::WebPageProxy::editorStateChanged):
+        (WebKit::WebPageProxy::showPopupMenu):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/WebPopupMenuProxy.h:
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        * WebProcess/WebCoreSupport/WebDragClient.cpp:
+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+        (WebKit::WebEditorClient::respondToChangedSelection):
+        (WebKit::WebEditorClient::willSetInputMethodState):
+        (WebKit::WebEditorClient::supportsGlobalSelection):
+        * WebProcess/WebCoreSupport/WebEditorClient.h:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::shouldFallBack):
+        * WebProcess/WebCoreSupport/WebPopupMenu.cpp:
+        (WebKit::WebPopupMenu::didChangeSelectedIndex):
+        * WebProcess/WebCoreSupport/WebPopupMenu.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        (WebKit::WebPage::editorState):
+        (WebKit::WebPage::performDragControllerAction):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+        * config.h:
+
+2013-10-03  Anders Carlsson  <andersca@apple.com>
+
         Remove Qt files from WebKit2.
 
         Rubber-stomped by Andreas Kling.
index deafa9c..4b51553 100644 (file)
 #ifndef PlatformProcessIdentifier_h
 #define PlatformProcessIdentifier_h
 
-#if PLATFORM(QT)
-QT_BEGIN_NAMESPACE
-class QProcess;
-QT_END_NAMESPACE
-#elif PLATFORM(EFL)
+#if PLATFORM(EFL)
 #include <unistd.h>
 #endif
 
index a3e1813..80aea88 100644 (file)
@@ -339,7 +339,7 @@ inline WKContextMenuItemTag toAPI(WebCore::ContextMenuAction action)
         return kWKContextMenuItemTagDownloadImageToDisk;
     case WebCore::ContextMenuItemTagCopyImageToClipboard:
         return kWKContextMenuItemTagCopyImageToClipboard;
-#if PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
+#if PLATFORM(EFL) || PLATFORM(GTK)
     case WebCore::ContextMenuItemTagCopyImageUrlToClipboard:
         return kWKContextMenuItemTagCopyImageUrlToClipboard;
 #endif
@@ -359,7 +359,7 @@ inline WKContextMenuItemTag toAPI(WebCore::ContextMenuAction action)
         return kWKContextMenuItemTagCut;
     case WebCore::ContextMenuItemTagPaste:
         return kWKContextMenuItemTagPaste;
-#if PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
+#if PLATFORM(EFL) || PLATFORM(GTK)
     case WebCore::ContextMenuItemTagSelectAll:
         return kWKContextMenuItemTagSelectAll;
 #endif
@@ -534,7 +534,7 @@ inline WebCore::ContextMenuAction toImpl(WKContextMenuItemTag tag)
     case kWKContextMenuItemTagCopyImageToClipboard:
         return WebCore::ContextMenuItemTagCopyImageToClipboard;
     case kWKContextMenuItemTagOpenFrameInNewWindow:
-#if PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
+#if PLATFORM(EFL) || PLATFORM(GTK)
     case kWKContextMenuItemTagCopyImageUrlToClipboard:
         return WebCore::ContextMenuItemTagCopyImageUrlToClipboard;
 #endif
@@ -553,7 +553,7 @@ inline WebCore::ContextMenuAction toImpl(WKContextMenuItemTag tag)
         return WebCore::ContextMenuItemTagCut;
     case kWKContextMenuItemTagPaste:
         return WebCore::ContextMenuItemTagPaste;
-#if PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
+#if PLATFORM(EFL) || PLATFORM(GTK)
     case kWKContextMenuItemTagSelectAll:
         return WebCore::ContextMenuItemTagSelectAll;
 #endif
index 879752c..6f17e60 100644 (file)
@@ -46,9 +46,6 @@ Download::Download(DownloadManager& downloadManager, uint64_t downloadID, const
 #if USE(CFNETWORK)
     , m_allowOverwrite(false)
 #endif
-#if PLATFORM(QT)
-    , m_qtDownloader(0)
-#endif
 {
     ASSERT(m_downloadID);
 
index 051b232..f67a7b5 100644 (file)
@@ -65,10 +65,6 @@ class DownloadManager;
 class SandboxExtension;
 class WebPage;
 
-#if PLATFORM(QT)
-class QtFileDownloader;
-#endif
-
 class Download : public CoreIPC::MessageSender {
     WTF_MAKE_NONCOPYABLE(Download);
 public:
@@ -94,10 +90,6 @@ public:
     void didCancel(const CoreIPC::DataReference& resumeData);
     void didDecideDestination(const String&, bool allowOverwrite);
 
-#if PLATFORM(QT)
-    void startTransfer(const String& destination);
-#endif
-
 #if USE(CFNETWORK)
     const String& destination() const { return m_destination; }
     DownloadAuthenticationClient* authenticationClient();
@@ -138,9 +130,6 @@ private:
     RetainPtr<CFURLDownloadRef> m_download;
     RefPtr<DownloadAuthenticationClient> m_authenticationClient;
 #endif
-#if PLATFORM(QT)
-    QtFileDownloader* m_qtDownloader;
-#endif
 #if PLATFORM(GTK) || PLATFORM(EFL)
     OwnPtr<WebCore::ResourceHandleClient> m_downloadClient;
     RefPtr<WebCore::ResourceHandle> m_resourceHandle;
index 960560b..06afeec 100644 (file)
@@ -93,13 +93,4 @@ AuthenticationManager& DownloadManager::downloadsAuthenticationManager()
     return m_client->downloadsAuthenticationManager();
 }
 
-#if PLATFORM(QT)
-void DownloadManager::startTransfer(uint64_t downloadID, const String& destination)
-{
-    ASSERT(m_downloads.contains(downloadID));
-    Download* download = m_downloads.get(downloadID);
-    download->startTransfer(destination);
-}
-#endif
-
 } // namespace WebKit
index ba43f9a..ca7ee8a 100644 (file)
@@ -77,10 +77,6 @@ public:
     CoreIPC::Connection* downloadProxyConnection();
     AuthenticationManager& downloadsAuthenticationManager();
 
-#if PLATFORM(QT)
-    void startTransfer(uint64_t downloadID, const String& destination);
-#endif
-
 private:
     Client* m_client;
     HashMap<uint64_t, Download*> m_downloads;
index 40a4776..11e88b5 100644 (file)
@@ -42,17 +42,7 @@ void EditorState::encode(CoreIPC::ArgumentEncoder& encoder) const
     encoder << isInPlugin;
     encoder << hasComposition;
 
-#if PLATFORM(QT)
-    encoder << cursorPosition;
-    encoder << anchorPosition;
-    encoder << editorRect;
-    encoder << compositionRect;
-    encoder << inputMethodHints;
-    encoder << selectedText;
-    encoder << surroundingText;
-#endif
-
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     encoder << cursorRect;
 #endif
 }
@@ -83,30 +73,7 @@ bool EditorState::decode(CoreIPC::ArgumentDecoder& decoder, EditorState& result)
     if (!decoder.decode(result.hasComposition))
         return false;
 
-#if PLATFORM(QT)
-    if (!decoder.decode(result.cursorPosition))
-        return false;
-
-    if (!decoder.decode(result.anchorPosition))
-        return false;
-
-    if (!decoder.decode(result.editorRect))
-        return false;
-
-    if (!decoder.decode(result.compositionRect))
-        return false;
-
-    if (!decoder.decode(result.inputMethodHints))
-        return false;
-
-    if (!decoder.decode(result.selectedText))
-        return false;
-
-    if (!decoder.decode(result.surroundingText))
-        return false;
-#endif
-
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     if (!decoder.decode(result.cursorRect))
         return false;
 #endif
index 8b342ce..f507be9 100644 (file)
@@ -42,11 +42,6 @@ struct EditorState {
         , isInPasswordField(false)
         , isInPlugin(false)
         , hasComposition(false)
-#if PLATFORM(QT)
-        , cursorPosition(0)
-        , anchorPosition(0)
-        , inputMethodHints(0)
-#endif
     {
     }
 
@@ -59,22 +54,8 @@ struct EditorState {
     bool isInPasswordField;
     bool isInPlugin;
     bool hasComposition;
-#if PLATFORM(QT)
-    // The anchor, cursor represent either the selection or composition, depending
-    // whether a composition exists or not.
-    unsigned cursorPosition;
-    unsigned anchorPosition;
-
-    WebCore::IntRect editorRect;
-    WebCore::IntRect compositionRect;
-
-    uint64_t inputMethodHints;
-
-    WTF::String selectedText;
-    WTF::String surroundingText;
-#endif
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     WebCore::IntRect cursorRect;
 #endif
 
index 9b8c663..03b1d68 100644 (file)
@@ -54,8 +54,6 @@ public:
 
 #if PLATFORM(MAC)
     uint32_t contextID;
-#elif PLATFORM(QT)
-    uint32_t coordinatedLayerID;
 #elif PLATFORM(GTK)
     uint64_t windowHandle;
 #elif PLATFORM(EFL)
index 95d76ab..1a2de48 100644 (file)
@@ -33,8 +33,6 @@
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS NSView;
-#elif PLATFORM(QT)
-#include <QKeyEvent>
 #elif PLATFORM(GTK)
 #include <GOwnPtrGtk.h>
 #include <WebCore/CompositionResults.h>
@@ -50,8 +48,6 @@ class NativeWebKeyboardEvent : public WebKeyboardEvent {
 public:
 #if USE(APPKIT)
     NativeWebKeyboardEvent(NSEvent *, NSView *);
-#elif PLATFORM(QT)
-    explicit NativeWebKeyboardEvent(QKeyEvent*);
 #elif PLATFORM(GTK)
     NativeWebKeyboardEvent(const NativeWebKeyboardEvent&);
     NativeWebKeyboardEvent(GdkEvent*, const WebCore::CompositionResults&, WebCore::GtkInputMethodFilter::EventFakedForComposition);
@@ -62,8 +58,6 @@ public:
 
 #if USE(APPKIT)
     NSEvent *nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(QT)
-    const QKeyEvent* nativeEvent() const { return &m_nativeEvent; }
 #elif PLATFORM(GTK)
     GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
     const WebCore::CompositionResults& compositionResults() const  { return m_compositionResults; }
@@ -76,8 +70,6 @@ public:
 private:
 #if USE(APPKIT)
     RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(QT)
-    QKeyEvent m_nativeEvent;
 #elif PLATFORM(GTK)
     GOwnPtr<GdkEvent> m_nativeEvent;
     WebCore::CompositionResults m_compositionResults;
index dde5b36..3cc7e4f 100644 (file)
@@ -31,8 +31,6 @@
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS NSView;
-#elif PLATFORM(QT)
-#include <qevent.h>
 #elif PLATFORM(GTK)
 #include <GOwnPtrGtk.h>
 typedef union _GdkEvent GdkEvent;
@@ -47,8 +45,6 @@ class NativeWebMouseEvent : public WebMouseEvent {
 public:
 #if USE(APPKIT)
     NativeWebMouseEvent(NSEvent *, NSView *);
-#elif PLATFORM(QT)
-    explicit NativeWebMouseEvent(QMouseEvent*, const QTransform& fromItemTransform, int eventClickCount);
 #elif PLATFORM(GTK)
     NativeWebMouseEvent(const NativeWebMouseEvent&);
     NativeWebMouseEvent(GdkEvent*, int);
@@ -60,8 +56,6 @@ public:
 
 #if USE(APPKIT)
     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(QT)
-    const QMouseEvent* nativeEvent() const { return m_nativeEvent; }
 #elif PLATFORM(GTK)
     const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #elif PLATFORM(EFL)
@@ -71,8 +65,6 @@ public:
 private:
 #if USE(APPKIT)
     RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(QT)
-    QMouseEvent* m_nativeEvent;
 #elif PLATFORM(GTK)
     GOwnPtr<GdkEvent> m_nativeEvent;
 #elif PLATFORM(EFL)
index fae9e96..0edb3dd 100644 (file)
@@ -31,8 +31,6 @@
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS NSView;
-#elif PLATFORM(QT)
-#include <qevent.h>
 #elif PLATFORM(GTK)
 #include <GOwnPtrGtk.h>
 typedef union _GdkEvent GdkEvent;
@@ -47,8 +45,6 @@ class NativeWebWheelEvent : public WebWheelEvent {
 public:
 #if USE(APPKIT)
     NativeWebWheelEvent(NSEvent *, NSView *);
-#elif PLATFORM(QT)
-    explicit NativeWebWheelEvent(QWheelEvent*, const QTransform& fromItemTransform);
 #elif PLATFORM(GTK)
     NativeWebWheelEvent(const NativeWebWheelEvent&);
     NativeWebWheelEvent(GdkEvent*);
@@ -58,8 +54,6 @@ public:
 
 #if USE(APPKIT)
     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(QT)
-    const QWheelEvent* nativeEvent() const { return m_nativeEvent; }
 #elif PLATFORM(GTK)
     const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #elif PLATFORM(EFL)
@@ -69,8 +63,6 @@ public:
 private:
 #if USE(APPKIT)
     RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(QT)
-    QWheelEvent* m_nativeEvent;
 #elif PLATFORM(GTK)
     GOwnPtr<GdkEvent> m_nativeEvent;
 #elif PLATFORM(EFL)
index 1550393..e857b64 100644 (file)
@@ -31,9 +31,6 @@
 namespace WebKit {
 
 PlatformPopupMenuData::PlatformPopupMenuData()
-#if PLATFORM(QT)
-    : multipleSelections(false)
-#endif
 {
 }
 
@@ -42,8 +39,6 @@ void PlatformPopupMenuData::encode(CoreIPC::ArgumentEncoder& encoder) const
 #if PLATFORM(MAC)
     encoder << fontInfo;
     encoder << shouldPopOver;
-#elif PLATFORM(QT)
-    encoder << multipleSelections;
 #else
     UNUSED_PARAM(encoder);
 #endif
@@ -56,9 +51,6 @@ bool PlatformPopupMenuData::decode(CoreIPC::ArgumentDecoder& decoder, PlatformPo
         return false;
     if (!decoder.decode(data.shouldPopOver))
         return false;
-#elif PLATFORM(QT)
-    if (!decoder.decode(data.multipleSelections))
-        return false;
 #else
     UNUSED_PARAM(decoder);
     UNUSED_PARAM(data);
index 70b3f87..0d42e68 100644 (file)
@@ -46,8 +46,6 @@ struct PlatformPopupMenuData {
 #if PLATFORM(MAC)
     FontInfo fontInfo;
     bool shouldPopOver;
-#elif PLATFORM(QT)
-    bool multipleSelections;
 #endif
 };
 
index 7b4cc15..3a5d3bd 100644 (file)
 #include <WebCore/RefPtrCairo.h>
 #endif
 
-#if PLATFORM(QT)
-#include <QImage>
-#ifdef Q_WS_X11
-// Avoid ambiguity caused by the Region typedef from qwindowdefs.h.
-namespace WebCore { class Region; }
-namespace WebKit { using WebCore::Region; }
-#endif
-#endif
-
 namespace WebCore {
     class Image;
     class GraphicsContext;
@@ -129,11 +120,6 @@ public:
     // This creates a BitmapImage that directly references the shared bitmap data.
     // This is only safe to use when we know that the contents of the shareable bitmap won't change.
     PassRefPtr<cairo_surface_t> createCairoSurface();
-#elif PLATFORM(QT)
-    // This creates a QImage that directly references the shared bitmap data.
-    // This is only safe to use when we know that the contents of the shareable bitmap won't change.
-    QImage createQImage();
-    static void releaseSharedMemoryData(void* typelessBitmap);
 #endif
 
 private:
index 7476511..62a9607 100644 (file)
@@ -42,7 +42,7 @@ namespace WebKit {
 #define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED false
 #endif
 
-#if ENABLE(SMOOTH_SCROLLING) && !PLATFORM(QT)
+#if ENABLE(SMOOTH_SCROLLING)
 #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED true
 #else
 #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
@@ -203,7 +203,7 @@ namespace WebKit {
     macro(PictographFontFamily, pictographFontFamily, String, String, "Apple Color Emoji") \
     \
 
-#elif PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
+#elif PLATFORM(GTK) || PLATFORM(EFL)
 
 #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
index 1070eb6..cb63273 100644 (file)
@@ -206,16 +206,5 @@ void DownloadProxy::didCancel(const CoreIPC::DataReference& resumeData)
     m_downloadProxyMap.downloadFinished(this);
 }
 
-#if PLATFORM(QT)
-void DownloadProxy::startTransfer(const String& filename)
-{
-    if (!m_webContext)
-        return;
-
-    // FIXME (Multi-WebProcess): <rdar://problem/12239483> Downloads shouldn't be handled in the web process.
-    m_webContext->sendToAllProcesses(Messages::WebProcess::StartTransfer(m_downloadID, filename));
-}
-#endif
-
 } // namespace WebKit
 
index 36c8d7c..20a7323 100644 (file)
@@ -63,10 +63,6 @@ public:
     void didReceiveDownloadProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
     void didReceiveSyncDownloadProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
 
-#if PLATFORM(QT)
-    void startTransfer(const String& filename);
-#endif
-
 private:
     explicit DownloadProxy(DownloadProxyMap&, WebContext*);
 
index 3c56d6b..1d656e7 100644 (file)
@@ -124,26 +124,20 @@ public:
 #if USE(COORDINATED_GRAPHICS)
     virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&) = 0;
 #endif
-#if PLATFORM(QT)
-    virtual void handleAuthenticationRequiredRequest(const String& hostname, const String& realm, const String& prefilledUsername, String& username, String& password) = 0;
-    virtual void handleCertificateVerificationRequest(const String& hostname, bool& ignoreErrors) = 0;
-    virtual void handleProxyAuthenticationRequiredRequest(const String& hostname, uint16_t port, const String& prefilledUsername, String& username, String& password) = 0;
-    virtual void handleWillSetInputMethodState() = 0;
-#endif // PLATFORM(QT).
-
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+
+#if PLATFORM(EFL) || PLATFORM(GTK)
     virtual void updateTextInputState() = 0;
-#endif // PLATFORM(QT) || PLATFORM(EFL) || PLATOFRM(GTK)
+#endif // PLATFORM(EFL) || PLATOFRM(GTK)
 
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(EFL) || PLATFORM(GTK)
     virtual void handleDownloadRequest(DownloadProxy*) = 0;
-#endif // PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#endif // PLATFORM(EFL) || PLATFORM(GTK)
 
-#if PLATFORM(QT) || PLATFORM(EFL)
+#if PLATFORM(EFL)
     virtual void didChangeContentsSize(const WebCore::IntSize&) = 0;
 #endif
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) = 0;
 #endif
 
index 6c59dce..7ad172a 100644 (file)
@@ -190,8 +190,6 @@ void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connectio
     m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
 #if PLATFORM(MAC)
     m_connection->setShouldCloseConnectionOnMachExceptions();
-#elif PLATFORM(QT)
-    m_connection->setShouldCloseConnectionOnProcessTermination(processIdentifier());
 #endif
 
     m_connection->open();
index 77a9f08..c681b90 100644 (file)
@@ -725,11 +725,6 @@ DownloadProxy* WebContext::download(WebPageProxy* initiatingPage, const Resource
     }
 #endif
 
-#if PLATFORM(QT)
-    ASSERT(initiatingPage); // Our design does not suppport downloads without a WebPage.
-    initiatingPage->handleDownloadRequest(downloadProxy);
-#endif
-
     m_processes[0]->send(Messages::WebProcess::DownloadRequest(downloadProxy->downloadID(), initiatingPageID, request), 0);
     return downloadProxy;
 }
index 085bd0a..b372570 100644 (file)
@@ -41,16 +41,12 @@ class IntRect;
 OBJC_CLASS WKView;
 #elif PLATFORM(GTK)
 typedef struct _WebKitWebViewBase WebKitWebViewBase;
-#elif PLATFORM(QT)
-class QQuickWebView;
 #endif
 
 namespace WebKit {
     
 #if PLATFORM(MAC)
 typedef WKView PlatformWebView;
-#elif PLATFORM(QT)
-typedef QQuickWebView PlatformWebView;
 #elif PLATFORM(GTK)
 typedef WebKitWebViewBase PlatformWebView;
 #elif PLATFORM(EFL)
index b0662ed..f5e7d35 100644 (file)
 #include "CoordinatedLayerTreeHostProxyMessages.h"
 #endif
 
-#if PLATFORM(QT)
-#include "ArgumentCodersQt.h"
-#endif
-
 #if PLATFORM(GTK)
 #include "ArgumentCodersGtk.h"
 #endif
@@ -1227,7 +1223,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
 {
     if (!isValid())
         return;
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     m_process->send(Messages::WebPage::PerformDragControllerAction(action, *dragData), m_pageID);
 #else
     m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData->clientPosition(), dragData->globalPosition(), dragData->draggingSourceOperationMask(), dragStorageName, dragData->flags(), sandboxExtensionHandle, sandboxExtensionsForUpload), m_pageID);
@@ -1239,7 +1235,7 @@ void WebPageProxy::didPerformDragControllerAction(WebCore::DragSession dragSessi
     m_currentDragSession = dragSession;
 }
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
 void WebPageProxy::startDrag(const DragData& dragData, const ShareableBitmap::Handle& dragImageHandle)
 {
     RefPtr<ShareableBitmap> dragImage = 0;
@@ -1479,13 +1475,6 @@ void WebPageProxy::handleGestureEvent(const WebGestureEvent& event)
 #endif
 
 #if ENABLE(TOUCH_EVENTS)
-#if PLATFORM(QT)
-void WebPageProxy::handlePotentialActivation(const IntPoint& touchPoint, const IntSize& touchArea)
-{
-    m_process->send(Messages::WebPage::HighlightPotentialActivation(touchPoint, touchArea), m_pageID);
-}
-#endif
-
 void WebPageProxy::handleTouchEvent(const NativeWebTouchEvent& event)
 {
     if (!isValid())
@@ -1546,7 +1535,7 @@ void WebPageProxy::receivedPolicyDecision(PolicyAction action, WebFrameProxy* fr
         // Create a download proxy.
         DownloadProxy* download = m_process->context()->createDownloadProxy();
         downloadID = download->downloadID();
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(EFL) || PLATFORM(GTK)
         // Our design does not suppport downloads without a WebPage.
         handleDownloadRequest(download);
 #endif
@@ -2899,14 +2888,14 @@ void WebPageProxy::setMayStartMediaWhenInWindow(bool mayStartMedia)
     process()->send(Messages::WebPage::SetMayStartMediaWhenInWindow(mayStartMedia), m_pageID);
 }
 
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(EFL) || PLATFORM(GTK)
 void WebPageProxy::handleDownloadRequest(DownloadProxy* download)
 {
     m_pageClient->handleDownloadRequest(download);
 }
-#endif // PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#endif // PLATFORM(EFL) || PLATFORM(GTK)
 
-#if PLATFORM(QT) || PLATFORM(EFL)
+#if PLATFORM(EFL)
 void WebPageProxy::didChangeContentsSize(const IntSize& size)
 {
     m_pageClient->didChangeContentsSize(size);
@@ -3055,7 +3044,7 @@ void WebPageProxy::editorStateChanged(const EditorState& editorState)
         cancelComposition();
         m_pageClient->notifyInputContextAboutDiscardedComposition();
     }
-#elif PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#elif PLATFORM(EFL) || PLATFORM(GTK)
     m_pageClient->updateTextInputState();
 #endif
 }
@@ -3182,10 +3171,9 @@ void WebPageProxy::showPopupMenu(const IntRect& rect, uint64_t textDirection, co
 
     protectedActivePopupMenu->showPopupMenu(rect, static_cast<TextDirection>(textDirection), m_pageScaleFactor, items, data, selectedIndex);
 
-    // Since Qt and Efl doesn't use a nested mainloop to show the popup and get the answer, we need to keep the client pointer valid.
-#if !PLATFORM(QT)
+    // Since Efl doesn't use a nested mainloop to show the popup and get the answer, we need to keep the client pointer valid.
+    // FIXME: The above comment doesn't make any sense since this code is compiled out for EFL.
     protectedActivePopupMenu->invalidate();
-#endif
     protectedActivePopupMenu = 0;
 #endif
 }
@@ -4411,7 +4399,7 @@ void WebPageProxy::didReceiveURIRequest(String uriString, uint64_t requestID)
 }
 #endif
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
 void WebPageProxy::setComposition(const String& text, Vector<CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
 {
     // FIXME: We need to find out how to proper handle the crashes case.
@@ -4436,7 +4424,7 @@ void WebPageProxy::cancelComposition()
 
     process()->send(Messages::WebPage::CancelComposition(), m_pageID);
 }
-#endif // PLATFORM(QT) || PLATFORM(GTK)
+#endif // PLATFORM(GTK)
 
 void WebPageProxy::setMainFrameInViewSourceMode(bool mainFrameInViewSourceMode)
 {
index 99e34af..584cc07 100644 (file)
 #include <Evas.h>
 #endif
 
-#if PLATFORM(QT)
-#include "QtNetworkRequestData.h"
-#endif
-
 namespace CoreIPC {
     class ArgumentDecoder;
     class Connection;
@@ -111,10 +107,6 @@ namespace WebCore {
     struct WindowFeatures;
 }
 
-#if PLATFORM(QT)
-class QQuickNetworkReply;
-#endif
-
 #if USE(APPKIT)
 #ifdef __OBJC__
 @class WKView;
@@ -365,19 +357,11 @@ public:
 #if USE(TILED_BACKING_STORE) 
     void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect);
 #endif
-#if PLATFORM(QT)
-    void registerApplicationScheme(const String& scheme);
-    void resolveApplicationSchemeRequest(QtNetworkRequestData);
-    void sendApplicationSchemeReply(const QQuickNetworkReply*);
-    void authenticationRequiredRequest(const String& hostname, const String& realm, const String& prefilledUsername, String& username, String& password);
-    void certificateVerificationRequest(const String& hostname, bool& ignoreErrors);
-    void proxyAuthenticationRequiredRequest(const String& hostname, uint16_t port, const String& prefilledUsername, String& username, String& password);
-#endif // PLATFORM(QT).
 #if PLATFORM(EFL)
     void setThemePath(const String&);
 #endif
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     void setComposition(const String& text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd);
     void confirmComposition(const String& compositionString, int64_t selectionStart, int64_t selectionLength);
     void cancelComposition();
@@ -439,9 +423,6 @@ public:
 #endif
 #if ENABLE(TOUCH_EVENTS)
     void handleTouchEvent(const NativeWebTouchEvent&);
-#if PLATFORM(QT)
-    void handlePotentialActivation(const WebCore::IntPoint& touchPoint, const WebCore::IntSize& touchArea);
-#endif
 #endif
 
     void scrollBy(WebCore::ScrollDirection, WebCore::ScrollGranularity);
@@ -601,7 +582,7 @@ public:
     void setPromisedData(const String& pasteboardName, const SharedMemory::Handle& imageHandle, uint64_t imageSize, const String& filename, const String& extension,
                          const String& title, const String& url, const String& visibleURL, const SharedMemory::Handle& archiveHandle, uint64_t archiveSize);
 #endif
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     void startDrag(const WebCore::DragData&, const ShareableBitmap::Handle& dragImage);
 #endif
 #endif
@@ -664,7 +645,7 @@ public:
     void findZoomableAreaForPoint(const WebCore::IntPoint&, const WebCore::IntSize&);
 #endif
 
-#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(EFL) || PLATFORM(GTK)
     void handleDownloadRequest(DownloadProxy*);
 #endif
 
@@ -793,10 +774,6 @@ private:
 #if PLATFORM(GTK)
     virtual void failedToShowPopupMenu();
 #endif
-#if PLATFORM(QT)
-    virtual void changeSelectedIndex(int32_t newSelectedIndex);
-    virtual void closePopupMenu();
-#endif
 
     // Implemented in generated WebPageProxyMessageReceiver.cpp
     void didReceiveWebPageProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
@@ -890,7 +867,7 @@ private:
 #if USE(COORDINATED_GRAPHICS)
     void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
 #endif
-#if PLATFORM(QT) || PLATFORM(EFL)
+#if PLATFORM(EFL)
     void didChangeContentsSize(const WebCore::IntSize&);
 #endif
 
@@ -905,9 +882,6 @@ private:
 #endif
 
     void editorStateChanged(const EditorState&);
-#if PLATFORM(QT)
-    void willSetInputMethodState();
-#endif
 
     // Back/Forward list management
     void backForwardAddItem(uint64_t itemID);
@@ -1272,10 +1246,6 @@ private:
     bool m_lastSentClipsToExposedRect;
 #endif
 
-#if PLATFORM(QT)
-    WTF::HashSet<RefPtr<QtRefCountedNetworkRequestData>> m_applicationSchemeRequests;
-#endif
-
 #if ENABLE(PAGE_VISIBILITY_API)
     WebCore::PageVisibilityState m_visibilityState;
 #endif
index 9bb9d55..a98538b 100644 (file)
@@ -80,13 +80,8 @@ messages -> WebPageProxy {
 #if USE(COORDINATED_GRAPHICS)
     DidFindZoomableArea(WebCore::IntPoint target, WebCore::IntRect area)
 #endif
-#if PLATFORM(QT)
-    AuthenticationRequiredRequest(WTF::String hostname, WTF::String realm, WTF::String prefilledUsername) -> (WTF::String username, WTF::String password)
-    CertificateVerificationRequest(WTF::String hostname) -> (bool ignoreErrors)
-    ProxyAuthenticationRequiredRequest(WTF::String hostname, uint16_t port, WTF::String prefilledUsername) -> (WTF::String username, WTF::String password)
-#endif
 
-#if PLATFORM(QT) || PLATFORM(EFL)
+#if PLATFORM(EFL)
     DidChangeContentsSize(WebCore::IntSize newSize)
 #endif
 
@@ -135,10 +130,6 @@ messages -> WebPageProxy {
 
     FrameDidBecomeFrameSet(uint64_t frameID, bool value)
 
-#if PLATFORM(QT)
-    ResolveApplicationSchemeRequest(WebKit::QtNetworkRequestData request)
-#endif
-
     # Forms messages
     WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, WTF::Vector<std::pair<WTF::String, WTF::String>> textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
 
@@ -185,9 +176,7 @@ messages -> WebPageProxy {
 
     # Editor notifications
     EditorStateChanged(WebKit::EditorState editorState)
-#if PLATFORM(QT)
-    WillSetInputMethodState()
-#endif
+
     # Find messages
     DidCountStringMatches(WTF::String string, uint32_t matchCount)
     SetFindIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, float contentImageScaleFactor, WebKit::ShareableBitmap::Handle contentImageHandle, bool fadeOut, bool animate)
@@ -244,7 +233,7 @@ messages -> WebPageProxy {
     SetDragImage(WebCore::IntPoint clientPosition, WebKit::ShareableBitmap::Handle dragImage, bool linkDrag)
     SetPromisedData(WTF::String pasteboardName, WebKit::SharedMemory::Handle imageHandle, uint64_t imageSize, WTF::String filename, WTF::String extension, WTF::String title, WTF::String url, WTF::String visibleURL, WebKit::SharedMemory::Handle archiveHandle, uint64_t archiveSize)
 #endif
-#if (PLATFORM(QT) || PLATFORM(GTK)) && ENABLE(DRAG_SUPPORT)
+#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
     StartDrag(WebCore::DragData dragData, WebKit::ShareableBitmap::Handle dragImage)
 #endif
 
index 1caf8dd..4c5c8e0 100644 (file)
@@ -56,10 +56,6 @@ public:
 #if PLATFORM(GTK)
         virtual void failedToShowPopupMenu() = 0;
 #endif
-#if PLATFORM(QT)
-        virtual void changeSelectedIndex(int32_t newSelectedIndex) = 0;
-        virtual void closePopupMenu() = 0;
-#endif
     };
 
     virtual ~WebPopupMenuProxy()
index 04b4d44..f52e9b3 100644 (file)
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(QT)
-#include <QLibrary>
-#endif
-
 #if PLATFORM(GTK)
 typedef struct _GModule GModule;
 #endif
@@ -60,8 +56,6 @@ namespace WebKit {
 
 #if PLATFORM(MAC)
 typedef NSBundle *PlatformBundle;
-#elif PLATFORM(QT)
-typedef QLibrary PlatformBundle;
 #elif PLATFORM(GTK)
 typedef ::GModule* PlatformBundle;
 #elif PLATFORM(EFL)
index 9b6cd85..718cbb1 100644 (file)
@@ -56,7 +56,7 @@ DragSourceAction WebDragClient::dragSourceActionMaskForPoint(const IntPoint& /*w
     return DragSourceActionAny;
 }
 
-#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(GTK)
+#if !PLATFORM(MAC) && !PLATFORM(GTK)
 void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard*, Frame*, bool)
 {
 }
index d65cb24..c820325 100644 (file)
 #include <WebCore/UndoStep.h>
 #include <WebCore/UserTypingGestureIndicator.h>
 
-#if PLATFORM(QT)
-#include <QClipboard>
-#include <QGuiApplication>
-#include <WebCore/Pasteboard.h>
-#endif
-
 using namespace WebCore;
 using namespace HTMLNames;
 
@@ -197,22 +191,11 @@ void WebEditorClient::respondToChangedSelection(Frame* frame)
 
     m_page->didChangeSelection();
 
-#if PLATFORM(GTK) || PLATFORM(QT)
+#if PLATFORM(GTK)
     updateGlobalSelection(frame);
 #endif
 }
 
-#if PLATFORM(QT)
-
-// FIXME: Use this function for other X11-based platforms that need to manually update the global selection.
-void WebEditorClient::updateGlobalSelection(Frame* frame)
-{
-    if (supportsGlobalSelection() && frame->selection().isRange())
-        Pasteboard::createForGlobalSelection()->writeSelection(frame->selection().toNormalizedRange().get(), frame->editor().canSmartCopyOrDelete(), frame);
-}
-
-#endif
-
 void WebEditorClient::didEndEditing()
 {
     DEFINE_STATIC_LOCAL(String, WebViewDidEndEditingNotification, (ASCIILiteral("WebViewDidEndEditingNotification")));
@@ -504,11 +487,6 @@ void WebEditorClient::requestCheckingOfString(WTF::PassRefPtr<TextCheckingReques
 
 void WebEditorClient::willSetInputMethodState()
 {
-#if PLATFORM(QT)
-    m_page->send(Messages::WebPageProxy::WillSetInputMethodState());
-#else
-    notImplemented();
-#endif
 }
 
 void WebEditorClient::setInputMethodState(bool)
@@ -518,9 +496,7 @@ void WebEditorClient::setInputMethodState(bool)
 
 bool WebEditorClient::supportsGlobalSelection()
 {
-#if PLATFORM(QT) && !defined(QT_NO_CLIPBOARD)
-    return qApp->clipboard()->supportsSelection();
-#elif PLATFORM(GTK) && PLATFORM(X11)
+#if PLATFORM(GTK) && PLATFORM(X11)
     return true;
 #else
     // FIXME: Return true on other X11 platforms when they support global selection.
index e4aeafe..f171be2 100644 (file)
@@ -127,8 +127,6 @@ private:
 #if PLATFORM(GTK)
     bool executePendingEditorCommands(WebCore::Frame*, Vector<WTF::String>, bool);
     void getEditorCommandsForKeyEvent(const WebCore::KeyboardEvent*, Vector<WTF::String>&);
-#endif
-#if PLATFORM(GTK) || PLATFORM(QT)
     void updateGlobalSelection(WebCore::Frame*);
 #endif
 
index baf37bc..a8db607 100644 (file)
@@ -1057,13 +1057,6 @@ bool WebFrameLoaderClient::shouldFallBack(const ResourceError& error)
     if (error.errorCode() == pluginWillHandleLoadError.errorCode() && error.domain() == pluginWillHandleLoadError.domain())
         return false;
 
-#if PLATFORM(QT)
-    DEFINE_STATIC_LOCAL(const ResourceError, errorInterruptedForPolicyChange, (this->interruptedForPolicyChangeError(ResourceRequest())));
-
-    if (error.errorCode() == errorInterruptedForPolicyChange.errorCode() && error.domain() == errorInterruptedForPolicyChange.domain())
-        return false;
-#endif
-
     return true;
 }
 
index 28afa28..b62d8d2 100644 (file)
@@ -59,14 +59,9 @@ void WebPopupMenu::didChangeSelectedIndex(int newIndex)
     if (!m_popupClient)
         return;
 
-#if PLATFORM(QT)
-    if (newIndex >= 0)
-        m_popupClient->listBoxSelectItem(newIndex, m_popupClient->multiple(), false);
-#else
     m_popupClient->popupDidHide();
     if (newIndex >= 0)
         m_popupClient->valueChanged(newIndex);
-#endif
 }
 
 void WebPopupMenu::setTextForIndex(int index)
index 6319b9d..d4c0f97 100644 (file)
@@ -48,7 +48,7 @@ public:
     void disconnectFromPage() { m_page = 0; }
     void didChangeSelectedIndex(int newIndex);
     void setTextForIndex(int newIndex);
-#if PLATFORM(GTK) || PLATFORM(QT)
+#if PLATFORM(GTK)
     WebCore::PopupMenuClient* client() const { return m_popupClient; }
 #endif
 
index 4cf0898..ce4ef66 100644 (file)
 #include <WebCore/LegacyWebArchive.h>
 #endif
 
-#if PLATFORM(QT)
-#if ENABLE(DEVICE_ORIENTATION) && HAVE(QTSENSORS)
-#include "DeviceMotionClientQt.h"
-#include "DeviceOrientationClientQt.h"
-#endif
-#include "HitTestResult.h"
-#include <QMimeData>
-#endif
-
 #if PLATFORM(GTK)
 #include <gtk/gtk.h>
 #include "DataObjectGtk.h"
@@ -258,11 +249,6 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
     , m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
     , m_sendDidUpdateInWindowStateTimer(RunLoop::main(), this, &WebPage::didUpdateInWindowStateTimerFired)
     , m_findController(this)
-#if ENABLE(TOUCH_EVENTS)
-#if PLATFORM(QT)
-    , m_tapHighlightController(this)
-#endif
-#endif
 #if ENABLE(INPUT_TYPE_COLOR)
     , m_activeColorChooser(0)
 #endif
@@ -335,10 +321,6 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
 #if ENABLE(GEOLOCATION)
     WebCore::provideGeolocationTo(m_page.get(), new WebGeolocationClient(this));
 #endif
-#if ENABLE(DEVICE_ORIENTATION) && PLATFORM(QT) && HAVE(QTSENSORS)
-    WebCore::provideDeviceMotionTo(m_page.get(), new DeviceMotionClientQt);
-    WebCore::provideDeviceOrientationTo(m_page.get(), new DeviceOrientationClientQt);
-#endif
 #if ENABLE(NETWORK_INFO)
     WebCore::provideNetworkInfoTo(m_page.get(), new WebNetworkInfoClient(this));
 #endif
@@ -622,71 +604,6 @@ EditorState WebPage::editorState() const
     result.hasComposition = frame.editor().hasComposition();
     result.shouldIgnoreCompositionSelectionChange = frame.editor().ignoreCompositionSelectionChange();
 
-#if PLATFORM(QT)
-    size_t location = 0;
-    size_t length = 0;
-
-    Element* selectionRoot = frame.selection().rootEditableElementRespectingShadowTree();
-    Element* scope = selectionRoot ? selectionRoot : frame.document()->documentElement();
-
-    if (!scope)
-        return result;
-
-    if (isHTMLInputElement(scope)) {
-        HTMLInputElement* input = toHTMLInputElement(scope);
-        if (input->isTelephoneField())
-            result.inputMethodHints |= Qt::ImhDialableCharactersOnly;
-        else if (input->isNumberField())
-            result.inputMethodHints |= Qt::ImhDigitsOnly;
-        else if (input->isEmailField()) {
-            result.inputMethodHints |= Qt::ImhEmailCharactersOnly;
-            result.inputMethodHints |= Qt::ImhNoAutoUppercase;
-        } else if (input->isURLField()) {
-            result.inputMethodHints |= Qt::ImhUrlCharactersOnly;
-            result.inputMethodHints |= Qt::ImhNoAutoUppercase;
-        } else if (input->isPasswordField()) {
-            // Set ImhHiddenText flag for password fields. The Qt platform
-            // is responsible for determining which widget will receive input
-            // method events for password fields.
-            result.inputMethodHints |= Qt::ImhHiddenText;
-            result.inputMethodHints |= Qt::ImhNoAutoUppercase;
-            result.inputMethodHints |= Qt::ImhNoPredictiveText;
-            result.inputMethodHints |= Qt::ImhSensitiveData;
-        }
-    }
-
-    if (selectionRoot)
-        result.editorRect = frame.view()->contentsToWindow(selectionRoot->pixelSnappedBoundingBox());
-
-    RefPtr<Range> range;
-    if (result.hasComposition && (range = frame.editor().compositionRange())) {
-        frame.editor().getCompositionSelection(result.anchorPosition, result.cursorPosition);
-
-        result.compositionRect = frame.view()->contentsToWindow(range->boundingBox());
-    }
-
-    if (!result.hasComposition && !result.selectionIsNone && (range = frame.selection().selection().firstRange())) {
-        TextIterator::getLocationAndLengthFromRange(scope, range.get(), location, length);
-        bool baseIsFirst = frame.selection().selection().isBaseFirst();
-
-        result.cursorPosition = (baseIsFirst) ? location + length : location;
-        result.anchorPosition = (baseIsFirst) ? location : location + length;
-        result.selectedText = range->text();
-    }
-
-    if (range)
-        result.cursorRect = frame.view()->contentsToWindow(frame.editor().firstRectForRange(range.get()));
-
-    // FIXME: We should only transfer innerText when it changes and do this on the UI side.
-    if (result.isContentEditable && !result.isInPasswordField) {
-        result.surroundingText = scope->innerText();
-        if (result.hasComposition) {
-            // The anchor is always the left position when they represent a composition.
-            result.surroundingText.remove(result.anchorPosition, result.cursorPosition - result.anchorPosition);
-        }
-    }
-#endif
-
 #if PLATFORM(GTK)
     result.cursorRect = frame.selection().absoluteCaretBounds();
 #endif
@@ -1904,52 +1821,6 @@ void WebPage::restoreSessionAndNavigateToCurrentItem(const SessionState& session
 }
 
 #if ENABLE(TOUCH_EVENTS)
-#if PLATFORM(QT)
-void WebPage::highlightPotentialActivation(const IntPoint& point, const IntSize& area)
-{
-    if (point == IntPoint::zero()) {
-        // An empty point deactivates the highlighting.
-        tapHighlightController().hideHighlight();
-    } else {
-        Frame* mainframe = &m_page->mainFrame();
-        Node* activationNode = 0;
-        Node* adjustedNode = 0;
-        IntPoint adjustedPoint;
-
-#if ENABLE(TOUCH_ADJUSTMENT)
-        if (!mainframe->eventHandler().bestClickableNodeForTouchPoint(point, IntSize(area.width() / 2, area.height() / 2), adjustedPoint, adjustedNode))
-            return;
-
-#else
-        HitTestResult result = mainframe->eventHandler().hitTestResultAtPoint(mainframe->view()->windowToContents(point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent);
-        adjustedNode = result.innerNode();
-#endif
-        // Find the node to highlight. This is not the same as the node responding the tap gesture, because many
-        // pages has a global click handler and we do not want to highlight the body.
-        for (Node* node = adjustedNode; node; node = node->parentOrShadowHostNode()) {
-            if (node->isDocumentNode() || node->isFrameOwnerElement())
-                break;
-
-            // We always highlight focusable (form-elements), image links or content-editable elements.
-            if ((node->isElementNode() && toElement(node)->isMouseFocusable()) || node->isLink() || node->isContentEditable())
-                activationNode = node;
-            else if (node->willRespondToMouseClickEvents()) {
-                // Highlight elements with default mouse-click handlers, but highlight only inline elements with
-                // scripted event-handlers.
-                if (!node->Node::willRespondToMouseClickEvents() || (node->renderer() && node->renderer()->isInline()))
-                    activationNode = node;
-            }
-
-            if (activationNode)
-                break;
-        }
-
-        if (activationNode)
-            tapHighlightController().highlight(activationNode);
-    }
-}
-#endif
-
 static bool handleTouchEvent(const WebTouchEvent& touchEvent, Page* page)
 {
     if (!page->mainFrame().view())
@@ -2667,18 +2538,13 @@ bool WebPage::handleEditingKeyboardEvent(KeyboardEvent* evt)
 
 #if ENABLE(DRAG_SUPPORT)
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
 void WebPage::performDragControllerAction(uint64_t action, WebCore::DragData dragData)
 {
     if (!m_page) {
         send(Messages::WebPageProxy::DidPerformDragControllerAction(WebCore::DragSession()));
-#if PLATFORM(QT)
-        QMimeData* data = const_cast<QMimeData*>(dragData.platformData());
-        delete data;
-#elif PLATFORM(GTK)
         DataObjectGtk* data = const_cast<DataObjectGtk*>(dragData.platformData());
         data->deref();
-#endif
         return;
     }
 
@@ -2704,13 +2570,8 @@ void WebPage::performDragControllerAction(uint64_t action, WebCore::DragData dra
         ASSERT_NOT_REACHED();
     }
     // DragData does not delete its platformData so we need to do that here.
-#if PLATFORM(QT)
-    QMimeData* data = const_cast<QMimeData*>(dragData.platformData());
-    delete data;
-#elif PLATFORM(GTK)
     DataObjectGtk* data = const_cast<DataObjectGtk*>(dragData.platformData());
     data->deref();
-#endif
 }
 
 #else
@@ -3806,7 +3667,7 @@ bool WebPage::canPluginHandleResponse(const ResourceResponse& response)
 #endif
 }
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
 static Frame* targetFrameForEditing(WebPage* page)
 {
     Frame& targetFrame = page->corePage()->focusController().focusedOrMainFrame();
index 8cdafc4..0fb1fe9 100644 (file)
 #include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(QT)
-#include "ArgumentCodersQt.h"
-#include "QtNetworkAccessManager.h"
-#include "QtNetworkReply.h"
-#include "QtNetworkReplyData.h"
-#include "QtNetworkRequestData.h"
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#endif
-
 #if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
 #include "WebPageAccessibilityObject.h"
 #include <wtf/gobject/GRefPtr.h>
@@ -391,9 +381,6 @@ public:
     static const WebEvent* currentEvent();
 
     FindController& findController() { return m_findController; }
-#if ENABLE(TOUCH_EVENTS) && PLATFORM(QT)
-    TapHighlightController& tapHighlightController() { return m_tapHighlightController; }
-#endif
 
 #if ENABLE(GEOLOCATION)
     GeolocationPermissionRequestManager& geolocationPermissionRequestManager() { return m_geolocationPermissionRequestManager; }
@@ -450,7 +437,7 @@ public:
     void commitPageTransitionViewport();
 #endif
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     void setComposition(const String& text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd);
     void confirmComposition(const String& text, int64_t selectionStart, int64_t selectionLength);
     void cancelComposition();
@@ -524,7 +511,7 @@ public:
     void clearSelection();
 
 #if ENABLE(DRAG_SUPPORT)
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     void performDragControllerAction(uint64_t action, WebCore::DragData);
 #else
     void performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WTF::String& dragStorageName, uint32_t flags, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
@@ -582,12 +569,6 @@ public:
     void contextMenuShowing() { m_isShowingContextMenu = true; }
 #endif
 
-#if PLATFORM(QT)
-    void registerApplicationScheme(const String& scheme);
-    void applicationSchemeReply(const QtNetworkReplyData&);
-    void receivedApplicationSchemeRequest(const QNetworkRequest&, QtNetworkReply*);
-    void setUserScripts(const Vector<String>&);
-#endif
     void wheelEvent(const WebWheelEvent&);
 #if ENABLE(GESTURE_EVENTS)
     void gestureEvent(const WebGestureEvent&);
@@ -721,9 +702,6 @@ private:
 #if ENABLE(TOUCH_EVENTS)
     void touchEvent(const WebTouchEvent&);
     void touchEventSyncForTesting(const WebTouchEvent&, bool& handled);
-#if PLATFORM(QT)
-    void highlightPotentialActivation(const WebCore::IntPoint&, const WebCore::IntSize& area);
-#endif
 #endif
 #if ENABLE(CONTEXT_MENUS)
     void contextMenuHidden() { m_isShowingContextMenu = false; }
@@ -806,10 +784,6 @@ private:
 #if PLATFORM(GTK)
     void failedToShowPopupMenu();
 #endif
-#if PLATFORM(QT)
-    void hidePopupMenu();
-    void selectedIndex(int32_t newIndex);
-#endif
 
     void didChooseFilesForOpenPanel(const Vector<String>&);
     void didCancelForOpenPanel();
@@ -956,9 +930,6 @@ private:
     InjectedBundlePageDiagnosticLoggingClient m_logDiagnosticMessageClient;
 
     FindController m_findController;
-#if ENABLE(TOUCH_EVENTS) && PLATFORM(QT)
-    TapHighlightController m_tapHighlightController;
-#endif
     PageOverlayList m_pageOverlays;
 
 #if ENABLE(INSPECTOR)
@@ -1015,9 +986,6 @@ private:
     
     bool m_willGoToBackForwardItemCallbackEnabled;
     
-#if PLATFORM(QT)
-    HashMap<String, QtNetworkReply*> m_applicationSchemeReplies;
-#endif
 #if ENABLE(PAGE_VISIBILITY_API)
     WebCore::PageVisibilityState m_visibilityState;
 #endif
index e02f42a..6ee7f03 100644 (file)
@@ -43,9 +43,6 @@ messages -> WebPage LegacyReceiver {
     TouchEvent(WebKit::WebTouchEvent event)
     TouchEventSyncForTesting(WebKit::WebTouchEvent event) -> (bool handled)
 #endif
-#if ENABLE(TOUCH_EVENTS) && PLATFORM(QT)
-    HighlightPotentialActivation(WebCore::IntPoint point, WebCore::IntSize area)
-#endif
 
 #if ENABLE(INPUT_TYPE_COLOR)
     DidEndColorPicker()
@@ -77,11 +74,6 @@ messages -> WebPage LegacyReceiver {
     Reload(bool reloadFromOrigin, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     StopLoading()
 
-#if PLATFORM(QT)
-    ApplicationSchemeReply(WebKit::QtNetworkReplyData reply)
-    RegisterApplicationScheme(WTF::String scheme)
-#endif
-
     StopLoadingFrame(uint64_t frameID)
     
     RestoreSession(WebKit::SessionState state)
@@ -163,10 +155,10 @@ messages -> WebPage LegacyReceiver {
     CountStringMatches(WTF::String string, uint32_t findOptions, unsigned maxMatchCount)
 
     # Drag and drop.
-#if (PLATFORM(QT) || PLATFORM(GTK)) && ENABLE(DRAG_SUPPORT)
+#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
     PerformDragControllerAction(uint64_t action, WebCore::DragData dragData)
 #endif
-#if !PLATFORM(QT) && !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
+#if !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
     PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, WTF::String dragStorageName, uint32_t flags, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
 #endif
 #if ENABLE(DRAG_SUPPORT)
@@ -179,11 +171,7 @@ messages -> WebPage LegacyReceiver {
 #if PLATFORM(GTK)
     FailedToShowPopupMenu()
 #endif
-#if PLATFORM(QT)
-    HidePopupMenu()
-    SelectedIndex(int32_t newIndex)
-#endif
-    
+
 #if ENABLE(CONTEXT_MENUS)
     # Context menu.
     DidSelectItemFromActiveContextMenu(WebKit::WebContextMenuItemData menuItem)
@@ -253,7 +241,7 @@ messages -> WebPage LegacyReceiver {
     CommitPageTransitionViewport()
 #endif
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     SetComposition(WTF::String text, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
     ConfirmComposition(WTF::String text, int64_t selectionStart, int64_t selectionLength)
     CancelComposition()
index 37a8b41..bb8f2db 100644 (file)
@@ -156,9 +156,6 @@ WebProcess::WebProcess()
     , m_clearResourceCachesDispatchGroup(0)
 #endif
     , m_fullKeyboardAccessEnabled(false)
-#if PLATFORM(QT)
-    , m_networkAccessManager(0)
-#endif
     , m_textCheckerState()
     , m_iconDatabaseProxy(new WebIconDatabaseProxy(this))
 #if ENABLE(NETWORK_PROCESS)
@@ -1037,13 +1034,6 @@ void WebProcess::cancelDownload(uint64_t downloadID)
     downloadManager().cancelDownload(downloadID);
 }
 
-#if PLATFORM(QT)
-void WebProcess::startTransfer(uint64_t downloadID, const String& destination)
-{
-    downloadManager().startTransfer(downloadID, destination);
-}
-#endif
-
 void WebProcess::setEnhancedAccessibility(bool flag)
 {
     WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility(flag);
index 6d473c3..bd88201 100644 (file)
 #include <wtf/text/AtomicString.h>
 #include <wtf/text/AtomicStringHash.h>
 
-#if PLATFORM(QT)
-QT_BEGIN_NAMESPACE
-class QNetworkAccessManager;
-QT_END_NAMESPACE
-#endif
-
 #if PLATFORM(MAC)
 #include <dispatch/dispatch.h>
 #endif
@@ -139,10 +133,6 @@ public:
     const TextCheckerState& textCheckerState() const { return m_textCheckerState; }
     DownloadManager& downloadManager();
 
-#if PLATFORM(QT)
-    QNetworkAccessManager* networkAccessManager() { return m_networkAccessManager; }
-#endif
-
     void clearResourceCaches(ResourceCachesToClear = AllResourceCaches);
     
 #if ENABLE(NETSCAPE_PLUGIN_API)
@@ -215,9 +205,6 @@ private:
 
     void downloadRequest(uint64_t downloadID, uint64_t initiatingPageID, const WebCore::ResourceRequest&);
     void cancelDownload(uint64_t downloadID);
-#if PLATFORM(QT)
-    void startTransfer(uint64_t downloadID, const String& destination);
-#endif
 
     void setTextCheckerState(const TextCheckerState&);
     
@@ -284,10 +271,6 @@ private:
 
     bool m_fullKeyboardAccessEnabled;
 
-#if PLATFORM(QT)
-    QNetworkAccessManager* m_networkAccessManager;
-#endif
-
     HashMap<uint64_t, WebFrame*> m_frameMap;
 
     typedef HashMap<const char*, OwnPtr<WebProcessSupplement>, PtrHash<const char*>> WebProcessSupplementMap;
index 9812684..59bce63 100644 (file)
@@ -66,9 +66,6 @@ messages -> WebProcess LegacyReceiver {
     # two messages.
     DownloadRequest(uint64_t downloadID, uint64_t initiatingPageID, WebCore::ResourceRequest request)
     CancelDownload(uint64_t downloadID)
-#if PLATFORM(QT)
-    StartTransfer(uint64_t downloadID, WTF::String destination)
-#endif
 
     SetTextCheckerState(WebKit::TextCheckerState textCheckerState)
 
index ef41dc2..e830659 100644 (file)
@@ -69,9 +69,7 @@ static const type& name() \
 #define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
 #endif
 
-#if !PLATFORM(QT)
 #include <WebCore/config.h>
-#endif
 #include <windows.h>
 
 #if USE(CG)
@@ -95,8 +93,6 @@ static const type& name() \
 #define PLUGIN_ARCHITECTURE_MAC 1
 #elif (PLATFORM(GTK) || PLATFORM(EFL)) && (OS(UNIX) && !OS(MAC_OS_X)) && PLATFORM(X11)
 #define PLUGIN_ARCHITECTURE_X11 1
-#elif PLATFORM(QT)
-// Qt handles this features.prf
 #else
 #define PLUGIN_ARCHITECTURE_UNSUPPORTED 1
 #endif
@@ -105,7 +101,7 @@ static const type& name() \
 #define PLUGIN_ARCHITECTURE(ARCH) (defined PLUGIN_ARCHITECTURE_##ARCH && PLUGIN_ARCHITECTURE_##ARCH)
 
 #ifndef ENABLE_INSPECTOR_SERVER
-#if ENABLE(INSPECTOR) && (PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL))
+#if ENABLE(INSPECTOR) && (PLATFORM(GTK) || PLATFORM(EFL))
 #define ENABLE_INSPECTOR_SERVER 1
 #endif
 #endif