Remove PLATFORM(WIN) #ifdefs
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2013 01:45:07 +0000 (01:45 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2013 01:45:07 +0000 (01:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=106279

Reviewed by Sam Weinig.

* Platform/CoreIPC/BinarySemaphore.cpp:
* Platform/CoreIPC/Connection.cpp:
(CoreIPC::Connection::waitForSyncReply):
* Platform/CoreIPC/Connection.h:
(Client):
* Platform/Module.cpp:
(WebKit::Module::Module):
* Platform/Module.h:
(Module):
* Platform/PlatformProcessIdentifier.h:
(WebKit):
* Shared/CommandLine.h:
(CommandLine):
* Shared/FontSmoothingLevel.h:
* Shared/LayerTreeContext.h:
(LayerTreeContext):
* Shared/NativeWebKeyboardEvent.h:
(NativeWebKeyboardEvent):
* Shared/NativeWebMouseEvent.h:
(NativeWebMouseEvent):
* Shared/NativeWebWheelEvent.h:
(NativeWebWheelEvent):
* Shared/PlatformPopupMenuData.cpp:
(WebKit::PlatformPopupMenuData::PlatformPopupMenuData):
(WebKit::PlatformPopupMenuData::encode):
(WebKit::PlatformPopupMenuData::decode):
* Shared/PlatformPopupMenuData.h:
(PlatformPopupMenuData):
* Shared/Plugins/PluginModuleInfo.h:
(PluginModuleInfo):
(WebKit::PluginModuleInfo::isolatedCopy):
* Shared/ShareableBitmap.h:
(ShareableBitmap):
* Shared/WebCoreArgumentCoders.h:
* Shared/WebEvent.h:
(WebMouseEvent):
* Shared/WebEventConversion.cpp:
(WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
* Shared/WebMouseEvent.cpp:
(WebKit::WebMouseEvent::WebMouseEvent):
(WebKit::WebMouseEvent::encode):
(WebKit::WebMouseEvent::decode):
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
(WebPageCreationParameters):
* Shared/WebPreferencesStore.h:
(WebKit):
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
(WebProcessCreationParameters):
* Shared/WebURLRequest.h:
* Shared/WebURLResponse.h:
* Shared/cg/ShareableBitmapCG.cpp:
(WebKit::ShareableBitmap::makeCGImageCopy):
* UIProcess/API/C/WKAPICast.h:
(WebKit::toFontSmoothingLevel):
(WebKit::toAPI):
* UIProcess/API/C/WKPage.cpp:
* UIProcess/BackingStore.h:
(BackingStore):
* UIProcess/PageClient.h:
(WebKit):
(PageClient):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
* UIProcess/WebContext.h:
(WebContext):
* UIProcess/WebFullScreenManagerProxy.h:
(WebKit):
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::WebInspectorProxy):
* UIProcess/WebInspectorProxy.h:
(WebInspectorProxy):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::performDragControllerAction):
(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::creationParameters):
(WebKit):
* UIProcess/WebPageProxy.h:
(WebKit):
(WebPageProxy):
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebProcessProxy.h:
(WebProcessProxy):
* WebKit2Prefix.h:
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
(WKBundleFrameCopyWebArchiveFilteringSubframes):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::setPrivateBrowsingEnabled):
(WebKit::InjectedBundle::switchNetworkLoaderToNewTestingSession):
* WebProcess/InjectedBundle/InjectedBundle.h:
(WebKit):
(InjectedBundle):
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_GetValue):
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
(NetscapePlugin):
* WebProcess/Plugins/PluginController.h:
(PluginController):
* WebProcess/Plugins/PluginView.cpp:
* WebProcess/Plugins/PluginView.h:
(PluginView):
* WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::selectItemWritingDirectionIsNatural):
(WebKit::WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection):
(WebKit):
* WebProcess/WebCoreSupport/WebChromeClient.h:
(WebChromeClient):
* WebProcess/WebCoreSupport/WebDragClient.cpp:
(WebKit):
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::respondToChangedSelection):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
(WebFrameLoaderClient):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
* WebProcess/WebCoreSupport/WebPopupMenu.cpp:
(WebKit::WebPopupMenu::updateFromElement):
* WebProcess/WebKitMain.cpp:
* WebProcess/WebPage/DrawingArea.h:
(WebKit):
(DrawingArea):
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::createGraphicsContext):
* WebProcess/WebPage/DrawingAreaImpl.h:
(DrawingAreaImpl):
* WebProcess/WebPage/LayerTreeHost.cpp:
(WebKit::LayerTreeHost::create):
* WebProcess/WebPage/LayerTreeHost.h:
(WebCore):
(WebKit):
(LayerTreeHost):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit):
* WebProcess/WebPage/WebFrame.h:
(WebFrame):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::installPageOverlay):
(WebKit::WebPage::uninstallPageOverlay):
(WebKit::WebPage::getWebArchiveOfFrame):
(WebKit):
* WebProcess/WebPage/WebPage.h:
(WebPage):
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::ensurePrivateBrowsingSession):
(WebKit::WebProcess::destroyPrivateBrowsingSession):
* WebProcess/WebProcess.h:
(WebProcess):
* WebProcess/WebProcess.messages.in:
* config.h:

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

75 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Platform/CoreIPC/BinarySemaphore.cpp
Source/WebKit2/Platform/CoreIPC/Connection.cpp
Source/WebKit2/Platform/CoreIPC/Connection.h
Source/WebKit2/Platform/Module.cpp
Source/WebKit2/Platform/Module.h
Source/WebKit2/Platform/PlatformProcessIdentifier.h
Source/WebKit2/Shared/CommandLine.h
Source/WebKit2/Shared/FontSmoothingLevel.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/Plugins/PluginModuleInfo.h
Source/WebKit2/Shared/ShareableBitmap.h
Source/WebKit2/Shared/WebCoreArgumentCoders.h
Source/WebKit2/Shared/WebEvent.h
Source/WebKit2/Shared/WebEventConversion.cpp
Source/WebKit2/Shared/WebMouseEvent.cpp
Source/WebKit2/Shared/WebPageCreationParameters.cpp
Source/WebKit2/Shared/WebPageCreationParameters.h
Source/WebKit2/Shared/WebPreferencesStore.h
Source/WebKit2/Shared/WebProcessCreationParameters.cpp
Source/WebKit2/Shared/WebProcessCreationParameters.h
Source/WebKit2/Shared/WebURLRequest.h
Source/WebKit2/Shared/WebURLResponse.h
Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp
Source/WebKit2/UIProcess/API/C/WKAPICast.h
Source/WebKit2/UIProcess/API/C/WKPage.cpp
Source/WebKit2/UIProcess/BackingStore.h
Source/WebKit2/UIProcess/PageClient.h
Source/WebKit2/UIProcess/WebContext.cpp
Source/WebKit2/UIProcess/WebContext.h
Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h
Source/WebKit2/UIProcess/WebInspectorProxy.cpp
Source/WebKit2/UIProcess/WebInspectorProxy.h
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/UIProcess/WebPageProxy.messages.in
Source/WebKit2/UIProcess/WebProcessProxy.h
Source/WebKit2/WebKit2Prefix.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
Source/WebKit2/WebProcess/Plugins/PluginController.h
Source/WebKit2/WebProcess/Plugins/PluginView.cpp
Source/WebKit2/WebProcess/Plugins/PluginView.h
Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp
Source/WebKit2/WebProcess/WebKitMain.cpp
Source/WebKit2/WebProcess/WebPage/DrawingArea.h
Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
Source/WebKit2/WebProcess/WebPage/WebFrame.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 ebd9669..4613d36 100644 (file)
@@ -1,3 +1,171 @@
+2013-01-07  Anders Carlsson  <andersca@apple.com>
+
+        Remove PLATFORM(WIN) #ifdefs
+        https://bugs.webkit.org/show_bug.cgi?id=106279
+
+        Reviewed by Sam Weinig.
+
+        * Platform/CoreIPC/BinarySemaphore.cpp:
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::waitForSyncReply):
+        * Platform/CoreIPC/Connection.h:
+        (Client):
+        * Platform/Module.cpp:
+        (WebKit::Module::Module):
+        * Platform/Module.h:
+        (Module):
+        * Platform/PlatformProcessIdentifier.h:
+        (WebKit):
+        * Shared/CommandLine.h:
+        (CommandLine):
+        * Shared/FontSmoothingLevel.h:
+        * Shared/LayerTreeContext.h:
+        (LayerTreeContext):
+        * Shared/NativeWebKeyboardEvent.h:
+        (NativeWebKeyboardEvent):
+        * Shared/NativeWebMouseEvent.h:
+        (NativeWebMouseEvent):
+        * Shared/NativeWebWheelEvent.h:
+        (NativeWebWheelEvent):
+        * Shared/PlatformPopupMenuData.cpp:
+        (WebKit::PlatformPopupMenuData::PlatformPopupMenuData):
+        (WebKit::PlatformPopupMenuData::encode):
+        (WebKit::PlatformPopupMenuData::decode):
+        * Shared/PlatformPopupMenuData.h:
+        (PlatformPopupMenuData):
+        * Shared/Plugins/PluginModuleInfo.h:
+        (PluginModuleInfo):
+        (WebKit::PluginModuleInfo::isolatedCopy):
+        * Shared/ShareableBitmap.h:
+        (ShareableBitmap):
+        * Shared/WebCoreArgumentCoders.h:
+        * Shared/WebEvent.h:
+        (WebMouseEvent):
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
+        * Shared/WebMouseEvent.cpp:
+        (WebKit::WebMouseEvent::WebMouseEvent):
+        (WebKit::WebMouseEvent::encode):
+        (WebKit::WebMouseEvent::decode):
+        * Shared/WebPageCreationParameters.cpp:
+        (WebKit::WebPageCreationParameters::encode):
+        (WebKit::WebPageCreationParameters::decode):
+        * Shared/WebPageCreationParameters.h:
+        (WebPageCreationParameters):
+        * Shared/WebPreferencesStore.h:
+        (WebKit):
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        (WebProcessCreationParameters):
+        * Shared/WebURLRequest.h:
+        * Shared/WebURLResponse.h:
+        * Shared/cg/ShareableBitmapCG.cpp:
+        (WebKit::ShareableBitmap::makeCGImageCopy):
+        * UIProcess/API/C/WKAPICast.h:
+        (WebKit::toFontSmoothingLevel):
+        (WebKit::toAPI):
+        * UIProcess/API/C/WKPage.cpp:
+        * UIProcess/BackingStore.h:
+        (BackingStore):
+        * UIProcess/PageClient.h:
+        (WebKit):
+        (PageClient):
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::WebContext):
+        * UIProcess/WebContext.h:
+        (WebContext):
+        * UIProcess/WebFullScreenManagerProxy.h:
+        (WebKit):
+        * UIProcess/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::WebInspectorProxy):
+        * UIProcess/WebInspectorProxy.h:
+        (WebInspectorProxy):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::performDragControllerAction):
+        (WebKit::WebPageProxy::didReceiveEvent):
+        (WebKit::WebPageProxy::creationParameters):
+        (WebKit):
+        * UIProcess/WebPageProxy.h:
+        (WebKit):
+        (WebPageProxy):
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/WebProcessProxy.h:
+        (WebProcessProxy):
+        * WebKit2Prefix.h:
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+        (WKBundleFrameCopyWebArchiveFilteringSubframes):
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
+        (WebKit::InjectedBundle::switchNetworkLoaderToNewTestingSession):
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        (WebKit):
+        (InjectedBundle):
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_GetValue):
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+        (NetscapePlugin):
+        * WebProcess/Plugins/PluginController.h:
+        (PluginController):
+        * WebProcess/Plugins/PluginView.cpp:
+        * WebProcess/Plugins/PluginView.h:
+        (PluginView):
+        * WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp:
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::selectItemWritingDirectionIsNatural):
+        (WebKit::WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection):
+        (WebKit):
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        (WebChromeClient):
+        * WebProcess/WebCoreSupport/WebDragClient.cpp:
+        (WebKit):
+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+        (WebKit::WebEditorClient::respondToChangedSelection):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+        (WebFrameLoaderClient):
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        * WebProcess/WebCoreSupport/WebPopupMenu.cpp:
+        (WebKit::WebPopupMenu::updateFromElement):
+        * WebProcess/WebKitMain.cpp:
+        * WebProcess/WebPage/DrawingArea.h:
+        (WebKit):
+        (DrawingArea):
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::createGraphicsContext):
+        * WebProcess/WebPage/DrawingAreaImpl.h:
+        (DrawingAreaImpl):
+        * WebProcess/WebPage/LayerTreeHost.cpp:
+        (WebKit::LayerTreeHost::create):
+        * WebProcess/WebPage/LayerTreeHost.h:
+        (WebCore):
+        (WebKit):
+        (LayerTreeHost):
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit):
+        * WebProcess/WebPage/WebFrame.h:
+        (WebFrame):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        (WebKit::WebPage::installPageOverlay):
+        (WebKit::WebPage::uninstallPageOverlay):
+        (WebKit::WebPage::getWebArchiveOfFrame):
+        (WebKit):
+        * WebProcess/WebPage/WebPage.h:
+        (WebPage):
+        * WebProcess/WebPage/WebPage.messages.in:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::ensurePrivateBrowsingSession):
+        (WebKit::WebProcess::destroyPrivateBrowsingSession):
+        * WebProcess/WebProcess.h:
+        (WebProcess):
+        * WebProcess/WebProcess.messages.in:
+        * config.h:
+
 2013-01-07  Alexey Proskuryakov  <ap@apple.com>
 
         [WK2] Delete more obsolete Keychain code
