Diff
Modified: trunk/Source/WebKit/ChangeLog (223261 => 223262)
--- trunk/Source/WebKit/ChangeLog 2017-10-12 21:44:05 UTC (rev 223261)
+++ trunk/Source/WebKit/ChangeLog 2017-10-12 22:36:55 UTC (rev 223262)
@@ -1,3 +1,62 @@
+2017-10-12 Stephan Szabo <[email protected]>
+
+ [WinCairo] add WebProcess files for wincairo webkit
+ https://bugs.webkit.org/show_bug.cgi?id=178024
+
+ Reviewed by Alex Christensen.
+
+ * PlatformWin.cmake:
+ * WebProcess/Cookies/curl/WebCookieManagerCurl.cpp: Added.
+ (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy):
+ (WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy):
+ * WebProcess/InjectedBundle/win/InjectedBundleWin.cpp: Added.
+ (WebKit::InjectedBundle::initialize):
+ (WebKit::InjectedBundle::setBundleParameter):
+ (WebKit::InjectedBundle::setBundleParameters):
+ * WebProcess/Plugins/Netscape/JSNPObject.cpp:
+ * WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp: Added.
+ (WebKit::PluginProxy::needsBackingStore const):
+ * WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp: Added.
+ (WebKit::WebContextMenuClient::lookUpInDictionary):
+ (WebKit::WebContextMenuClient::isSpeaking):
+ (WebKit::WebContextMenuClient::speak):
+ (WebKit::WebContextMenuClient::stopSpeaking):
+ * WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp: Added.
+ (WebKit::WebFrameNetworkingContext::ensurePrivateBrowsingSession):
+ (WebKit::WebFrameNetworkingContext::ensureWebsiteDataStoreSession):
+ (WebKit::WebFrameNetworkingContext::WebFrameNetworkingContext):
+ (WebKit::WebFrameNetworkingContext::storageSession const):
+ (WebKit::WebFrameNetworkingContext::webFrameLoaderClient const):
+ (WebKit::WebFrameNetworkingContext::blockedError const):
+ * WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h: Added.
+ (WebKit::WebFrameNetworkingContext::create):
+ * WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp: Added.
+ (WebKit::WebPopupMenu::setUpPlatformData):
+ * WebProcess/WebPage/win/WebInspectorUIWin.cpp: Added.
+ (WebKit::WebInspectorUI::canSave):
+ (WebKit::WebInspectorUI::localizedStringsURL):
+ (WebKit::RemoteWebInspectorUI::localizedStringsURL):
+ * WebProcess/WebPage/win/WebPageWin.cpp: Added.
+ (WebKit::WebPage::platformInitialize):
+ (WebKit::WebPage::platformDetach):
+ (WebKit::WebPage::platformEditorState const):
+ (WebKit::WebPage::platformPreferencesDidChange):
+ (WebKit::WebPage::performDefaultBehaviorForKeyEvent):
+ (WebKit::WebPage::platformHasLocalDataForURL):
+ (WebKit::WebPage::cachedResponseMIMETypeForURL):
+ (WebKit::WebPage::platformCanHandleRequest):
+ (WebKit::WebPage::cachedSuggestedFilenameForURL):
+ (WebKit::WebPage::cachedResponseDataForURL):
+ (WebKit::WebPage::platformUserAgent const):
+ (WebKit::WebPage::interpretKeyEvent):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::ensureWebToStorageProcessConnection):
+ * WebProcess/win/WebProcessWin.cpp: Added.
+ (loadResourceIntoBuffer):
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ (WebKit::WebProcess::platformTerminate):
+ (WebKit::WebProcess::platformSetCacheModel):
+
2017-10-12 David Kilzer <[email protected]>
[iOS] Fix -Wunused-lambda-capture warnings in WebCore/WebKit with new clang compiler
Modified: trunk/Source/WebKit/PlatformWin.cmake (223261 => 223262)
--- trunk/Source/WebKit/PlatformWin.cmake 2017-10-12 21:44:05 UTC (rev 223261)
+++ trunk/Source/WebKit/PlatformWin.cmake 2017-10-12 22:36:55 UTC (rev 223262)
@@ -23,7 +23,33 @@
StorageProcess/win/StorageProcessMainWin.cpp
+ WebProcess/Cookies/curl/WebCookieManagerCurl.cpp
+
+ WebProcess/InjectedBundle/win/InjectedBundleWin.cpp
+
+ WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
+
+ WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp
+
+ WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp
+ WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp
+ WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
+
+ WebProcess/WebPage/AcceleratedDrawingArea.cpp
+ WebProcess/WebPage/AcceleratedSurface.cpp
+ WebProcess/WebPage/DrawingAreaImpl.cpp
+
+ WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp
+ WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
+ WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
+ WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
+ WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp
+
+ WebProcess/WebPage/win/WebInspectorUIWin.cpp
+ WebProcess/WebPage/win/WebPageWin.cpp
+
WebProcess/win/WebProcessMainWin.cpp
+ WebProcess/win/WebProcessWin.cpp
)
# DerivedSources/_javascript_Core/inspector/InspectorBackendCommands.js is
Added: trunk/Source/WebKit/WebProcess/Cookies/curl/WebCookieManagerCurl.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/Cookies/curl/WebCookieManagerCurl.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/Cookies/curl/WebCookieManagerCurl.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebCookieManager.h"
+
+#include "ChildProcess.h"
+#include <WebCore/NetworkStorageSession.h>
+#include <wtf/text/CString.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy)
+{
+}
+
+HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
+{
+ return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
+}
+
+} // namespace WebKit
Added: trunk/Source/WebKit/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "InjectedBundle.h"
+
+#include "WKBundleAPICast.h"
+#include "WKBundleInitialize.h"
+#include <WebCore/FileSystem.h>
+#include <wtf/text/CString.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+typedef void (*BundleInitializeFunction)(WKBundleRef, WKTypeRef);
+
+bool InjectedBundle::initialize(const WebProcessCreationParameters&, API::Object* initializationUserData)
+{
+ return false;
+}
+
+void InjectedBundle::setBundleParameter(WTF::String const&, IPC::DataReference const&)
+{
+}
+
+void InjectedBundle::setBundleParameters(const IPC::DataReference&)
+{
+}
+
+} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPObject.cpp (223261 => 223262)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPObject.cpp 2017-10-12 21:44:05 UTC (rev 223261)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPObject.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -39,6 +39,7 @@
#include <_javascript_Core/JSLock.h>
#include <_javascript_Core/ObjectPrototype.h>
#include <WebCore/CommonVM.h>
+#include <WebCore/DOMWindow.h>
#include <WebCore/IdentifierRep.h>
#include <WebCore/JSDOMWindowBase.h>
#include <wtf/Assertions.h>
Added: trunk/Source/WebKit/WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "PluginProxy.h"
+
+#if ENABLE(PLUGIN_PROCESS)
+
+#include <WebCore/NotImplemented.h>
+
+namespace WebKit {
+
+bool PluginProxy::needsBackingStore() const
+{
+ notImplemented();
+ return true;
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(PLUGIN_PROCESS)
Added: trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebContextMenuClient.h"
+
+#if ENABLE(CONTEXT_MENUS)
+
+#include <WebCore/NotImplemented.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebContextMenuClient::lookUpInDictionary(Frame*)
+{
+ notImplemented();
+}
+
+bool WebContextMenuClient::isSpeaking()
+{
+ notImplemented();
+ return false;
+}
+
+void WebContextMenuClient::speak(const String&)
+{
+ notImplemented();
+}
+
+void WebContextMenuClient::stopSpeaking()
+{
+ notImplemented();
+}
+
+} // namespace WebKit
+#endif // ENABLE(CONTEXT_MENUS)
Added: trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebFrameNetworkingContext.h"
+
+#include "NetworkSession.h"
+#include "SessionTracker.h"
+#include "WebFrame.h"
+#include "WebPage.h"
+#include <WebCore/FrameLoader.h>
+#include <WebCore/NetworkStorageSession.h>
+#include <WebCore/ResourceError.h>
+#include <WebCore/Settings.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebFrameNetworkingContext::ensurePrivateBrowsingSession(PAL::SessionID sessionID)
+{
+ ASSERT(isMainThread());
+ ASSERT(sessionID.isEphemeral());
+
+ if (NetworkStorageSession::storageSession(sessionID))
+ return;
+}
+
+void WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&)
+{
+ // FIXME: Implement
+}
+
+WebFrameNetworkingContext::WebFrameNetworkingContext(WebFrame* frame)
+ : FrameNetworkingContext(frame->coreFrame())
+{
+}
+
+NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
+{
+ if (frame()) {
+ if (auto* storageSession = NetworkStorageSession::storageSession(frame()->page()->sessionID()))
+ return *storageSession;
+ }
+ return NetworkStorageSession::defaultStorageSession();
+}
+
+WebFrameLoaderClient* WebFrameNetworkingContext::webFrameLoaderClient() const
+{
+ if (!frame())
+ return nullptr;
+
+ return toWebFrameLoaderClient(frame()->loader().client());
+}
+
+WebCore::ResourceError WebFrameNetworkingContext::blockedError(const WebCore::ResourceRequest&) const
+{
+ return WebCore::ResourceError();
+}
+
+}
Added: trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h (0 => 223262)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h (rev 0)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <WebCore/FrameNetworkingContext.h>
+#include <pal/SessionID.h>
+
+namespace WebKit {
+
+class WebFrame;
+class WebFrameLoaderClient;
+struct WebsiteDataStoreParameters;
+
+class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
+public:
+ static Ref<WebFrameNetworkingContext> create(WebFrame* frame)
+ {
+ return adoptRef(*new WebFrameNetworkingContext(frame));
+ }
+
+ static void ensurePrivateBrowsingSession(PAL::SessionID);
+ static void ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&);
+
+ WebFrameLoaderClient* webFrameLoaderClient() const;
+
+
+ WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const;
+
+private:
+ WebFrameNetworkingContext(WebFrame*);
+
+ WebCore::NetworkStorageSession& storageSession() const override;
+};
+
+}
Added: trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebPopupMenu.h"
+
+#include "PlatformPopupMenuData.h"
+#include <WebCore/NotImplemented.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebPopupMenu::setUpPlatformData(const IntRect&, PlatformPopupMenuData&)
+{
+ notImplemented();
+}
+
+} // namespace WebKit
Added: trunk/Source/WebKit/WebProcess/WebPage/win/WebInspectorUIWin.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/WebPage/win/WebInspectorUIWin.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/WebPage/win/WebInspectorUIWin.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebInspectorUI.h"
+
+#include "RemoteWebInspectorUI.h"
+
+#include <WebCore/FileSystem.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+bool WebInspectorUI::canSave()
+{
+ return false;
+}
+
+String WebInspectorUI::localizedStringsURL()
+{
+ return String();
+}
+
+String RemoteWebInspectorUI::localizedStringsURL()
+{
+ return String();
+}
+
+} // namespace WebKit
Added: trunk/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebPage.h"
+
+#include "EditorState.h"
+#include "NotImplemented.h"
+#include "WebEvent.h"
+#include "WebFrame.h"
+#include "WebPageProxyMessages.h"
+#include "WebProcess.h"
+#include "WindowsKeyboardCodes.h"
+#include <WebCore/BackForwardController.h>
+#include <WebCore/EventHandler.h>
+#include <WebCore/EventNames.h>
+#include <WebCore/FocusController.h>
+#include <WebCore/Frame.h>
+#include <WebCore/FrameView.h>
+#include <WebCore/KeyboardEvent.h>
+#include <WebCore/Page.h>
+#include <WebCore/PlatformKeyboardEvent.h>
+#include <WebCore/Settings.h>
+#include <WebCore/SharedBuffer.h>
+#include <WebCore/UserAgent.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebPage::platformInitialize()
+{
+}
+
+void WebPage::platformDetach()
+{
+}
+
+void WebPage::platformEditorState(Frame& frame, EditorState& result, IncludePostLayoutDataHint shouldIncludePostLayoutData) const
+{
+}
+
+void WebPage::platformPreferencesDidChange(const WebPreferencesStore&)
+{
+ notImplemented();
+}
+
+bool WebPage::performDefaultBehaviorForKeyEvent(const WebKeyboardEvent& keyboardEvent)
+{
+ if (keyboardEvent.type() != WebEvent::KeyDown && keyboardEvent.type() != WebEvent::RawKeyDown)
+ return false;
+
+ switch (keyboardEvent.windowsVirtualKeyCode()) {
+ case VK_SPACE:
+ scroll(m_page.get(), keyboardEvent.shiftKey() ? ScrollUp : ScrollDown, ScrollByPage);
+ break;
+ case VK_LEFT:
+ scroll(m_page.get(), ScrollLeft, ScrollByLine);
+ break;
+ case VK_RIGHT:
+ scroll(m_page.get(), ScrollRight, ScrollByLine);
+ break;
+ case VK_UP:
+ scroll(m_page.get(), ScrollUp, ScrollByLine);
+ break;
+ case VK_DOWN:
+ scroll(m_page.get(), ScrollDown, ScrollByLine);
+ break;
+ case VK_HOME:
+ scroll(m_page.get(), ScrollUp, ScrollByDocument);
+ break;
+ case VK_END:
+ scroll(m_page.get(), ScrollDown, ScrollByDocument);
+ break;
+ case VK_PRIOR:
+ scroll(m_page.get(), ScrollUp, ScrollByPage);
+ break;
+ case VK_NEXT:
+ scroll(m_page.get(), ScrollDown, ScrollByPage);
+ break;
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+bool WebPage::platformHasLocalDataForURL(const URL&)
+{
+ notImplemented();
+ return false;
+}
+
+String WebPage::cachedResponseMIMETypeForURL(const URL&)
+{
+ notImplemented();
+ return String();
+}
+
+bool WebPage::platformCanHandleRequest(const ResourceRequest&)
+{
+ notImplemented();
+ return false;
+}
+
+String WebPage::cachedSuggestedFilenameForURL(const URL&)
+{
+ notImplemented();
+ return String();
+}
+
+RefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
+{
+ notImplemented();
+ return 0;
+}
+
+String WebPage::platformUserAgent(const URL& url) const
+{
+ if (url.isNull() || !m_page->settings().needsSiteSpecificQuirks())
+ return String();
+
+ return String();
+}
+
+static const unsigned CtrlKey = 1 << 0;
+static const unsigned AltKey = 1 << 1;
+static const unsigned ShiftKey = 1 << 2;
+
+struct KeyDownEntry {
+ unsigned virtualKey;
+ unsigned modifiers;
+ const char* name;
+};
+
+struct KeyPressEntry {
+ unsigned charCode;
+ unsigned modifiers;
+ const char* name;
+};
+
+static const KeyDownEntry keyDownEntries[] = {
+ { VK_LEFT, 0, "MoveLeft" },
+ { VK_LEFT, ShiftKey, "MoveLeftAndModifySelection" },
+ { VK_LEFT, CtrlKey, "MoveWordLeft" },
+ { VK_LEFT, CtrlKey | ShiftKey, "MoveWordLeftAndModifySelection" },
+ { VK_RIGHT, 0, "MoveRight" },
+ { VK_RIGHT, ShiftKey, "MoveRightAndModifySelection" },
+ { VK_RIGHT, CtrlKey, "MoveWordRight" },
+ { VK_RIGHT, CtrlKey | ShiftKey, "MoveWordRightAndModifySelection" },
+ { VK_UP, 0, "MoveUp" },
+ { VK_UP, ShiftKey, "MoveUpAndModifySelection" },
+ { VK_PRIOR, ShiftKey, "MovePageUpAndModifySelection" },
+ { VK_DOWN, 0, "MoveDown" },
+ { VK_DOWN, ShiftKey, "MoveDownAndModifySelection" },
+ { VK_NEXT, ShiftKey, "MovePageDownAndModifySelection" },
+ { VK_PRIOR, 0, "MovePageUp" },
+ { VK_NEXT, 0, "MovePageDown" },
+ { VK_HOME, 0, "MoveToBeginningOfLine" },
+ { VK_HOME, ShiftKey, "MoveToBeginningOfLineAndModifySelection" },
+ { VK_HOME, CtrlKey, "MoveToBeginningOfDocument" },
+ { VK_HOME, CtrlKey | ShiftKey, "MoveToBeginningOfDocumentAndModifySelection" },
+
+ { VK_END, 0, "MoveToEndOfLine" },
+ { VK_END, ShiftKey, "MoveToEndOfLineAndModifySelection" },
+ { VK_END, CtrlKey, "MoveToEndOfDocument" },
+ { VK_END, CtrlKey | ShiftKey, "MoveToEndOfDocumentAndModifySelection" },
+
+ { VK_BACK, 0, "DeleteBackward" },
+ { VK_BACK, ShiftKey, "DeleteBackward" },
+ { VK_DELETE, 0, "DeleteForward" },
+ { VK_BACK, CtrlKey, "DeleteWordBackward" },
+ { VK_DELETE, CtrlKey, "DeleteWordForward" },
+
+ { 'B', CtrlKey, "ToggleBold" },
+ { 'I', CtrlKey, "ToggleItalic" },
+
+ { VK_ESCAPE, 0, "Cancel" },
+ { VK_OEM_PERIOD, CtrlKey, "Cancel" },
+ { VK_TAB, 0, "InsertTab" },
+ { VK_TAB, ShiftKey, "InsertBacktab" },
+ { VK_RETURN, 0, "InsertNewline" },
+ { VK_RETURN, CtrlKey, "InsertNewline" },
+ { VK_RETURN, AltKey, "InsertNewline" },
+ { VK_RETURN, ShiftKey, "InsertNewline" },
+ { VK_RETURN, AltKey | ShiftKey, "InsertNewline" },
+
+ // It's not quite clear whether clipboard shortcuts and Undo/Redo should be handled
+ // in the application or in WebKit. We chose WebKit.
+ { 'C', CtrlKey, "Copy" },
+ { 'V', CtrlKey, "Paste" },
+ { 'X', CtrlKey, "Cut" },
+ { 'A', CtrlKey, "SelectAll" },
+ { VK_INSERT, CtrlKey, "Copy" },
+ { VK_DELETE, ShiftKey, "Cut" },
+ { VK_INSERT, ShiftKey, "Paste" },
+ { 'Z', CtrlKey, "Undo" },
+ { 'Z', CtrlKey | ShiftKey, "Redo" },
+};
+
+static const KeyPressEntry keyPressEntries[] = {
+ { '\t', 0, "InsertTab" },
+ { '\t', ShiftKey, "InsertBacktab" },
+ { '\r', 0, "InsertNewline" },
+ { '\r', CtrlKey, "InsertNewline" },
+ { '\r', AltKey, "InsertNewline" },
+ { '\r', ShiftKey, "InsertNewline" },
+ { '\r', AltKey | ShiftKey, "InsertNewline" },
+};
+
+const char* WebPage::interpretKeyEvent(const WebCore::KeyboardEvent* evt)
+{
+ ASSERT(evt->type() == eventNames().keydownEvent || evt->type() == eventNames().keypressEvent);
+
+ static HashMap<int, const char*>* keyDownCommandsMap = 0;
+ static HashMap<int, const char*>* keyPressCommandsMap = 0;
+
+ if (!keyDownCommandsMap) {
+ keyDownCommandsMap = new HashMap<int, const char*>;
+ keyPressCommandsMap = new HashMap<int, const char*>;
+
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyDownEntries); ++i)
+ keyDownCommandsMap->set(keyDownEntries[i].modifiers << 16 | keyDownEntries[i].virtualKey, keyDownEntries[i].name);
+
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyPressEntries); ++i)
+ keyPressCommandsMap->set(keyPressEntries[i].modifiers << 16 | keyPressEntries[i].charCode, keyPressEntries[i].name);
+ }
+
+ unsigned modifiers = 0;
+ if (evt->shiftKey())
+ modifiers |= ShiftKey;
+ if (evt->altKey())
+ modifiers |= AltKey;
+ if (evt->ctrlKey())
+ modifiers |= CtrlKey;
+
+ if (evt->type() == eventNames().keydownEvent) {
+ int mapKey = modifiers << 16 | evt->keyCode();
+ return mapKey ? keyDownCommandsMap->get(mapKey) : 0;
+ }
+
+ int mapKey = modifiers << 16 | evt->charCode();
+ return mapKey ? keyPressCommandsMap->get(mapKey) : 0;
+}
+} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (223261 => 223262)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2017-10-12 21:44:05 UTC (rev 223261)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -80,6 +80,7 @@
#include <WebCore/CommonVM.h>
#include <WebCore/CrossOriginPreflightResultCache.h>
#include <WebCore/DNS.h>
+#include <WebCore/DOMWindow.h>
#include <WebCore/DatabaseManager.h>
#include <WebCore/DatabaseTracker.h>
#include <WebCore/DiagnosticLoggingClient.h>
@@ -1177,6 +1178,8 @@
IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
#elif OS(DARWIN)
IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
+#elif OS(WINDOWS)
+ IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.handle());
#else
ASSERT_NOT_REACHED();
#endif
Added: trunk/Source/WebKit/WebProcess/win/WebProcessWin.cpp (0 => 223262)
--- trunk/Source/WebKit/WebProcess/win/WebProcessWin.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/win/WebProcessWin.cpp 2017-10-12 22:36:55 UTC (rev 223262)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebProcess.h"
+
+#include "SharedBuffer.h"
+
+using namespace WebCore;
+
+WTF_EXPORT RefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char* name)
+{
+ return 0;
+}
+
+namespace WebKit {
+void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&&)
+{
+}
+
+void WebProcess::platformTerminate()
+{
+}
+
+void WebProcess::platformSetCacheModel(CacheModel)
+{
+}
+
+} // namespace WebKit
