Title: [228893] trunk/Source/WebKit
- Revision
- 228893
- Author
- [email protected]
- Date
- 2018-02-21 13:41:06 -0800 (Wed, 21 Feb 2018)
Log Message
[WinCairo] Fix compile errors of WebProcess and NetworkProcess due to no implementation for windows
https://bugs.webkit.org/show_bug.cgi?id=182870
Patch by Yousuke Kimoto <[email protected]> on 2018-02-21
Reviewed by Youenn Fablet.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::openFrontendConnection):
* WebProcess/WebPage/WebInspectorUI.cpp:
(WebKit::WebInspectorUI::establishConnection):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::ensureNetworkProcessConnection):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (228892 => 228893)
--- trunk/Source/WebKit/ChangeLog 2018-02-21 20:21:59 UTC (rev 228892)
+++ trunk/Source/WebKit/ChangeLog 2018-02-21 21:41:06 UTC (rev 228893)
@@ -1,3 +1,21 @@
+2018-02-21 Yousuke Kimoto <[email protected]>
+
+ [WinCairo] Fix compile errors of WebProcess and NetworkProcess due to no implementation for windows
+ https://bugs.webkit.org/show_bug.cgi?id=182870
+
+ Reviewed by Youenn Fablet.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
+ * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+ (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::openFrontendConnection):
+ * WebProcess/WebPage/WebInspectorUI.cpp:
+ (WebKit::WebInspectorUI::establishConnection):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::ensureNetworkProcessConnection):
+
2018-02-21 Don Olmstead <[email protected]>
[CMake][Win] Use cmakeconfig.h rather than config.h and Platform.h
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (228892 => 228893)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-02-21 20:21:59 UTC (rev 228892)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-02-21 21:41:06 UTC (rev 228893)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2012-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -292,6 +293,16 @@
IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientPort), 0);
+#elif OS(WINDOWS)
+ IPC::Connection::Identifier serverIdentifier, clientIdentifier;
+ if (!IPC::Connection::createServerAndClientIdentifiers(serverIdentifier, clientIdentifier))
+ return;
+
+ auto connection = NetworkConnectionToWebProcess::create(serverIdentifier);
+ m_webProcessConnections.append(WTFMove(connection));
+
+ IPC::Attachment clientSocket(clientIdentifier);
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientSocket), 0);
#else
notImplemented();
#endif
Modified: trunk/Source/WebKit/WebProcess/Plugins/PluginProcessConnectionManager.cpp (228892 => 228893)
--- trunk/Source/WebKit/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2018-02-21 20:21:59 UTC (rev 228892)
+++ trunk/Source/WebKit/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2018-02-21 21:41:06 UTC (rev 228893)
@@ -78,6 +78,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();
#endif
if (IPC::Connection::identifierIsNull(connectionIdentifier))
return nullptr;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp (228892 => 228893)
--- trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp 2018-02-21 20:21:59 UTC (rev 228892)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp 2018-02-21 21:41:06 UTC (rev 228893)
@@ -94,10 +94,12 @@
return;
#endif
+#if USE(UNIX_DOMAIN_SOCKETS) || OS(DARWIN)
m_frontendConnection = IPC::Connection::createServerConnection(connectionIdentifier, *this);
m_frontendConnection->open();
WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::CreateInspectorPage(connectionClientPort, canAttachWindow(), underTest), m_page->pageID());
+#endif
}
void WebInspector::closeFrontendConnection()
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebInspectorUI.cpp (228892 => 228893)
--- trunk/Source/WebKit/WebProcess/WebPage/WebInspectorUI.cpp 2018-02-21 20:21:59 UTC (rev 228892)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebInspectorUI.cpp 2018-02-21 21:41:06 UTC (rev 228893)
@@ -58,6 +58,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
notImplemented();
return;
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (228892 => 228893)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-02-21 20:21:59 UTC (rev 228892)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-02-21 21:41:06 UTC (rev 228893)
@@ -1131,6 +1131,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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