index d4d9e7d..3148e23 100644 (file)
@@ -28,8 +28,6 @@
 
 namespace CoreIPC {
 
-#if !PLATFORM(WIN)
-
 BinarySemaphore::BinarySemaphore()
     : m_isSet(false)
 {
@@ -63,6 +61,4 @@ bool BinarySemaphore::wait(double absoluteTime)
     return true;
 }
 
-#endif // !PLATFORM(WIN)
-
 } // namespace CoreIPC
index 4a70c53..3b1a75d 100644 (file)
@@ -50,13 +50,6 @@ public:
         return m_waitForSyncReplySemaphore.wait(absoluteTime);
     }
 
-#if PLATFORM(WIN)
-    bool waitWhileDispatchingSentWin32Messages(double absoluteTime, const Vector<HWND>& windowsToReceiveMessages)
-    {
-        return Connection::dispatchSentMessagesUntil(windowsToReceiveMessages, m_waitForSyncReplySemaphore, absoluteTime);
-    }
-#endif
-
     // Returns true if this message will be handled on a client thread that is currently
     // waiting for a reply to a synchronous message.
     bool processIncomingMessage(Connection*, IncomingMessage&);
@@ -452,11 +445,7 @@ PassOwnPtr<MessageDecoder> Connection::waitForSyncReply(uint64_t syncRequestID,
             return nullptr;
 
         // We didn't find a sync reply yet, keep waiting.
-#if PLATFORM(WIN)
-        timedOut = !m_syncMessageState->waitWhileDispatchingSentWin32Messages(absoluteTime, m_client->windowsToReceiveSentMessagesWhileWaitingForSyncReply());
-#else
-
-        // This allows the WebProcess to still serve clients while waiting for the message to return. 
+        // This allows the WebProcess to still serve clients while waiting for the message to return.
         // Notably, it can continue to process accessibility requests, which are on the main thread.
         if (syncSendFlags & SpinRunLoopWhileWaitingForReply) {
 #if PLATFORM(MAC)
@@ -467,7 +456,6 @@ PassOwnPtr<MessageDecoder> Connection::waitForSyncReply(uint64_t syncRequestID,
 #endif
         } else
             timedOut = !m_syncMessageState->wait(absoluteTime);
-#endif
         
     }
 
index a9c48d4..0c97fe1 100644 (file)
@@ -43,8 +43,6 @@
 #if HAVE(XPC)
 #include <xpc/xpc.h>
 #endif
-#elif PLATFORM(WIN)
-#include <string>
 #elif PLATFORM(QT)
 QT_BEGIN_NAMESPACE
 class QSocketNotifier;
@@ -90,10 +88,6 @@ public:
         virtual void didClose(Connection*) = 0;
         virtual void didReceiveInvalidMessage(Connection*, StringReference messageReceiverName, StringReference messageName) = 0;
 
-#if PLATFORM(WIN)
-        virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply() = 0;
-#endif
-
     protected:
         virtual ~Client() { }
     };
