Diff
Modified: trunk/Source/WebKit2/ChangeLog (177595 => 177596)
--- trunk/Source/WebKit2/ChangeLog 2014-12-19 22:06:14 UTC (rev 177595)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-19 22:09:58 UTC (rev 177596)
@@ -1,3 +1,16 @@
+2014-12-19 Csaba Osztrogonác <[email protected]>
+
+ URTBF after r177593.
+
+ * PluginProcess/PluginProcess.h:
+ * PluginProcess/unix/PluginProcessUnix.cpp:
+ (WebKit::PluginProcess::platformInitializePluginProcess):
+ * Shared/WebProcessCreationParameters.h:
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ * WebProcess/WebProcess.h:
+ * WebProcess/soup/WebProcessSoup.cpp:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2014-12-19 Anders Carlsson <[email protected]>
Use WebCore::MachSendRights for the compositing render server port
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (177595 => 177596)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2014-12-19 22:06:14 UTC (rev 177595)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2014-12-19 22:09:58 UTC (rev 177596)
@@ -31,11 +31,14 @@
#include "ChildProcess.h"
#include <WebCore/CountedUserActivity.h>
#include <WebCore/AudioHardwareListener.h>
-#include <WebCore/MachSendRight.h>
#include <wtf/Forward.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/WTFString.h>
+#if PLATFORM(COCOA)
+#include <WebCore/MachSendRight.h>
+#endif
+
namespace WebKit {
class NetscapePluginModule;
Modified: trunk/Source/WebKit2/PluginProcess/unix/PluginProcessUnix.cpp (177595 => 177596)
--- trunk/Source/WebKit2/PluginProcess/unix/PluginProcessUnix.cpp 2014-12-19 22:06:14 UTC (rev 177595)
+++ trunk/Source/WebKit2/PluginProcess/unix/PluginProcessUnix.cpp 2014-12-19 22:09:58 UTC (rev 177596)
@@ -37,7 +37,7 @@
{
}
-void PluginProcess::platformInitializePluginProcess(const PluginProcessCreationParameters&)
+void PluginProcess::platformInitializePluginProcess(PluginProcessCreationParameters&&)
{
notImplemented();
}
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (177595 => 177596)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-12-19 22:06:14 UTC (rev 177595)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-12-19 22:09:58 UTC (rev 177596)
@@ -29,7 +29,6 @@
#include "CacheModel.h"
#include "SandboxExtension.h"
#include "TextCheckerState.h"
-#include <WebCore/MachSendRight.h>
#include <WebCore/SessionIDHash.h>
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
@@ -38,7 +37,7 @@
#if PLATFORM(COCOA)
#include "MachPort.h"
-
+#include <WebCore/MachSendRight.h>
#endif
#if USE(SOUP)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (177595 => 177596)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-12-19 22:06:14 UTC (rev 177595)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-12-19 22:09:58 UTC (rev 177596)
@@ -34,7 +34,6 @@
#include <WebCore/HTTPHeaderMap.h>
#include <WebCore/HTTPHeaderNames.h>
#include <WebCore/IdentifierRep.h>
-#include <WebCore/MachSendRight.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/ProtectionSpace.h>
#include <WebCore/SharedBuffer.h>
@@ -42,6 +41,10 @@
#include <utility>
#include <wtf/text/StringBuilder.h>
+#if PLATFORM(COCOA)
+#include <WebCore/MachSendRight.h>
+#endif
+
using namespace WebCore;
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (177595 => 177596)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-19 22:06:14 UTC (rev 177595)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-19 22:09:58 UTC (rev 177596)
@@ -38,7 +38,6 @@
#include "ViewUpdateDispatcher.h"
#include "VisitedLinkTable.h"
#include "WebOriginDataManagerSupplement.h"
-#include <WebCore/MachSendRight.h>
#include <WebCore/SessionIDHash.h>
#include <WebCore/Timer.h>
#include <wtf/Forward.h>
@@ -50,6 +49,7 @@
#if PLATFORM(COCOA)
#include <dispatch/dispatch.h>
+#include <WebCore/MachSendRight.h>
#endif
namespace API {
Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (177595 => 177596)
--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2014-12-19 22:06:14 UTC (rev 177595)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2014-12-19 22:09:58 UTC (rev 177596)
@@ -138,7 +138,7 @@
setSoupSessionAcceptLanguage(WebCore::userPreferredLanguages());
}
-void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, IPC::MessageDecoder&)
+void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters, IPC::MessageDecoder&)
{
#if ENABLE(SECCOMP_FILTERS)
{