index a78db29..755fc87 100644 (file)
@@ -30,9 +30,6 @@ namespace WebKit {
 
 Module::Module(const String& path)
     : m_path(path)
-#if PLATFORM(WIN)
-    , m_module(0)
-#endif
 #if PLATFORM(MAC) && !defined(__LP64__)
     , m_bundleResourceMap(-1)
 #endif
index 4ce8da3..c43343b 100644 (file)
@@ -68,10 +68,6 @@ public:
     CFBundleRefNum bundleResourceMap();
 #endif
 
-#if PLATFORM(WIN)
-    void installIATHook(const char* importDLLName, const char* importFunctionName, const void* hookFunction);
-#endif
-
 private:
     void* platformFunctionPointer(const char* functionName) const;
 
@@ -81,8 +77,6 @@ private:
 #if !defined(__LP64__)
     CFBundleRefNum m_bundleResourceMap;
 #endif
-#elif PLATFORM(WIN)
-    HMODULE m_module;
 #elif PLATFORM(QT)
     QLibrary m_lib;
 #elif PLATFORM(GTK)
index 2d18975..1699d35 100644 (file)
@@ -39,8 +39,6 @@ namespace WebKit {
 
 #if PLATFORM(MAC)
 typedef pid_t PlatformProcessIdentifier;
-#elif PLATFORM(WIN)
-typedef HANDLE PlatformProcessIdentifier;
 #elif PLATFORM(QT)
 typedef QProcess* PlatformProcessIdentifier;
 #elif PLATFORM(GTK)
index 2d79510..f5955e7 100644 (file)
@@ -39,8 +39,6 @@ class CommandLine {
 public:
 #if PLATFORM(MAC)
     bool parse(int argc, char** argv);
-#elif PLATFORM(WIN)
-    bool parse(LPTSTR commandLineString);
 #endif
     String operator[](const String& key) const
     {
index 75decd6..aebddda 100644 (file)
@@ -33,9 +33,6 @@ enum FontSmoothingLevel {
     FontSmoothingLevelLight = 1,
     FontSmoothingLevelMedium = 2,
     FontSmoothingLevelStrong = 3,
-#if PLATFORM(WIN)
-    FontSmoothingLevelWindows = 4,
-#endif
 };
 
 } // namespace WebKit
index 3ff7cb4..1841ce4 100644 (file)
@@ -54,8 +54,6 @@ public:
 
 #if PLATFORM(MAC)
     uint32_t contextID;
-#elif PLATFORM(WIN)
-    HWND window;
 #elif PLATFORM(QT)
     uint32_t coordinatedLayerID;
 #elif PLATFORM(GTK)
index efb025a..95d76ab 100644 (file)
@@ -50,8 +50,6 @@ class NativeWebKeyboardEvent : public WebKeyboardEvent {
 public:
 #if USE(APPKIT)
     NativeWebKeyboardEvent(NSEvent *, NSView *);
-#elif PLATFORM(WIN)
-    NativeWebKeyboardEvent(HWND, UINT message, WPARAM, LPARAM);
 #elif PLATFORM(QT)
     explicit NativeWebKeyboardEvent(QKeyEvent*);
 #elif PLATFORM(GTK)
@@ -64,8 +62,6 @@ public:
 
 #if USE(APPKIT)
     NSEvent *nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(WIN)
-    const MSG* nativeEvent() const { return &m_nativeEvent; }
 #elif PLATFORM(QT)
     const QKeyEvent* nativeEvent() const { return &m_nativeEvent; }
 #elif PLATFORM(GTK)
@@ -80,8 +76,6 @@ public:
 private:
 #if USE(APPKIT)
     RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(WIN)
-    MSG m_nativeEvent;
 #elif PLATFORM(QT)
     QKeyEvent m_nativeEvent;
 #elif PLATFORM(GTK)
index c23d2f8..dde5b36 100644 (file)
@@ -47,8 +47,6 @@ class NativeWebMouseEvent : public WebMouseEvent {
 public:
 #if USE(APPKIT)
     NativeWebMouseEvent(NSEvent *, NSView *);
-#elif PLATFORM(WIN)
-    NativeWebMouseEvent(HWND, UINT message, WPARAM, LPARAM, bool);
 #elif PLATFORM(QT)
     explicit NativeWebMouseEvent(QMouseEvent*, const QTransform& fromItemTransform, int eventClickCount);
 #elif PLATFORM(GTK)
@@ -62,8 +60,6 @@ public:
 
 #if USE(APPKIT)
     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(WIN)
-    const MSG* nativeEvent() const { return &m_nativeEvent; }
 #elif PLATFORM(QT)
     const QMouseEvent* nativeEvent() const { return m_nativeEvent; }
 #elif PLATFORM(GTK)
@@ -75,8 +71,6 @@ public:
 private:
 #if USE(APPKIT)
     RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(WIN)
-    MSG m_nativeEvent;
 #elif PLATFORM(QT)
     QMouseEvent* m_nativeEvent;
 #elif PLATFORM(GTK)
index 43d708e..fae9e96 100644 (file)
@@ -47,8 +47,6 @@ class NativeWebWheelEvent : public WebWheelEvent {
 public:
 #if USE(APPKIT)
     NativeWebWheelEvent(NSEvent *, NSView *);
-#elif PLATFORM(WIN)
-    NativeWebWheelEvent(HWND, UINT message, WPARAM, LPARAM);
 #elif PLATFORM(QT)
     explicit NativeWebWheelEvent(QWheelEvent*, const QTransform& fromItemTransform);
 #elif PLATFORM(GTK)
@@ -60,8 +58,6 @@ public:
 
 #if USE(APPKIT)
     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(WIN)
-    const MSG* nativeEvent() const { return &m_nativeEvent; }
 #elif PLATFORM(QT)
     const QWheelEvent* nativeEvent() const { return m_nativeEvent; }
 #elif PLATFORM(GTK)
@@ -73,8 +69,6 @@ public:
 private:
 #if USE(APPKIT)
     RetainPtr<NSEvent> m_nativeEvent;
-#elif PLATFORM(WIN)
-    MSG m_nativeEvent;
 #elif PLATFORM(QT)
     QWheelEvent* m_nativeEvent;
 #elif PLATFORM(GTK)
index 9cb223c..80fd2f9 100644 (file)
 namespace WebKit {
 
 PlatformPopupMenuData::PlatformPopupMenuData()
-#if PLATFORM(WIN)
-    : m_clientPaddingLeft(0)
-    , m_clientPaddingRight(0)
-    , m_clientInsetLeft(0)
-    , m_clientInsetRight(0)
-    , m_popupWidth(0)
-    , m_itemHeight(0)
-#elif PLATFORM(QT)
+#if PLATFORM(QT)
     : multipleSelections(false)
 #endif
 {
@@ -46,22 +39,7 @@ PlatformPopupMenuData::PlatformPopupMenuData()
 
 void PlatformPopupMenuData::encode(CoreIPC::ArgumentEncoder& encoder) const
 {
-#if PLATFORM(WIN)
-    encoder << m_clientPaddingLeft;
-    encoder << m_clientPaddingRight;
-    encoder << m_clientInsetLeft;
-    encoder << m_clientInsetRight;
-    encoder << m_popupWidth;
-    encoder << m_itemHeight;
-
-    ShareableBitmap::Handle notSelectedBackingStoreHandle;
-    m_notSelectedBackingStore->createHandle(notSelectedBackingStoreHandle);
-    encoder << notSelectedBackingStoreHandle;
-
-    ShareableBitmap::Handle selectedBackingStoreHandle;
-    m_selectedBackingStore->createHandle(selectedBackingStoreHandle);
-    encoder << selectedBackingStoreHandle;
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
     encoder << fontInfo;
     encoder << shouldPopOver;
 #elif PLATFORM(QT)
@@ -73,30 +51,7 @@ void PlatformPopupMenuData::encode(CoreIPC::ArgumentEncoder& encoder) const
 
 bool PlatformPopupMenuData::decode(CoreIPC::ArgumentDecoder* decoder, PlatformPopupMenuData& data)
 {
-#if PLATFORM(WIN)
-    if (!decoder->decode(data.m_clientPaddingLeft))
-        return false;
-    if (!decoder->decode(data.m_clientPaddingRight))
-        return false;
-    if (!decoder->decode(data.m_clientInsetLeft))
-        return false;
-    if (!decoder->decode(data.m_clientInsetRight))
-        return false;
-    if (!decoder->decode(data.m_popupWidth))
-        return false;
-    if (!decoder->decode(data.m_itemHeight))
-        return false;
-
-    ShareableBitmap::Handle notSelectedBackingStoreHandle;
-    if (!decoder->decode(notSelectedBackingStoreHandle))
-        return false;
-    data.m_notSelectedBackingStore = ShareableBitmap::create(notSelectedBackingStoreHandle);
-
-    ShareableBitmap::Handle selectedBackingStoreHandle;
-    if (!decoder->decode(selectedBackingStoreHandle))
-        return false;
-    data.m_selectedBackingStore = ShareableBitmap::create(selectedBackingStoreHandle);
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
     if (!decoder->decode(data.fontInfo))
         return false;
     if (!decoder->decode(data.shouldPopOver))
index 7d9d94d..a6c885e 100644 (file)
@@ -43,16 +43,7 @@ struct PlatformPopupMenuData {
     void encode(CoreIPC::ArgumentEncoder&) const;
     static bool decode(CoreIPC::ArgumentDecoder*, PlatformPopupMenuData&);
 
-#if PLATFORM(WIN)
-    int m_clientPaddingLeft;
-    int m_clientPaddingRight;
-    int m_clientInsetLeft;
-    int m_clientInsetRight;
-    int m_popupWidth;
-    int m_itemHeight;
-    RefPtr<ShareableBitmap> m_notSelectedBackingStore;
-    RefPtr<ShareableBitmap> m_selectedBackingStore;
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
     FontInfo fontInfo;
     bool shouldPopOver;
 #elif PLATFORM(QT)
index 9e50f63..b48ff34 100644 (file)
@@ -54,8 +54,6 @@ struct PluginModuleInfo {
     cpu_type_t pluginArchitecture;
     String bundleIdentifier;
     String versionString;
-#elif PLATFORM(WIN)
-    uint64_t fileVersion;
 #endif
 
     PluginModuleInfo isolatedCopy() const
@@ -67,8 +65,6 @@ struct PluginModuleInfo {
         clone.pluginArchitecture = pluginArchitecture;
         clone.bundleIdentifier = bundleIdentifier.isolatedCopy();
         clone.versionString = versionString.isolatedCopy();
-#elif PLATFORM(WIN)
-        clone.fileVersion = fileVersion;
 #endif
         return clone;
     }
index 6a575f2..a00f1a7 100644 (file)
@@ -118,9 +118,6 @@ public:
     // This is only safe to use when we know that the contents of the shareable bitmap won't change.
     PassRefPtr<WebCore::Image> createImage();
 
-#if PLATFORM(WIN)
-    HDC windowsContext() const;
-#endif
 #if USE(CG)
     // This creates a copied CGImageRef (most likely a copy-on-write) of the shareable bitmap.
     RetainPtr<CGImageRef> makeCGImageCopy();
@@ -170,11 +167,6 @@ private:
 
     // If the shareable bitmap is backed by fastMalloced memory, this points to the data.
     void* m_data;
-
-#if PLATFORM(WIN)
-    mutable OwnPtr<HDC> m_windowsContext;
-    mutable OwnPtr<HBITMAP> m_windowsBitmap;
-#endif
 };
 
 } // namespace WebKit
index 75b4acc..93e973e 100644 (file)
@@ -148,7 +148,7 @@ template<> struct ArgumentCoder<WebCore::Cursor> {
 };
 
 template<> struct ArgumentCoder<WebCore::ResourceRequest> {
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     static const bool kShouldSerializeWebCoreData = false;
 #else
     static const bool kShouldSerializeWebCoreData = true;
@@ -161,7 +161,7 @@ template<> struct ArgumentCoder<WebCore::ResourceRequest> {
 };
 
 template<> struct ArgumentCoder<WebCore::ResourceResponse> {
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     static const bool kShouldSerializeWebCoreData = false;
 #else
     static const bool kShouldSerializeWebCoreData = true;
index 9681dc1..83e6216 100644 (file)
@@ -125,9 +125,6 @@ public:
     WebMouseEvent();
 
     WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp);
-#if PLATFORM(WIN)
-    WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp, bool didActivateWebView);
-#endif
 
     Button button() const { return static_cast<Button>(m_button); }
     const WebCore::IntPoint& position() const { return m_position; }
@@ -136,9 +133,6 @@ public:
     float deltaY() const { return m_deltaY; }
     float deltaZ() const { return m_deltaZ; }
     int32_t clickCount() const { return m_clickCount; }
-#if PLATFORM(WIN)
-    bool didActivateWebView() const { return m_didActivateWebView; }
-#endif
 
     void encode(CoreIPC::ArgumentEncoder&) const;
     static bool decode(CoreIPC::ArgumentDecoder*, WebMouseEvent&);
@@ -153,9 +147,6 @@ private:
     float m_deltaY;
     float m_deltaZ;
     int32_t m_clickCount;
-#if PLATFORM(WIN)
-    bool m_didActivateWebView;
-#endif
 };
 
 // FIXME: Move this class to its own header file.
index 0fad683..81af7eb 100644 (file)
@@ -92,10 +92,6 @@ public:
             m_modifierFlags |= WebEvent::AltKey;
         if (webEvent.metaKey())
             m_modifierFlags |= WebEvent::MetaKey;
-
-#if PLATFORM(WIN)
-        m_didActivateWebView = webEvent.didActivateWebView();
-#endif
     }
 };
 
index fb02ac3..049374b 100644 (file)
@@ -40,9 +40,6 @@ WebMouseEvent::WebMouseEvent()
     , m_deltaY(0)
     , m_deltaZ(0)
     , m_clickCount(0)
-#if PLATFORM(WIN)
-    , m_didActivateWebView(false)
-#endif
 {
 }
 
@@ -55,29 +52,10 @@ WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position,
     , m_deltaY(deltaY)
     , m_deltaZ(deltaZ)
     , m_clickCount(clickCount)
-#if PLATFORM(WIN)
-    , m_didActivateWebView(false)
-#endif
 {
     ASSERT(isMouseEventType(type));
 }
 
-#if PLATFORM(WIN)
-WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp, bool didActivateWebView)
-    : WebEvent(type, modifiers, timestamp)
-    , m_button(button)
-    , m_position(position)
-    , m_globalPosition(globalPosition)
-    , m_deltaX(deltaX)
-    , m_deltaY(deltaY)
-    , m_deltaZ(deltaZ)
-    , m_clickCount(clickCount)
-    , m_didActivateWebView(didActivateWebView)
-{
-    ASSERT(isMouseEventType(type));
-}
-#endif
-
 void WebMouseEvent::encode(CoreIPC::ArgumentEncoder& encoder) const
 {
     WebEvent::encode(encoder);
@@ -89,10 +67,6 @@ void WebMouseEvent::encode(CoreIPC::ArgumentEncoder& encoder) const
     encoder << m_deltaY;
     encoder << m_deltaZ;
     encoder << m_clickCount;
-
-#if PLATFORM(WIN)
-    encoder << m_didActivateWebView;
-#endif
 }
 
 bool WebMouseEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebMouseEvent& result)
@@ -114,10 +88,6 @@ bool WebMouseEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebMouseEvent& res
         return false;
     if (!decoder->decode(result.m_clickCount))
         return false;
-#if PLATFORM(WIN)
-    if (!decoder->decode(result.m_didActivateWebView))
-        return false;
-#endif
 
     return true;
 }
index 22e2884..e925db3 100644 (file)
@@ -64,10 +64,6 @@ void WebPageCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
     encoder.encodeEnum(layerHostingMode);
     encoder << colorSpace;
 #endif
-
-#if PLATFORM(WIN)
-    encoder << reinterpret_cast<uint64_t>(nativeWindow);
-#endif
 }
 
 bool WebPageCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, WebPageCreationParameters& parameters)
@@ -132,13 +128,6 @@ bool WebPageCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, WebPag
         return false;
 #endif
 
-#if PLATFORM(WIN)
-    uint64_t nativeWindow;
-    if (!decoder->decode(nativeWindow))
-        return false;
-    parameters.nativeWindow = reinterpret_cast<HWND>(nativeWindow);
-#endif
-
     return true;
 }
 
index 7a580f3..5803cd0 100644 (file)
@@ -92,10 +92,6 @@ struct WebPageCreationParameters {
     LayerHostingMode layerHostingMode;
     ColorSpaceData colorSpace;
 #endif
-
-#if PLATFORM(WIN)
-    HWND nativeWindow;
-#endif
 };
 
 } // namespace WebKit
index af72bed..aab3ccb 100644 (file)
@@ -36,12 +36,6 @@ namespace WebKit {
 
 // macro(KeyUpper, KeyLower, TypeNameUpper, TypeName, DefaultValue) 
 
-#if PLATFORM(WIN)
-#define DEFAULT_WEBKIT_AVFOUNDATION_ENABLED false
-#else
-#define DEFAULT_WEBKIT_AVFOUNDATION_ENABLED true
-#endif
-
 #if PLATFORM(GTK)
 #define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
 #else
@@ -108,7 +102,7 @@ namespace WebKit {
     macro(WebSecurityEnabled, webSecurityEnabled, Bool, bool, true) \
     macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
     macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
-    macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, DEFAULT_WEBKIT_AVFOUNDATION_ENABLED) \
+    macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
     macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, false) \
     macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, true) \
     macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
@@ -152,14 +146,8 @@ namespace WebKit {
 #define FOR_EACH_WEBKIT_FLOAT_PREFERENCE(macro) \
     \
 
-#if PLATFORM(WIN)
-#define DEFAULT_WEBKIT_FONT_SMOOTHING_LEVEL FontSmoothingLevelWindows
-#else
-#define DEFAULT_WEBKIT_FONT_SMOOTHING_LEVEL FontSmoothingLevelMedium
-#endif
-
 #define FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
-    macro(FontSmoothingLevel, fontSmoothingLevel, UInt32, uint32_t, DEFAULT_WEBKIT_FONT_SMOOTHING_LEVEL) \
+    macro(FontSmoothingLevel, fontSmoothingLevel, UInt32, uint32_t, FontSmoothingLevelMedium) \
     macro(MinimumFontSize, minimumFontSize, UInt32, uint32_t, 0) \
     macro(MinimumLogicalFontSize, minimumLogicalFontSize, UInt32, uint32_t, 9) \
     macro(DefaultFontSize, defaultFontSize, UInt32, uint32_t, 16) \
@@ -172,19 +160,7 @@ namespace WebKit {
     macro(InspectorAttachedHeight, inspectorAttachedHeight, UInt32, uint32_t, 300) \
     \
 
-#if PLATFORM(WIN)
-
-#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
-    macro(StandardFontFamily, standardFontFamily, String, String, "Times New Roman") \
-    macro(CursiveFontFamily, cursiveFontFamily, String, String, "Comic Sans MS") \
-    macro(FantasyFontFamily, fantasyFontFamily, String, String, "Comic Sans MS") \
-    macro(FixedFontFamily, fixedFontFamily, String, String, "Courier New") \
-    macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Arial") \
-    macro(SerifFontFamily, serifFontFamily, String, String, "Times New Roman") \
-    macro(PictographFontFamily, pictographFontFamily, String, String, "Times New Roman") \
-    \
-
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
 
 #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
index 6277083..dc127ef 100644 (file)
@@ -27,9 +27,6 @@
 #include "WebProcessCreationParameters.h"
 
 #include "ArgumentCoders.h"
-#if PLATFORM(WIN) && USE(CFNETWORK)
-#include "ArgumentCodersCF.h"
-#endif
 
 namespace WebKit {
 
@@ -43,8 +40,6 @@ WebProcessCreationParameters::WebProcessCreationParameters()
     , nsURLCacheDiskCapacity(0)
     , shouldForceScreenFontSubstitution(false)
     , shouldEnableKerningAndLigaturesByDefault(false)
-#elif PLATFORM(WIN)
-    , shouldPaintNativeControls(false)
 #endif
 #if ENABLE(NETWORK_PROCESS)
     , usesNetworkProcess(false)
@@ -105,17 +100,6 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) con
     encoder << uiProcessBundleResourcePathExtensionHandle;
     encoder << shouldForceScreenFontSubstitution;
     encoder << shouldEnableKerningAndLigaturesByDefault;
-#elif PLATFORM(WIN)
-    encoder << shouldPaintNativeControls;
-    encoder << cfURLCacheDiskCapacity;
-    encoder << cfURLCacheMemoryCapacity;
-    encoder << initialHTTPCookieAcceptPolicy;
-#if USE(CFNETWORK)
-    CFDataRef storageSession = serializedDefaultStorageSession.get();
-    encoder << static_cast<bool>(storageSession);
-    if (storageSession)
-        CoreIPC::encode(encoder, storageSession);
-#endif
 #endif
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
@@ -227,22 +211,6 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
         return false;
     if (!decoder->decode(parameters.shouldEnableKerningAndLigaturesByDefault))
         return false;
-#elif PLATFORM(WIN)
-    if (!decoder->decode(parameters.shouldPaintNativeControls))
-        return false;
-    if (!decoder->decode(parameters.cfURLCacheDiskCapacity))
-        return false;
-    if (!decoder->decode(parameters.cfURLCacheMemoryCapacity))
-        return false;
-    if (!decoder->decode(parameters.initialHTTPCookieAcceptPolicy))
-        return false;
-#if PLATFORM(MAC) || USE(CFNETWORK)
-    bool hasStorageSession = false;
-    if (!decoder->decode(hasStorageSession))
-        return false;
-    if (hasStorageSession && !CoreIPC::decode(decoder, parameters.serializedDefaultStorageSession))
-        return false;
-#endif
 #endif
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
index b727f40..cf0ec33 100644 (file)
@@ -122,19 +122,7 @@ struct WebProcessCreationParameters {
 
     bool shouldForceScreenFontSubstitution;
     bool shouldEnableKerningAndLigaturesByDefault;
-
-#elif PLATFORM(WIN)
-    uint64_t cfURLCacheDiskCapacity;
-    uint64_t cfURLCacheMemoryCapacity;
-
-    uint32_t initialHTTPCookieAcceptPolicy;
-
-    bool shouldPaintNativeControls;
-
-#if USE(CFNETWORK)
-    RetainPtr<CFDataRef> serializedDefaultStorageSession;
-#endif
-#endif // PLATFORM(WIN)
+#endif // PLATFORM(MAC)
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     HashMap<String, bool> notificationPermissions;
index a3a5931..d3e3982 100644 (file)
@@ -32,8 +32,6 @@
 
 #if PLATFORM(MAC)
 typedef NSURLRequest* PlatformRequest;
-#elif PLATFORM(WIN)
-typedef CFURLRequestRef PlatformRequest;
 #else
 typedef void* PlatformRequest;
 #endif
index 4f06db2..77bbc18 100644 (file)
@@ -32,8 +32,6 @@
 
 #if PLATFORM(MAC)
 typedef NSURLResponse* PlatformResponse;
-#elif PLATFORM(WIN)
-typedef CFURLResponseRef PlatformResponse;
 #else
 typedef void* PlatformResponse;
 #endif
index f40fd5c..a38fa45 100644 (file)
@@ -72,14 +72,12 @@ void ShareableBitmap::paint(WebCore::GraphicsContext& context, float scaleFactor
     paintImage(context.platformContext(), makeCGImageCopy().get(), scaleFactor, destination, source);
 }
 
-#if !PLATFORM(WIN)
 RetainPtr<CGImageRef> ShareableBitmap::makeCGImageCopy()
 {
     OwnPtr<GraphicsContext> graphicsContext = createGraphicsContext();
     RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(graphicsContext->platformContext()));
     return image;
 }
-#endif
 
 RetainPtr<CGImageRef> ShareableBitmap::makeCGImage()
 {
index 3c0584c..232045b 100644 (file)
@@ -210,10 +210,6 @@ inline FontSmoothingLevel toFontSmoothingLevel(WKFontSmoothingLevel wkLevel)
         return FontSmoothingLevelMedium;
     case kWKFontSmoothingLevelStrong:
         return FontSmoothingLevelStrong;
-#if PLATFORM(WIN)
-    case kWKFontSmoothingLevelWindows:
-        return FontSmoothingLevelWindows;
-#endif
     }
 
     ASSERT_NOT_REACHED();
@@ -232,10 +228,6 @@ inline WKFontSmoothingLevel toAPI(FontSmoothingLevel level)
         return kWKFontSmoothingLevelMedium;
     case FontSmoothingLevelStrong:
         return kWKFontSmoothingLevelStrong;
-#if PLATFORM(WIN)
-    case FontSmoothingLevelWindows:
-        return kWKFontSmoothingLevelWindows;
-#endif
     }
 
     ASSERT_NOT_REACHED();
index a276606..c6759bd 100644 (file)
@@ -690,7 +690,7 @@ void WKPageExecuteCommand(WKPageRef pageRef, WKStringRef command)
     toImpl(pageRef)->executeEditCommand(toImpl(command)->string());
 }
 
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
 struct ComputedPagesContext {
     ComputedPagesContext(WKPageComputePagesForPrintingFunction callback, void* context)
         : callback(callback)
index bd301bb..7c2613f 100644 (file)
@@ -32,8 +32,6 @@
 
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
-#elif PLATFORM(WIN) || PLATFORM(WIN_CAIRO)
-#include <wtf/OwnPtr.h>
 #endif
 
 #if PLATFORM(QT)
@@ -41,7 +39,7 @@
 #include <QtGui/QPixmap>
 #endif
 
-#if USE(CAIRO) && !PLATFORM(WIN_CAIRO)
+#if USE(CAIRO)
 #include <RefPtrCairo.h>
 #include <WebCore/WidgetBackingStore.h>
 #endif
@@ -64,8 +62,6 @@ public:
 
 #if PLATFORM(MAC)
     typedef CGContextRef PlatformGraphicsContext;
-#elif PLATFORM(WIN)
-    typedef HDC PlatformGraphicsContext;
 #elif PLATFORM(QT)
     typedef QPainter* PlatformGraphicsContext;
 #elif USE(CAIRO)
@@ -100,8 +96,6 @@ private:
     // Contents of m_scrolledRect are offset by this amount (and wrapped around) with respect to
     // their original location.
     WebCore::IntSize m_scrolledRectOffset;
-#elif PLATFORM(WIN) || PLATFORM(WIN_CAIRO)
-    OwnPtr<HBITMAP> m_bitmap;
 #elif PLATFORM(QT)
     QPixmap m_pixmap;
 #elif USE(CAIRO)
index fdb6a50..d08cc91 100644 (file)
@@ -68,10 +68,6 @@ class WebPopupMenuProxy;
 class WebColorChooserProxy;
 #endif
 
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
 #if PLATFORM(MAC)
 struct ColorSpaceData;
 #endif
@@ -167,9 +163,6 @@ public:
     virtual void setPromisedData(const String& pasteboardName, PassRefPtr<WebCore::SharedBuffer> imageBuffer, const String& filename, const String& extension, const String& title,
                                  const String& url, const String& visibleUrl, PassRefPtr<WebCore::SharedBuffer> archiveBuffer) = 0;
 #endif
-#if PLATFORM(WIN)
-    virtual void compositionSelectionChanged(bool) = 0;
-#endif
 #if PLATFORM(GTK)
     virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&) = 0;
 #endif
@@ -194,9 +187,6 @@ public:
 #endif
 
     virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate) = 0;
-#if PLATFORM(WIN)
-    virtual void didInstallOrUninstallPageOverlay(bool) = 0;
-#endif
 
 #if USE(ACCELERATED_COMPOSITING)
     virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) = 0;
@@ -204,12 +194,6 @@ public:
     virtual void updateAcceleratedCompositingMode(const LayerTreeContext&) = 0;
 #endif
 
-#if PLATFORM(WIN)
-    virtual HWND nativeWindow() = 0;
-    virtual void setGestureReachedScrollingLimit(bool) = 0;
-    virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&) = 0;
-#endif
-
 #if PLATFORM(MAC)
     virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) = 0;
     virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) = 0;
index 0c79c85..2cb8c2a 100644 (file)
@@ -136,10 +136,6 @@ WebContext::WebContext(ProcessModel processModel, const String& injectedBundlePa
     , m_cacheModel(CacheModelDocumentViewer)
     , m_memorySamplerEnabled(false)
     , m_memorySamplerInterval(1400.0)
-#if PLATFORM(WIN)
-    , m_shouldPaintNativeControls(true)
-    , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAlways)
-#endif
 #if USE(SOUP)
     , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
 #endif
index 652cd2e..fc93a08 100644 (file)
@@ -186,10 +186,7 @@ public:
     void startMemorySampler(const double interval);
     void stopMemorySampler();
 
-#if PLATFORM(WIN)
-    void setShouldPaintNativeControls(bool);
-#endif
-#if PLATFORM(WIN) || USE(SOUP)
+#if USE(SOUP)
     void setInitialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy) { m_initialHTTPCookieAcceptPolicy = policy; }
 #endif
     void setEnhancedAccessibility(bool);
@@ -425,10 +422,7 @@ private:
     typedef HashMap<AtomicString, RefPtr<WebContextSupplement> > WebContextSupplementMap;
     WebContextSupplementMap m_supplements;
 
-#if PLATFORM(WIN)
-    bool m_shouldPaintNativeControls;
-#endif
-#if PLATFORM(WIN) || USE(SOUP)
+#if USE(SOUP)
     HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy;
 #endif
 
index 04aed9a..1fa2ee8 100644 (file)
@@ -54,9 +54,6 @@ namespace WebKit {
     
 #if PLATFORM(MAC)
 typedef WKView PlatformWebView;
-#elif PLATFORM(WIN)
-class WebView;
-typedef WebView PlatformWebView;
 #elif PLATFORM(QT)
 typedef QQuickWebView PlatformWebView;
 #elif PLATFORM(GTK)
index 5bc2702..b2a6a5a 100644 (file)
@@ -42,9 +42,6 @@
 #if ENABLE(INSPECTOR_SERVER)
 #include "WebInspectorServer.h"
 #endif
-#if PLATFORM(WIN)
-#include "WebView.h"
-#endif
 
 using namespace WebCore;
 
@@ -86,9 +83,7 @@ WebInspectorProxy::WebInspectorProxy(WebPageProxy* page)
     , m_isDebuggingJavaScript(false)
     , m_isProfilingJavaScript(false)
     , m_isProfilingPage(false)
-#if PLATFORM(WIN)
-    , m_inspectorWindow(0)
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK) || PLATFORM(EFL)
     , m_inspectorView(0)
     , m_inspectorWindow(0)
 #endif
index 4a94d2e..b8b0401 100644 (file)
@@ -46,10 +46,6 @@ OBJC_CLASS WKWebInspectorProxyObjCAdapter;
 OBJC_CLASS WKWebInspectorWKView;
 #endif
 
-#if PLATFORM(WIN)
-#include <WebCore/WindowMessageListener.h>
-#endif
-
 #if PLATFORM(GTK)
 #include "WebInspectorClientGtk.h"
 #endif
@@ -66,15 +62,7 @@ class WebPageGroup;
 class WebPageProxy;
 struct WebPageCreationParameters;
 
-#if PLATFORM(WIN)
-class WebView;
-#endif
-
-class WebInspectorProxy : public APIObject
-#if PLATFORM(WIN)
-    , public WebCore::WindowMessageListener
-#endif
-{
+class WebInspectorProxy : public APIObject {
 public:
     static const Type APIType = TypeInspector;
 
@@ -182,20 +170,6 @@ private:
 
     static WebPageGroup* inspectorPageGroup();
 
-#if PLATFORM(WIN)
-    static bool registerInspectorViewWindowClass();
-    static LRESULT CALLBACK InspectorViewWndProc(HWND, UINT, WPARAM, LPARAM);
-    LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-
-    LRESULT onSizeEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
-    LRESULT onMinMaxInfoEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
-    LRESULT onSetFocusEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
-    LRESULT onCloseEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
-
-    void onWebViewWindowPosChangingEvent(WPARAM, LPARAM);
-    virtual void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM);
-#endif
-
 #if PLATFORM(GTK) || PLATFORM(EFL)
     void createInspectorWindow();
 #endif
@@ -223,9 +197,6 @@ private:
     RetainPtr<NSButton> m_dockButton;
     RetainPtr<WKWebInspectorProxyObjCAdapter> m_inspectorProxyObjCAdapter;
     String m_urlString;
-#elif PLATFORM(WIN)
-    HWND m_inspectorWindow;
-    RefPtr<WebView> m_inspectorView;
 #elif PLATFORM(GTK)
     WebInspectorClientGtk m_client;
     GtkWidget* m_inspectorView;
index 2016cba..30a1474 100644 (file)
@@ -1029,11 +1029,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
 {
     if (!isValid())
         return;
-#if PLATFORM(WIN)
-    // FIXME: We should pass the drag data map only on DragEnter.
-    m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData->clientPosition(), dragData->globalPosition(),
-        dragData->draggingSourceOperationMask(), dragData->dragDataMap(), dragData->flags()), m_pageID);
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || 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);
@@ -3470,10 +3466,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
 
         if (m_uiClient.implementsDidNotHandleKeyEvent())
             m_uiClient.didNotHandleKeyEvent(this, event);
-#if PLATFORM(WIN)
-        else
-            ::TranslateMessage(event.nativeEvent());
-#endif
         break;
     }
 #if ENABLE(TOUCH_EVENTS)
@@ -3815,9 +3807,6 @@ WebPageCreationParameters WebPageProxy::creationParameters() const
     parameters.colorSpace = m_pageClient->colorSpace();
 #endif
 
-#if PLATFORM(WIN)
-    parameters.nativeWindow = m_pageClient->nativeWindow();
-#endif
     return parameters;
 }
 
@@ -4066,7 +4055,7 @@ void WebPageProxy::computePagesForPrinting(WebFrameProxy* frame, const PrintInfo
     m_process->send(Messages::WebPage::ComputePagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
 }
 
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
 void WebPageProxy::drawRectToImage(WebFrameProxy* frame, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, PassRefPtr<ImageCallback> prpCallback)
 {
     RefPtr<ImageCallback> callback = prpCallback;
index 2ed0af1..4da2cde 100644 (file)
@@ -160,10 +160,6 @@ struct PrintInfo;
 struct WebPageCreationParameters;
 struct WebPopupItem;
 
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
 #if ENABLE(GESTURE_EVENTS)
 class WebGestureEvent;
 #endif
@@ -417,28 +413,13 @@ public:
     void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize);
 #endif
 #endif
-#if PLATFORM(WIN)
-    void didChangeCompositionSelection(bool);
-    void confirmComposition(const String&);
-    void setComposition(const String&, Vector<WebCore::CompositionUnderline>&, int);
-    WebCore::IntRect firstRectForCharacterInSelectedRange(int);
-    String getSelectedText();
-
-    bool gestureWillBegin(const WebCore::IntPoint&);
-    void gestureDidScroll(const WebCore::IntSize&);
-    void gestureDidEnd();
-
-    void setGestureReachedScrollingLimit(bool);
-
-    HWND nativeWindow() const;
-#endif
 #if PLATFORM(EFL)
     void handleInputMethodKeydown(bool& handled);
     void confirmComposition(const String&);
     void setComposition(const String&, Vector<WebCore::CompositionUnderline>&, int);
     void cancelComposition();
 #endif
-#if USE(CAIRO) && !PLATFORM(WIN_CAIRO)
+#if USE(CAIRO)
     PlatformWidget viewWidget();
 #endif
 #if USE(TILED_BACKING_STORE)
@@ -558,9 +539,6 @@ public:
     void setFindIndicator(const WebCore::FloatRect& selectionRectInWindowCoordinates, const Vector<WebCore::FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate);
     void didFindString(const String&, uint32_t matchCount);
     void didFailToFindString(const String&);
-#if PLATFORM(WIN)
-    void didInstallOrUninstallPageOverlay(bool);
-#endif
 
     void getContentsAsString(PassRefPtr<StringCallback>);
 #if ENABLE(MHTML)
@@ -608,9 +586,6 @@ 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(WIN)
-    void startDragDrop(const WebCore::IntPoint& imagePoint, const WebCore::IntPoint& dragPoint, uint64_t okEffect, const HashMap<UINT, Vector<String> >& dataMap, uint64_t fileSize, const String& pathname, const SharedMemory::Handle& fileContentHandle, const WebCore::IntSize& dragImageSize, const SharedMemory::Handle& dragImageHandle, bool isLinkDrag);
-#endif
 #if PLATFORM(QT) || PLATFORM(GTK)
     void startDrag(const WebCore::DragData&, const ShareableBitmap::Handle& dragImage);
 #endif
@@ -705,7 +680,7 @@ public:
     void beginPrinting(WebFrameProxy*, const PrintInfo&);
     void endPrinting();
     void computePagesForPrinting(WebFrameProxy*, const PrintInfo&, PassRefPtr<ComputedPagesCallback>);
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     void drawRectToImage(WebFrameProxy*, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, PassRefPtr<ImageCallback>);
     void drawPagesToPDF(WebFrameProxy*, const PrintInfo&, uint32_t first, uint32_t count, PassRefPtr<DataCallback>);
 #elif PLATFORM(GTK)
@@ -947,9 +922,6 @@ private:
     // Popup Menu.
     void showPopupMenu(const WebCore::IntRect& rect, uint64_t textDirection, const Vector<WebPopupItem>& items, int32_t selectedIndex, const PlatformPopupMenuData&);
     void hidePopupMenu();
-#if PLATFORM(WIN)
-    void setPopupMenuSelectedIndex(int32_t);
-#endif
 
 #if ENABLE(CONTEXT_MENUS)
     // Context Menu.
@@ -1051,10 +1023,6 @@ private:
 
     void updateBackingStoreDiscardableState();
 
-#if PLATFORM(WIN)
-    void scheduleChildWindowGeometryUpdate(const WindowGeometry&);
-#endif
-
     void setRenderTreeSize(uint64_t treeSize) { m_renderTreeSize = treeSize; }
 
 #if PLUGIN_ARCHITECTURE(X11)
index 0edcd9d..c155047 100644 (file)
@@ -204,9 +204,6 @@ messages -> WebPageProxy {
 
     # Editor notifications
     EditorStateChanged(WebKit::EditorState editorState)
-#if PLATFORM(WIN)
-    DidChangeCompositionSelection(bool hasChanged)
-#endif
 #if PLATFORM(QT)
     WillSetInputMethodState()
 #endif
@@ -215,16 +212,10 @@ messages -> WebPageProxy {
     SetFindIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, float contentImageScaleFactor, WebKit::ShareableBitmap::Handle contentImageHandle, bool fadeOut, bool animate)
     DidFindString(WTF::String string, uint32_t matchCount)
     DidFailToFindString(WTF::String string)
-#if PLATFORM(WIN)
-    DidInstallOrUninstallPageOverlay(bool didInstall)
-#endif
 
     # PopupMenu messages
     ShowPopupMenu(WebCore::IntRect rect, uint64_t textDirection, Vector<WebKit::WebPopupItem> items, int32_t selectedIndex, WebKit::PlatformPopupMenuData data)
     HidePopupMenu()
-#if PLATFORM(WIN)
-    SetPopupMenuSelectedIndex(int32_t selectedIndex)
-#endif
 
 #if ENABLE(CONTEXT_MENUS)
     # ContextMenu messages
@@ -266,9 +257,6 @@ 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(WIN) && ENABLE(DRAG_SUPPORT)
-    StartDragDrop(WebCore::IntPoint imagePoint, WebCore::IntPoint dragPoint, uint64_t okEffect, HashMap<UINT,Vector<String> > dataMap, uint64_t fileSize, String pathname, WebKit::SharedMemory::Handle fileContentHandle, WebCore::IntSize dragImageSize, WebKit::SharedMemory::Handle dragImage, bool linkDrag)
-#endif
 #if (PLATFORM(QT) || PLATFORM(GTK)) && ENABLE(DRAG_SUPPORT)
     StartDrag(WebCore::DragData dragData, WebKit::ShareableBitmap::Handle dragImage)
 #endif
@@ -317,14 +305,6 @@ messages -> WebPageProxy {
     DictationAlternatives(uint64_t dictationContext) -> (Vector<String> alternatives)
 #endif
 
-#if PLATFORM(WIN)
-    # Windows 7 Gesture Messages
-    SetGestureReachedScrollingLimit(bool limitReached)
-
-    # Miscellaneous Windows messages
-    ScheduleChildWindowGeometryUpdate(WebKit::WindowGeometry geometry)
-#endif
-
 #if PLUGIN_ARCHITECTURE(X11)
     # X11 windowed plugin messages
     CreatePluginContainer() -> (uint64_t windowID)
index 134eab2..890676f 100644 (file)
@@ -154,9 +154,6 @@ private:
     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
     virtual void didClose(CoreIPC::Connection*) OVERRIDE;
     virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
-#if PLATFORM(WIN)
-    virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply() OVERRIDE;
-#endif
 
     // CoreIPC::Connection::QueueClient
     virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
index a32ee1c..4582ebc 100644 (file)
@@ -59,7 +59,7 @@
 #define ENABLE_SHARED_WORKER_PROCESS 1
 #endif
 
-#elif !PLATFORM(WIN)
+#else
 #define ENABLE_SHARED_WORKER_PROCESS 1
 #endif
 
index 55c2927..9c1049b 100644 (file)
@@ -266,7 +266,7 @@ WKDataRef WKBundleFrameCopyWebArchive(WKBundleFrameRef frameRef)
 
 WKDataRef WKBundleFrameCopyWebArchiveFilteringSubframes(WKBundleFrameRef frameRef, WKBundleFrameFrameFilterCallback frameFilterCallback, void* context)
 {
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     RetainPtr<CFDataRef> data = toImpl(frameRef)->webArchiveData(frameFilterCallback, context);
     if (data)
         return WKDataCreate(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
index f192287..89560b7 100644 (file)
@@ -290,7 +290,7 @@ void InjectedBundle::setJavaScriptCanAccessClipboard(WebPageGroupProxy* pageGrou
 
 void InjectedBundle::setPrivateBrowsingEnabled(WebPageGroupProxy* pageGroup, bool enabled)
 {
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
     if (enabled)
         WebFrameNetworkingContext::ensurePrivateBrowsingSession();
     else
@@ -311,7 +311,7 @@ void InjectedBundle::setPopupBlockingEnabled(WebPageGroupProxy* pageGroup, bool
 
 void InjectedBundle::switchNetworkLoaderToNewTestingSession()
 {
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
     // FIXME (NetworkProcess): Do this in network process, too.
     InitWebCoreSystemInterface();
     NetworkStorageSession::switchToNewTestingSession();
index 5aa1ad1..9859115 100644 (file)
@@ -61,8 +61,6 @@ namespace WebKit {
 
 #if PLATFORM(MAC)
 typedef NSBundle *PlatformBundle;
-#elif PLATFORM(WIN)
-typedef HMODULE PlatformBundle;
 #elif PLATFORM(QT)
 typedef QLibrary PlatformBundle;
 #elif PLATFORM(GTK)
@@ -97,10 +95,6 @@ public:
     void initializeClient(WKBundleClient*);
     void postMessage(const String&, APIObject*);
     void postSynchronousMessage(const String&, APIObject*, RefPtr<APIObject>& returnData);
-#if PLATFORM(WIN)
-    void setHostAllowsAnyHTTPSCertificate(const String&);
-    void setClientCertificate(const String& host, const String& certificateSystemStoreName, const WebCertificateInfo*);
-#endif
 
     WebConnection* webConnectionToUIProcess() const;
 
index 8602e3a..b496c3b 100644 (file)
@@ -524,15 +524,6 @@ static NPError NPN_GetValue(NPP npp, NPNVariable variable, void *value)
             *(NPBool*)value = true;
             break;
 #endif
-#elif PLATFORM(WIN)
-       case NPNVnetscapeWindow: {
-           RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
-           *reinterpret_cast<HWND*>(value) = plugin->containingWindow();
-           break;
-       }
-       case NPNVSupportsWindowless:
-           *(NPBool*)value = true;
-           break;
 #elif PLUGIN_ARCHITECTURE(X11)
        case NPNVxDisplay: {
            if (!npp)
index 4a7670c..f8ff927 100644 (file)
@@ -82,8 +82,6 @@ public:
     static unsigned buttonState();
 #endif
 
-#elif PLATFORM(WIN)
-    HWND containingWindow();
 #endif
 
     PluginQuirks quirks() const { return m_pluginModule->pluginQuirks(); }
index 6682ba0..f6efeef 100644 (file)
@@ -45,10 +45,6 @@ namespace WebCore {
 
 namespace WebKit {
 
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
 class PluginController {
 public:
     // Returns false if the plugin has explicitly been hidden. Returns true otherwise (even if the plugin is currently obscured from view on screen.)
@@ -101,15 +97,6 @@ public:
     // Tells the controller that we're about to dispatch an event to the plug-in.
     virtual void willSendEventToPlugin() = 0;
     
-#if PLATFORM(WIN)
-    // The window to use as the parent of the plugin's window.
-    virtual HWND nativeParentWindow() = 0;
-
-    // Tells the controller that the given HWND needs to be positioned and clipped to the given
-    // coordinates sometime soon. The controller will decide exactly when this will happen.
-    virtual void scheduleWindowedPluginGeometryUpdate(const WindowGeometry&) = 0;
-#endif
-
 #if PLATFORM(MAC)
     // Tells the controller that the plug-in focus or window focus did change.
     virtual void pluginFocusOrWindowFocusChanged(bool) = 0;
index 70aab40..6be8977 100644 (file)
@@ -1352,18 +1352,6 @@ void PluginView::willSendEventToPlugin()
     m_webPage->send(Messages::WebPageProxy::StopResponsivenessTimer());
 }
 
-#if PLATFORM(WIN)
-HWND PluginView::nativeParentWindow()
-{
-    return m_webPage->nativeWindow();
-}
-
-void PluginView::scheduleWindowedPluginGeometryUpdate(const WindowGeometry& geometry)
-{
-    m_webPage->drawingArea()->scheduleChildWindowGeometryUpdate(geometry);
-}
-#endif
-
 #if PLATFORM(MAC)
 void PluginView::pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus)
 {
index 7e07a7b..ad4a4cb 100644 (file)
@@ -178,10 +178,6 @@ private:
     virtual bool isAcceleratedCompositingEnabled();
     virtual void pluginProcessCrashed();
     virtual void willSendEventToPlugin();
-#if PLATFORM(WIN)
-    virtual HWND nativeParentWindow();
-    virtual void scheduleWindowedPluginGeometryUpdate(const WindowGeometry&);
-#endif
 #if PLATFORM(MAC)
     virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus);
     virtual void setComplexTextInputState(PluginComplexTextInputState);
index 86372cf..d286224 100644 (file)
 
 #if USE(CFURLCACHE)
 
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#elif PLATFORM(MAC)
+#if PLATFORM(MAC)
 #include "WebKitSystemInterface.h"
 #endif
 
 
 namespace WebKit {
 
-#if PLATFORM(WIN)
-// The Windows version of WKSI defines these functions as capitalized, while the Mac version defines them as lower case.
-static inline CFArrayRef WKCFURLCacheCopyAllHostNamesInPersistentStore() { return wkCFURLCacheCopyAllHostNamesInPersistentStore(); }
-static inline void WKCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostNames) { return wkCFURLCacheDeleteHostNamesInPersistentStore(hostNames); }
-#endif
-
 RetainPtr<CFArrayRef> WebResourceCacheManager::cfURLCacheHostNames()
 {
     return RetainPtr<CFArrayRef>(AdoptCF, WKCFURLCacheCopyAllHostNamesInPersistentStore());
index b019b95..fe9438a 100644 (file)
@@ -676,7 +676,7 @@ void WebChromeClient::formStateDidChange(const Node*)
 
 bool WebChromeClient::selectItemWritingDirectionIsNatural()
 {
-#if PLATFORM(WIN) || PLATFORM(EFL)
+#if PLATFORM(EFL)
     return true;
 #else
     return false;
@@ -685,11 +685,7 @@ bool WebChromeClient::selectItemWritingDirectionIsNatural()
 
 bool WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
 {
-#if PLATFORM(WIN)
-    return false;
-#else
     return true;
-#endif
 }
 
 bool WebChromeClient::hasOpenedPopup() const
@@ -735,15 +731,6 @@ void WebChromeClient::scheduleCompositingLayerFlush()
 
 #endif
 
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
-WebCore::GraphicsDeviceAdapter* WebChromeClient::graphicsDeviceAdapter() const
-{
-    if (!m_page->drawingArea())
-        return 0;
-    return m_page->drawingArea()->layerTreeHost()->graphicsDeviceAdapter();
-}
-#endif
-
 #if ENABLE(TOUCH_EVENTS)
 void WebChromeClient::needTouchEvents(bool needTouchEvents)
 {
@@ -751,12 +738,6 @@ void WebChromeClient::needTouchEvents(bool needTouchEvents)
 }
 #endif
 
-#if PLATFORM(WIN)
-void WebChromeClient::setLastSetCursorToCurrentCursor()
-{
-}
-#endif
-
 #if ENABLE(FULLSCREEN_API)
 bool WebChromeClient::supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard)
 {
index b19b5fe..4ea87e6 100644 (file)
@@ -194,18 +194,10 @@ private:
     }
 #endif
 
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
-    virtual WebCore::GraphicsDeviceAdapter* graphicsDeviceAdapter() const OVERRIDE;
-#endif
-
 #if ENABLE(TOUCH_EVENTS)
     virtual void needTouchEvents(bool) OVERRIDE;
 #endif
 
-#if PLATFORM(WIN)
-    virtual void setLastSetCursorToCurrentCursor() OVERRIDE;
-#endif
-
 #if ENABLE(FULLSCREEN_API)
     virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard) OVERRIDE;
     virtual void enterFullScreenForElement(WebCore::Element*) OVERRIDE;
index d56a030..9b6cd85 100644 (file)
@@ -56,7 +56,7 @@ DragSourceAction WebDragClient::dragSourceActionMaskForPoint(const IntPoint& /*w
     return DragSourceActionAny;
 }
 
-#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(QT) && !PLATFORM(GTK)
+#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(GTK)
 void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard*, Frame*, bool)
 {
 }
index 1f72708..c6cc9c2 100644 (file)
@@ -193,15 +193,7 @@ void WebEditorClient::respondToChangedSelection(Frame* frame)
 
     m_page->send(Messages::WebPageProxy::EditorStateChanged(state));
 
-#if PLATFORM(WIN)
-    // FIXME: This should also go into the selection state.
-    if (!frame->editor()->hasComposition() || frame->editor()->ignoreCompositionSelectionChange())
-        return;
-
-    unsigned start;
-    unsigned end;
-    m_page->send(Messages::WebPageProxy::DidChangeCompositionSelection(frame->editor()->getCompositionSelection(start, end)));
-#elif PLATFORM(GTK) || PLATFORM(QT)
+#if PLATFORM(GTK) || PLATFORM(QT)
     updateGlobalSelection(frame);
 #endif
 }
index 29e8c4f..9e04ad0 100644 (file)
@@ -1565,17 +1565,6 @@ NSCachedURLResponse* WebFrameLoaderClient::willCacheResponse(DocumentLoader*, un
 
 #endif // PLATFORM(MAC)
 
-#if PLATFORM(WIN) && USE(CFNETWORK)
-bool WebFrameLoaderClient::shouldCacheResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&, const unsigned char* data, unsigned long long length)
-{
-    WebPage* webPage = m_frame->page();
-    if (!webPage)
-        return true;
-
-    return webPage->injectedBundleResourceLoadClient().shouldCacheResponse(webPage, m_frame, identifier);
-}
-#endif // PLATFORM(WIN) && USE(CFNETWORK)
-
 #if ENABLE(WEB_INTENTS)
 void WebFrameLoaderClient::dispatchIntent(PassRefPtr<IntentRequest> request)
 {
index e1e1553..1cb9f60 100644 (file)
@@ -219,10 +219,6 @@ private:
     
     virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const OVERRIDE;
 #endif
-#if PLATFORM(WIN) && USE(CFNETWORK)
-    // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
-    virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length) OVERRIDE;
-#endif
 
 #if ENABLE(WEB_INTENTS)
     virtual void dispatchIntent(PassRefPtr<WebCore::IntentRequest>) OVERRIDE;
index 0ffba0c..9dc48c5 100644 (file)
 #include "WebResourceLoadScheduler.h"
 #endif
 
-#if PLATFORM(WIN) && USE(CFNETWORK)
-#include "WebFrameNetworkingContext.h"
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
 using namespace WebCore;
 
 namespace WebKit {
index 4c309dc..d4af92f 100644 (file)
@@ -131,13 +131,6 @@ void WebPopupMenu::hide()
 
 void WebPopupMenu::updateFromElement()
 {
-#if PLATFORM(WIN)
-    if (!m_page || !m_popupClient)
-        return;
-
-    int selectedIndex = m_popupClient->selectedIndex();
-    WebProcess::shared().connection()->send(Messages::WebPageProxy::SetPopupMenuSelectedIndex(selectedIndex), m_page->pageID());
-#endif
 }
 
 } // namespace WebKit
index 0d2a0e1..820d840 100644 (file)
@@ -41,8 +41,6 @@
 
 #if PLATFORM(MAC)
 #include <objc/objc-auto.h>
-#elif PLATFORM(WIN)
-#include <shlwapi.h>
 #endif
 
 using namespace WebKit;
@@ -88,117 +86,4 @@ int WebKitMain(int argc, char** argv)
     return WebKitMain(commandLine);
 }
 
-#elif PLATFORM(WIN)
-
-static void enableDataExecutionPrevention()
-{
-    // Enable Data Execution prevention at runtime rather than via /NXCOMPAT
-    // http://blogs.msdn.com/michael_howard/archive/2008/01/29/new-nx-apis-added-to-windows-vista-sp1-windows-xp-sp3-and-windows-server-2008.aspx
-
-    const DWORD enableDEP = 0x00000001;
-
-    HMODULE hMod = ::GetModuleHandleW(L"Kernel32.dll");
-    if (!hMod)
-        return;
-
-    typedef BOOL (WINAPI *PSETDEP)(DWORD);
-
-    PSETDEP procSet = reinterpret_cast<PSETDEP>(::GetProcAddress(hMod, "SetProcessDEPPolicy"));
-    if (!procSet)
-        return;
-
-    // Enable Data Execution Prevention, but allow ATL thunks (for compatibility with the version of ATL that ships with the Platform SDK).
-    procSet(enableDEP);
-}
-
-static void enableTerminationOnHeapCorruption()
-{
-    // Enable termination on heap corruption on OSes that support it (Vista and XPSP3).
-    // http://msdn.microsoft.com/en-us/library/aa366705(VS.85).aspx
-
-    const HEAP_INFORMATION_CLASS heapEnableTerminationOnCorruption = static_cast<HEAP_INFORMATION_CLASS>(1);
-
-    HMODULE hMod = ::GetModuleHandleW(L"kernel32.dll");
-    if (!hMod)
-        return;
-
-    typedef BOOL (WINAPI*HSI)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T);
-    HSI heapSetInformation = reinterpret_cast<HSI>(::GetProcAddress(hMod, "HeapSetInformation"));
-    if (!heapSetInformation)
-        return;
-
-    heapSetInformation(0, heapEnableTerminationOnCorruption, 0, 0);
-}
-
-static void disableUserModeCallbackExceptionFilter()
-{
-    const DWORD PROCESS_CALLBACK_FILTER_ENABLED = 0x1;
-    typedef BOOL (NTAPI *getProcessUserModeExceptionPolicyPtr)(LPDWORD lpFlags);
-    typedef BOOL (NTAPI *setProcessUserModeExceptionPolicyPtr)(DWORD dwFlags);
-
-    HMODULE lib = LoadLibrary(TEXT("kernel32.dll"));
-    ASSERT(lib);
-
-    getProcessUserModeExceptionPolicyPtr getPolicyPtr = (getProcessUserModeExceptionPolicyPtr)GetProcAddress(lib, "GetProcessUserModeExceptionPolicy");
-    setProcessUserModeExceptionPolicyPtr setPolicyPtr = (setProcessUserModeExceptionPolicyPtr)GetProcAddress(lib, "SetProcessUserModeExceptionPolicy");
-
-    DWORD dwFlags;
-    if (!getPolicyPtr || !setPolicyPtr || !getPolicyPtr(&dwFlags)) {
-        FreeLibrary(lib);
-        return;
-    }
-
-    // If this flag isn't cleared, exceptions that are thrown when running in a 64-bit version of
-    // Windows are ignored, possibly leaving Safari in an inconsistent state that could cause an 
-    // unrelated exception to be thrown.
-    // http://support.microsoft.com/kb/976038
-    // http://blog.paulbetts.org/index.php/2010/07/20/the-case-of-the-disappearing-onload-exception-user-mode-callback-exceptions-in-x64/
-    setPolicyPtr(dwFlags & ~PROCESS_CALLBACK_FILTER_ENABLED);
-
-    FreeLibrary(lib);
-}
-
-#ifndef NDEBUG
-static void pauseProcessIfNeeded(HMODULE module)
-{
-    // Show an alert when Ctrl-Alt-Shift is held down during launch to give the user time to attach a
-    // debugger. This is useful for debugging problems that happen early in the web process's lifetime.
-    const unsigned short highBitMaskShort = 0x8000;
-    if (!getenv("WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH") && !((::GetKeyState(VK_CONTROL) & highBitMaskShort) && (::GetKeyState(VK_MENU) & highBitMaskShort) && (::GetKeyState(VK_SHIFT) & highBitMaskShort)))
-        return;
-
-    wchar_t path[MAX_PATH];
-    DWORD length = ::GetModuleFileNameW(module, path, WTF_ARRAY_LENGTH(path));
-    if (!length || length == WTF_ARRAY_LENGTH(path))
-        return;
-
-    wchar_t* startOfFilename = ::PathFindFileNameW(path);
-    String filenameString(startOfFilename, length - (startOfFilename - path));
-
-    String message = L"You can now attach a debugger to " + filenameString + L". You can use the same debugger for " + filenameString + L" and the UI process, if desired. Click OK when you are ready for " + filenameString + L" to continue.";
-    String title = filenameString + L" has launched";
-    ::MessageBoxW(0, message.charactersWithNullTermination(), title.charactersWithNullTermination(), MB_OK | MB_ICONINFORMATION);
-}
-#endif
-
-extern "C" __declspec(dllexport) 
-int WebKitMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow)
-{
-#ifndef NDEBUG
-    pauseProcessIfNeeded(hInstance);
-#endif
-
-    enableDataExecutionPrevention();
-
-    enableTerminationOnHeapCorruption();
-
-    disableUserModeCallbackExceptionFilter();
-
-    CommandLine commandLine;
-    if (!commandLine.parse(lpstrCmdLine))
-        return EXIT_FAILURE;
-
-    return WebKitMain(commandLine);
-}
-
 #endif
index ae5b2c8..a05d003 100644 (file)
@@ -52,10 +52,6 @@ class WebPage;
 struct WebPageCreationParameters;
 struct WebPreferencesStore;
 
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
 class DrawingArea {
     WTF_MAKE_NONCOPYABLE(DrawingArea);
 
@@ -98,10 +94,6 @@ public:
     virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) = 0;
 #endif
 
-#if PLATFORM(WIN)
-    virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&) = 0;
-#endif
-
     virtual void dispatchAfterEnsuringUpdatedScrollPosition(const Function<void ()>&);
 
 protected:
index 8530e5a..a07d732 100644 (file)
@@ -652,12 +652,10 @@ static bool shouldPaintBoundsRect(const IntRect& bounds, const Vector<IntRect>&
     return wastedSpace <= wastedSpaceThreshold;
 }
 
-#if !PLATFORM(WIN)
 PassOwnPtr<GraphicsContext> DrawingAreaImpl::createGraphicsContext(ShareableBitmap* bitmap)
 {
     return bitmap->createGraphicsContext();
 }
-#endif
 
 void DrawingAreaImpl::display(UpdateInfo& updateInfo)
 {
index a313316..526e59b 100644 (file)
@@ -74,10 +74,6 @@ private:
     virtual void scheduleCompositingLayerFlush() OVERRIDE;
 #endif
 
-#if PLATFORM(WIN)
-    virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&);
-#endif
-
 #if PLATFORM(MAC)
     virtual void setLayerHostingMode(uint32_t) OVERRIDE;
 #endif
index 3e3042d..aae8293 100644 (file)
 #include "config.h"
 #include "LayerTreeHost.h"
 
-#if USE(CA)
 #if PLATFORM(MAC)
 #include "LayerTreeHostCAMac.h"
-#elif PLATFORM(WIN)
-#include "LayerTreeHostCAWin.h"
-#endif
 #endif
 
 #if USE(COORDINATED_GRAPHICS)
@@ -50,8 +46,6 @@ PassRefPtr<LayerTreeHost> LayerTreeHost::create(WebPage* webPage)
 {
 #if PLATFORM(MAC)
     return LayerTreeHostCAMac::create(webPage);
-#elif PLATFORM(WIN) && HAVE(WKQCA)
-    return LayerTreeHostCAWin::create(webPage);
 #elif USE(COORDINATED_GRAPHICS)
     return CoordinatedLayerTreeHost::create(webPage);
 #elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
index ed89105..2096c0c 100644 (file)
@@ -44,10 +44,6 @@ class IntRect;
 class IntSize;
 class GraphicsLayer;
 class GraphicsLayerFactory;
-
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
-struct GraphicsDeviceAdapter;
-#endif
 }
 
 namespace WebKit {
@@ -55,10 +51,6 @@ namespace WebKit {
 class UpdateInfo;
 class WebPage;
 
-#if PLATFORM(WIN)
-struct WindowGeometry;
-#endif
-
 class LayerTreeHost : public RefCounted<LayerTreeHost> {
 public:
     static PassRefPtr<LayerTreeHost> create(WebPage*);
@@ -99,18 +91,10 @@ public:
     virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) = 0;
 #endif
 
-#if PLATFORM(WIN)
-    virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&) = 0;
-#endif
-
 #if PLATFORM(MAC)
     virtual void setLayerHostingMode(LayerHostingMode) { }
 #endif
 
-#if PLATFORM(WIN) && USE(AVFOUNDATION)
-    virtual WebCore::GraphicsDeviceAdapter* graphicsDeviceAdapter() const { return 0; }
-#endif
-
 #if USE(COORDINATED_GRAPHICS) && ENABLE(REQUEST_ANIMATION_FRAME)
     virtual void scheduleAnimation() = 0;
 #endif
@@ -125,7 +109,7 @@ protected:
 #endif
 };
 
-#if !PLATFORM(WIN) && !USE(COORDINATED_GRAPHICS)
+#if !USE(COORDINATED_GRAPHICS)
 inline bool LayerTreeHost::supportsAcceleratedCompositing()
 {
     return true;
index 983a5e7..8efca5c 100644 (file)
@@ -74,7 +74,7 @@
 #include <WebCore/PlatformMessagePortChannel.h>
 #endif
 
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
 #include <WebCore/LegacyWebArchive.h>
 #endif
 
@@ -840,7 +840,7 @@ void WebFrame::setTextDirection(const String& direction)
         m_coreFrame->editor()->setBaseWritingDirection(RightToLeftWritingDirection);
 }
 
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
 
 class WebFrameFilter : public FrameFilter {
 public:
index 83c793e..096e1fd 100644 (file)
@@ -155,7 +155,7 @@ public:
     void setLoadListener(LoadListener* loadListener) { m_loadListener = loadListener; }
     LoadListener* loadListener() const { return m_loadListener; }
     
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     typedef bool (*FrameFilterFunction)(WKBundleFrameRef, WKBundleFrameRef subframe, void* context);
     RetainPtr<CFDataRef> webArchiveData(FrameFilterFunction, void* context);
 #endif
index e06e3a3..8781e71 100644 (file)
@@ -240,8 +240,6 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
     , m_isSmartInsertDeleteEnabled(parameters.isSmartInsertDeleteEnabled)
     , m_layerHostingMode(parameters.layerHostingMode)
     , m_keyboardEventBeingInterpreted(0)
-#elif PLATFORM(WIN)
-    , m_nativeWindow(parameters.nativeWindow)
 #elif PLATFORM(GTK)
     , m_accessibilityObject(0)
 #endif
@@ -273,9 +271,6 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
     , m_isShowingContextMenu(false)
 #endif
     , m_willGoToBackForwardItemCallbackEnabled(true)
-#if PLATFORM(WIN)
-    , m_gestureReachedScrollingLimit(false)
-#endif
 #if ENABLE(PAGE_VISIBILITY_API)
     , m_visibilityState(WebCore::PageVisibilityStateVisible)
 #endif
@@ -1345,10 +1340,6 @@ void WebPage::installPageOverlay(PassRefPtr<PageOverlay> pageOverlay)
         m_pageOverlay->startFadeInAnimation();
 
     m_drawingArea->didInstallPageOverlay();
-#if PLATFORM(WIN)
-    send(Messages::WebPageProxy::DidInstallOrUninstallPageOverlay(true));
-#endif
-
     m_pageOverlay->setNeedsDisplay();
 }
 
@@ -1366,9 +1357,6 @@ void WebPage::uninstallPageOverlay(PageOverlay* pageOverlay, bool fadeOut)
     m_pageOverlay = nullptr;
 
     m_drawingArea->didUninstallPageOverlay();
-#if PLATFORM(WIN)
-    send(Messages::WebPageProxy::DidInstallOrUninstallPageOverlay(false));
-#endif
 }
 
 static ImageOptions snapshotOptionsToImageOptions(SnapshotOptions snapshotOptions)
@@ -2190,7 +2178,7 @@ void WebPage::getWebArchiveOfFrame(uint64_t frameID, uint64_t callbackID)
 {
     CoreIPC::DataReference dataReference;
 
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     RetainPtr<CFDataRef> data;
     if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
         if ((data = frame->webArchiveData(0, 0)))
@@ -2463,38 +2451,7 @@ bool WebPage::handleEditingKeyboardEvent(KeyboardEvent* evt)
 
 #if ENABLE(DRAG_SUPPORT)
 
-#if PLATFORM(WIN)
-void WebPage::performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WebCore::DragDataMap& dataMap, uint32_t flags)
-{
-    if (!m_page) {
-        send(Messages::WebPageProxy::DidPerformDragControllerAction(WebCore::DragSession()));
-        return;
-    }
-
-    DragData dragData(dataMap, clientPosition, globalPosition, static_cast<DragOperation>(draggingSourceOperationMask), static_cast<DragApplicationFlags>(flags));
-    switch (action) {
-    case DragControllerActionEntered:
-        send(Messages::WebPageProxy::DidPerformDragControllerAction(m_page->dragController()->dragEntered(&dragData)));
-        break;
-
-    case DragControllerActionUpdated:
-        send(Messages::WebPageProxy::DidPerformDragControllerAction(m_page->dragController()->dragUpdated(&dragData)));
-        break;
-        
-    case DragControllerActionExited:
-        m_page->dragController()->dragExited(&dragData);
-        break;
-        
-    case DragControllerActionPerformDrag:
-        m_page->dragController()->performDrag(&dragData);
-        break;
-        
-    default:
-        ASSERT_NOT_REACHED();
-    }
-}
-
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
 void WebPage::performDragControllerAction(uint64_t action, WebCore::DragData dragData)
 {
     if (!m_page) {
@@ -3299,7 +3256,7 @@ void WebPage::computePagesForPrinting(uint64_t frameID, const PrintInfo& printIn
     send(Messages::WebPageProxy::ComputedPagesCallback(resultPageRects, resultTotalScaleFactorForPrinting, callbackID));
 }
 
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
 void WebPage::drawRectToImage(uint64_t frameID, const PrintInfo& printInfo, const WebCore::IntRect& rect, const WebCore::IntSize& imageSize, uint64_t callbackID)
 {
     WebFrame* frame = WebProcess::shared().webFrame(frameID);
index 14fc91e..1eb6332 100644 (file)
@@ -349,8 +349,6 @@ public:
     void updatePluginsActiveAndFocusedState();
     const WebCore::IntRect& windowFrameInScreenCoordinates() const { return m_windowFrameInScreenCoordinates; }
     const WebCore::IntRect& viewFrameInWindowCoordinates() const { return m_viewFrameInWindowCoordinates; }
-#elif PLATFORM(WIN)
-    HWND nativeWindow() const { return m_nativeWindow; }
 #endif
 
     bool windowIsFocused() const;
@@ -457,15 +455,6 @@ public:
     void acceptsFirstMouse(int eventNumber, const WebKit::WebMouseEvent&, bool& result);
     bool performNonEditingBehaviorForSelector(const String&);
     void insertDictatedText(const String& text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, const Vector<WebCore::DictationAlternative>& dictationAlternativeLocations, bool& handled, EditorState& newState);
-#elif PLATFORM(WIN)
-    void confirmComposition(const String& compositionString);
-    void setComposition(const WTF::String& compositionString, const WTF::Vector<WebCore::CompositionUnderline>& underlines, uint64_t cursorPosition);
-    void firstRectForCharacterInSelectedRange(const uint64_t characterPosition, WebCore::IntRect& resultRect);
-    void getSelectedText(WTF::String&);
-
-    void gestureWillBegin(const WebCore::IntPoint&, bool& canBeginPanning);
-    void gestureDidScroll(const WebCore::IntSize&);
-    void gestureDidEnd();
 #elif PLATFORM(EFL)
     void confirmComposition(const String& compositionString);
     void setComposition(const WTF::String& compositionString, const WTF::Vector<WebCore::CompositionUnderline>& underlines, uint64_t cursorPosition);
@@ -503,9 +492,7 @@ public:
     void clearSelection();
 
 #if ENABLE(DRAG_SUPPORT)
-#if PLATFORM(WIN)
-    void performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WebCore::DragDataMap&, uint32_t flags);
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT) || 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&);
@@ -519,7 +506,7 @@ public:
     void beginPrinting(uint64_t frameID, const PrintInfo&);
     void endPrinting();
     void computePagesForPrinting(uint64_t frameID, const PrintInfo&, uint64_t callbackID);
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     void drawRectToImage(uint64_t frameID, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, uint64_t callbackID);
     void drawPagesToPDF(uint64_t frameID, const PrintInfo&, uint32_t first, uint32_t count, uint64_t callbackID);
 #elif PLATFORM(GTK)
@@ -849,11 +836,6 @@ private:
 
     WebCore::KeyboardEvent* m_keyboardEventBeingInterpreted;
 
-#elif PLATFORM(WIN)
-    // Our view's window (in the UI process).
-    HWND m_nativeWindow;
-
-    RefPtr<WebCore::Node> m_gestureTargetNode;
 #elif PLATFORM(GTK)
     GRefPtr<WebPageAccessibilityObject> m_accessibilityObject;
 
@@ -947,9 +929,6 @@ private:
     
     bool m_willGoToBackForwardItemCallbackEnabled;
 
-#if PLATFORM(WIN)
-    bool m_gestureReachedScrollingLimit;
-#endif
 #if PLATFORM(QT)
     HashMap<String, QtNetworkReply*> m_applicationSchemeReplies;
 #endif
index b305ddd..00cdddd 100644 (file)
@@ -155,13 +155,10 @@ messages -> WebPage {
     CountStringMatches(WTF::String string, uint32_t findOptions, unsigned maxMatchCount)
 
     # Drag and drop.
-#if PLATFORM(WIN) && ENABLE(DRAG_SUPPORT)
-    PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, HashMap<UINT,Vector<String>> dataMap, uint32_t flags)
-#endif
 #if (PLATFORM(QT) || PLATFORM(GTK)) && ENABLE(DRAG_SUPPORT)
     PerformDragControllerAction(uint64_t action, WebCore::DragData dragData)
 #endif
-#if !PLATFORM(WIN) && !PLATFORM(QT) && !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
+#if !PLATFORM(QT) && !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)
@@ -216,7 +213,7 @@ messages -> WebPage {
     BeginPrinting(uint64_t frameID, WebKit::PrintInfo printInfo)
     EndPrinting()
     ComputePagesForPrinting(uint64_t frameID, WebKit::PrintInfo printInfo, uint64_t callbackID)
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     DrawRectToImage(uint64_t frameID, WebKit::PrintInfo printInfo, WebCore::IntRect rect, WebCore::IntSize imageSize, uint64_t callbackID)
     DrawPagesToPDF(uint64_t frameID, WebKit::PrintInfo printInfo, uint32_t first, uint32_t count, uint64_t callbackID)
 #endif
@@ -282,17 +279,6 @@ messages -> WebPage {
     AcceptsFirstMouse(int eventNumber, WebKit::WebMouseEvent event) -> (bool result)
     InsertDictatedText(WTF::String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, WTF::Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
 #endif
-#if PLATFORM(WIN)
-    // FIXME: Unify with Mac counterparts.
-    ConfirmComposition(WTF::String compositionString)
-    SetComposition(WTF::String compositionString, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
-    FirstRectForCharacterInSelectedRange(uint64_t characterPosition) -> (WebCore::IntRect resultRect)
-    GetSelectedText() -> (WTF::String text)
-
-    GestureWillBegin(WebCore::IntPoint point) -> (bool canBeginPanning)
-    GestureDidScroll(WebCore::IntSize size)
-    GestureDidEnd()
-#endif
 #if PLATFORM(EFL)
     ConfirmComposition(WTF::String compositionString)
     SetComposition(WTF::String compositionString, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
index 039af74..a4359e4 100644 (file)
@@ -313,7 +313,7 @@ void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parame
     if (parameters.shouldUseFontSmoothing)
         setShouldUseFontSmoothing(true);
 
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
     WebFrameNetworkingContext::setPrivateBrowsingStorageSessionIdentifierBase(parameters.uiProcessBundleIdentifier);
 #endif
 
@@ -421,14 +421,14 @@ void WebProcess::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
 
 void WebProcess::ensurePrivateBrowsingSession()
 {
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
     WebFrameNetworkingContext::ensurePrivateBrowsingSession();
 #endif
 }
 
 void WebProcess::destroyPrivateBrowsingSession()
 {
-#if (PLATFORM(MAC) || USE(CFNETWORK)) && !PLATFORM(WIN)
+#if PLATFORM(MAC) || USE(CFNETWORK)
     WebFrameNetworkingContext::destroyPrivateBrowsingSession();
 #endif
 }
index 1e82c53..b7b978e 100644 (file)
@@ -219,9 +219,6 @@ private:
     void setShouldUseFontSmoothing(bool);
     void userPreferredLanguagesChanged(const Vector<String>&) const;
     void fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled);
-#if PLATFORM(WIN)
-    void setShouldPaintNativeControls(bool);
-#endif
 
     void setVisitedLinkTable(const SharedMemory::Handle&);
     void visitedLinkStateChanged(const Vector<WebCore::LinkHash>& linkHashes);
@@ -283,9 +280,6 @@ private:
     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
     virtual void didClose(CoreIPC::Connection*);
     virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
-#if PLATFORM(WIN)
-    virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
-#endif
 
     // CoreIPC::Connection::QueueClient
     virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
index 29e1d9e..f6c3bda 100644 (file)
@@ -51,9 +51,6 @@ messages -> WebProcess {
     SetShouldUseFontSmoothing(bool useFontSmoothing)
     UserPreferredLanguagesChanged(Vector<WTF::String> languages)
     FullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
-#if PLATFORM(WIN)
-    SetShouldPaintNativeControls(bool shouldPaintNativeControls)
-#endif
 #if USE(SOUP)
     SetIgnoreTLSErrors(bool ignoreTLSErrors)
 #endif
index b58e952..9995ea7 100644 (file)
@@ -106,8 +106,6 @@ static const type& name() \
 #ifndef PLUGIN_ARCHITECTURE_UNSUPPORTED
 #if PLATFORM(MAC)
 #define PLUGIN_ARCHITECTURE_MAC 1
-#elif PLATFORM(WIN)
-#define PLUGIN_ARCHITECTURE_WIN 1
 #elif (PLATFORM(GTK) || PLATFORM(EFL)) && (OS(UNIX) && !OS(MAC_OS_X))
 #define PLUGIN_ARCHITECTURE_X11 1
 #elif PLATFORM(QT)