<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177593] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177593">177593</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-19 13:48:38 -0800 (Fri, 19 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use WebCore::MachSendRights for the compositing render server port
https://bugs.webkit.org/show_bug.cgi?id=139834
Reviewed by Tim Horton.
Source/WebCore:
* WebCore.exp.in:
Source/WebKit2:
* Platform/IPC/HandleMessage.h:
(IPC::callMemberFunctionImpl):
* Platform/mac/LayerHostingContext.h:
* Platform/mac/LayerHostingContext.mm:
(WebKit::LayerHostingContext::createForPort):
* PluginProcess/PluginControllerProxy.h:
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::PluginProcess):
(WebKit::PluginProcess::initializePluginProcess):
* PluginProcess/PluginProcess.h:
(WebKit::PluginProcess::compositingRenderServerPort):
* PluginProcess/mac/PluginControllerProxyMac.mm:
(WebKit::PluginControllerProxy::compositingRenderServerPort):
* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::PluginProcess::platformInitializePluginProcess):
* Shared/Plugins/PluginProcessCreationParameters.cpp:
* Shared/Plugins/PluginProcessCreationParameters.h:
* Shared/WebCoreArgumentCoders.h:
* Shared/WebProcessCreationParameters.h:
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoder<MachSendRight>::encode):
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::platformInitializePluginProcess):
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformInitializeWebProcess):
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_GetValue):
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
* WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
(WebKit::NetscapePlugin::compositingRenderServerPort):
(WebKit::NetscapePlugin::setLayerHostingMode):
* WebProcess/Plugins/PluginController.h:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::compositingRenderServerPort):
* WebProcess/Plugins/PluginView.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeWebProcess):
* WebProcess/WebProcess.h:
(WebKit::WebProcess::compositingRenderServerPort):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCHandleMessageh">trunk/Source/WebKit2/Platform/IPC/HandleMessage.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacLayerHostingContexth">trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacLayerHostingContextmm">trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxyh">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcesscpp">trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcessh">trunk/Source/WebKit2/PluginProcess/PluginProcess.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginControllerProxyMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginProcessMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginProcessCreationParametersh">trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapemacNetscapePluginMacmm">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginControllerh">trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebCore/ChangeLog 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-12-19 Anders Carlsson <andersca@apple.com>
+
+ Use WebCore::MachSendRights for the compositing render server port
+ https://bugs.webkit.org/show_bug.cgi?id=139834
+
+ Reviewed by Tim Horton.
+
+ * WebCore.exp.in:
+
</ins><span class="cx"> 2014-12-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Log how often media element playback happens using FeatureCounter
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -326,6 +326,7 @@
</span><span class="cx"> __ZN7WebCore13KeyboardEventC1Ev
</span><span class="cx"> __ZN7WebCore13MachSendRight13leakSendRightEv
</span><span class="cx"> __ZN7WebCore13MachSendRight5adoptEj
</span><ins>+__ZN7WebCore13MachSendRight6createEj
</ins><span class="cx"> __ZN7WebCore13MachSendRightD1Ev
</span><span class="cx"> __ZN7WebCore13MachSendRightaSEOS0_
</span><span class="cx"> __ZN7WebCore13NodeTraversal13deepLastChildEPNS_4NodeE
</span><span class="lines">@@ -1706,6 +1707,7 @@
</span><span class="cx"> __ZNK7WebCore13HitTestResult5titleERNS_13TextDirectionE
</span><span class="cx"> __ZNK7WebCore13HitTestResult9imageRectEv
</span><span class="cx"> __ZNK7WebCore13ImageDocument12imageElementEv
</span><ins>+__ZNK7WebCore13MachSendRight13copySendRightEv
</ins><span class="cx"> __ZNK7WebCore13ResourceError7cfErrorEv
</span><span class="cx"> __ZNK7WebCore13ResourceError7nsErrorEv
</span><span class="cx"> __ZNK7WebCore13ResourceErrorcvP7NSErrorEv
</span><span class="lines">@@ -2490,8 +2492,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</span><span class="cx"> __ZN7WebCore7IntSizeC1ERK7_NSSize
</span><ins>+__ZN7WebCore9FloatSizeC1ERK7_NSSize
</ins><span class="cx"> __ZNK7WebCore7IntSizecv7_NSSizeEv
</span><del>-__ZN7WebCore9FloatSizeC1ERK7_NSSize
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2014-12-19 Anders Carlsson <andersca@apple.com>
+
+ Use WebCore::MachSendRights for the compositing render server port
+ https://bugs.webkit.org/show_bug.cgi?id=139834
+
+ Reviewed by Tim Horton.
+
+ * Platform/IPC/HandleMessage.h:
+ (IPC::callMemberFunctionImpl):
+ * Platform/mac/LayerHostingContext.h:
+ * Platform/mac/LayerHostingContext.mm:
+ (WebKit::LayerHostingContext::createForPort):
+ * PluginProcess/PluginControllerProxy.h:
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::PluginProcess):
+ (WebKit::PluginProcess::initializePluginProcess):
+ * PluginProcess/PluginProcess.h:
+ (WebKit::PluginProcess::compositingRenderServerPort):
+ * PluginProcess/mac/PluginControllerProxyMac.mm:
+ (WebKit::PluginControllerProxy::compositingRenderServerPort):
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::platformInitializePluginProcess):
+ * Shared/Plugins/PluginProcessCreationParameters.cpp:
+ * Shared/Plugins/PluginProcessCreationParameters.h:
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebProcessCreationParameters.h:
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<MachSendRight>::encode):
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::platformInitializePluginProcess):
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::NPN_GetValue):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+ (WebKit::NetscapePlugin::compositingRenderServerPort):
+ (WebKit::NetscapePlugin::setLayerHostingMode):
+ * WebProcess/Plugins/PluginController.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::compositingRenderServerPort):
+ * WebProcess/Plugins/PluginView.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ (WebKit::WebProcess::initializeWebProcess):
+ * WebProcess/WebProcess.h:
+ (WebKit::WebProcess::compositingRenderServerPort):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2014-12-19 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Ref-ify TextIterator API.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCHandleMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/HandleMessage.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex>
</span><span class="cx"> void callMemberFunctionImpl(C* object, MF function, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
</span><span class="cx"> {
</span><del>- (object->*function)(std::get<ArgsIndex>(args)...);
</del><ins>+ (object->*function)(std::get<ArgsIndex>(std::forward<ArgsTuple>(args))...);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex>
</span><span class="cx"> void callMemberFunctionImpl(C* object, MF function, MessageDecoder& decoder, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
</span><span class="cx"> {
</span><del>- (object->*function)(std::get<ArgsIndex>(args)..., decoder);
</del><ins>+ (object->*function)(std::get<ArgsIndex>(std::forward<ArgsTuple>(args))..., decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacLayerHostingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -34,12 +34,16 @@
</span><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx"> OBJC_CLASS CAContext;
</span><span class="cx">
</span><ins>+namespace WebCore {
+class MachSendRight;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class LayerHostingContext {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(LayerHostingContext);
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<LayerHostingContext> createForPort(mach_port_t serverPort);
</del><ins>+ static std::unique_ptr<LayerHostingContext> createForPort(const WebCore::MachSendRight& serverPort);
</ins><span class="cx"> #if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
</span><span class="cx"> static std::unique_ptr<LayerHostingContext> createForExternalHostingProcess();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacLayerHostingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -26,17 +26,20 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "LayerHostingContext.h"
</span><span class="cx">
</span><ins>+#import <WebCore/MachSendRight.h>
</ins><span class="cx"> #import <WebCore/QuartzCoreSPI.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-std::unique_ptr<LayerHostingContext> LayerHostingContext::createForPort(mach_port_t serverPort)
</del><ins>+std::unique_ptr<LayerHostingContext> LayerHostingContext::createForPort(const MachSendRight& serverPort)
</ins><span class="cx"> {
</span><span class="cx"> auto layerHostingContext = std::make_unique<LayerHostingContext>();
</span><span class="cx">
</span><span class="cx"> layerHostingContext->m_layerHostingMode = LayerHostingMode::InProcess;
</span><del>- layerHostingContext->m_context = (CAContext *)WKCAContextMakeRemoteWithServerPort(serverPort);
</del><ins>+ layerHostingContext->m_context = (CAContext *)WKCAContextMakeRemoteWithServerPort(serverPort.sendRight());
</ins><span class="cx">
</span><span class="cx"> return layerHostingContext;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual void pluginFocusOrWindowFocusChanged(bool) override;
</span><span class="cx"> virtual void setComplexTextInputState(PluginComplexTextInputState) override;
</span><del>- virtual mach_port_t compositingRenderServerPort() override;
</del><ins>+ virtual const WebCore::MachSendRight& compositingRenderServerPort() override;
</ins><span class="cx"> virtual void openPluginPreferencePane() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -57,9 +57,6 @@
</span><span class="cx"> PluginProcess::PluginProcess()
</span><span class="cx"> : m_supportsAsynchronousPluginInitialization(false)
</span><span class="cx"> , m_minimumLifetimeTimer(RunLoop::main(), this, &PluginProcess::minimumLifetimeTimerFired)
</span><del>-#if PLATFORM(COCOA)
- , m_compositingRenderServerPort(MACH_PORT_NULL)
-#endif
</del><span class="cx"> , m_connectionActivity("PluginProcess connection activity.")
</span><span class="cx"> {
</span><span class="cx"> NetscapePlugin::setSetExceptionFunction(WebProcessConnection::setGlobalException);
</span><span class="lines">@@ -139,7 +136,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginProcess::initializePluginProcess(const PluginProcessCreationParameters& parameters)
</del><ins>+void PluginProcess::initializePluginProcess(PluginProcessCreationParameters&& parameters)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_pluginModule);
</span><span class="cx">
</span><span class="lines">@@ -147,7 +144,7 @@
</span><span class="cx"> setMinimumLifetime(parameters.minimumLifetime);
</span><span class="cx"> setTerminationTimeout(parameters.terminationTimeout);
</span><span class="cx">
</span><del>- platformInitializePluginProcess(parameters);
</del><ins>+ platformInitializePluginProcess(WTF::move(parameters));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginProcess::createWebProcessConnection()
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include <WebCore/CountedUserActivity.h>
</span><span class="cx"> #include <WebCore/AudioHardwareListener.h>
</span><ins>+#include <WebCore/MachSendRight.h>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx"> void setModalWindowIsShowing(bool);
</span><span class="cx"> void setFullscreenWindowIsShowing(bool);
</span><span class="cx">
</span><del>- mach_port_t compositingRenderServerPort() const { return m_compositingRenderServerPort; }
</del><ins>+ const WebCore::MachSendRight& compositingRenderServerPort() const { return m_compositingRenderServerPort; }
</ins><span class="cx">
</span><span class="cx"> bool launchProcess(const String& launchPath, const Vector<String>& arguments);
</span><span class="cx"> bool launchApplicationAtURL(const String& urlString, const Vector<String>& arguments);
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void didReceivePluginProcessMessage(IPC::Connection*, IPC::MessageDecoder&);
</span><del>- void initializePluginProcess(const PluginProcessCreationParameters&);
</del><ins>+ void initializePluginProcess(PluginProcessCreationParameters&&);
</ins><span class="cx"> void createWebProcessConnection();
</span><span class="cx"> void getSitesWithData(uint64_t callbackID);
</span><span class="cx"> void clearSiteData(const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
</span><span class="lines">@@ -100,7 +101,7 @@
</span><span class="cx"> virtual void audioHardwareDidBecomeInactive() override;
</span><span class="cx"> virtual void audioOutputDeviceChanged() override { }
</span><span class="cx">
</span><del>- void platformInitializePluginProcess(const PluginProcessCreationParameters&);
</del><ins>+ void platformInitializePluginProcess(PluginProcessCreationParameters&&);
</ins><span class="cx">
</span><span class="cx"> void setMinimumLifetime(double);
</span><span class="cx"> void minimumLifetimeTimerFired();
</span><span class="lines">@@ -123,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // The Mach port used for accelerated compositing.
</span><del>- mach_port_t m_compositingRenderServerPort;
</del><ins>+ WebCore::MachSendRight m_compositingRenderServerPort;
</ins><span class="cx">
</span><span class="cx"> String m_nsurlCacheDirectory;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginControllerProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> m_connection->connection()->send(Messages::PluginProxy::SetComplexTextInputState(pluginComplexTextInputState), m_pluginInstanceID, IPC::DispatchMessageEvenWhenWaitingForSyncReply);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-mach_port_t PluginControllerProxy::compositingRenderServerPort()
</del><ins>+const MachSendRight& PluginControllerProxy::compositingRenderServerPort()
</ins><span class="cx"> {
</span><span class="cx"> return PluginProcess::shared().compositingRenderServerPort();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -404,9 +404,9 @@
</span><span class="cx"> ASSERT_UNUSED(result, result == noErr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginProcess::platformInitializePluginProcess(const PluginProcessCreationParameters& parameters)
</del><ins>+void PluginProcess::platformInitializePluginProcess(PluginProcessCreationParameters&& parameters)
</ins><span class="cx"> {
</span><del>- m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
</del><ins>+ m_compositingRenderServerPort = WTF::move(parameters.acceleratedCompositingPort);
</ins><span class="cx"> if (parameters.processType == PluginProcessTypeSnapshot)
</span><span class="cx"> muteAudio();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><del>-#include "ArgumentCoders.h"
</del><ins>+#include "WebCoreArgumentCoders.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx"> #include "PluginProcessAttributes.h"
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#include "MachPort.h"
</del><ins>+#include <WebCore/MachSendRight.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><del>- class ArgumentDecoder;
- class ArgumentEncoder;
</del><ins>+class ArgumentDecoder;
+class ArgumentEncoder;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> double terminationTimeout;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- IPC::MachPort acceleratedCompositingPort;
</del><ins>+ WebCore::MachSendRight acceleratedCompositingPort;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -273,6 +273,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::MachSendRight> {
</span><ins>+ static void encode(ArgumentEncoder&, const WebCore::MachSendRight&);
</ins><span class="cx"> static void encode(ArgumentEncoder&, WebCore::MachSendRight&&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::MachSendRight&);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "CacheModel.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include "TextCheckerState.h"
</span><ins>+#include <WebCore/MachSendRight.h>
</ins><span class="cx"> #include <WebCore/SessionIDHash.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -130,7 +131,7 @@
</span><span class="cx"> uint64_t nsURLCacheMemoryCapacity;
</span><span class="cx"> uint64_t nsURLCacheDiskCapacity;
</span><span class="cx">
</span><del>- IPC::MachPort acceleratedCompositingPort;
</del><ins>+ WebCore::MachSendRight acceleratedCompositingPort;
</ins><span class="cx">
</span><span class="cx"> String uiProcessBundleResourcePath;
</span><span class="cx"> SandboxExtension::Handle uiProcessBundleResourcePathExtensionHandle;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -368,6 +368,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ArgumentCoder<MachSendRight>::encode(ArgumentEncoder& encoder, const MachSendRight& sendRight)
+{
+ encoder << Attachment(sendRight.copySendRight().leakSendRight(), MACH_MSG_TYPE_MOVE_SEND);
+}
+
</ins><span class="cx"> void ArgumentCoder<MachSendRight>::encode(ArgumentEncoder& encoder, MachSendRight&& sendRight)
</span><span class="cx"> {
</span><span class="cx"> encoder << Attachment(sendRight.leakSendRight(), MACH_MSG_TYPE_MOVE_SEND);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -168,9 +168,7 @@
</span><span class="cx"> parameters.supportsAsynchronousPluginInitialization = m_pluginProcessAttributes.moduleInfo.bundleIdentifier == "com.macromedia.Flash Player.plugin";
</span><span class="cx">
</span><span class="cx"> #if HAVE(HOSTED_CORE_ANIMATION)
</span><del>- mach_port_t renderServerPort = [[CARemoteLayerServer sharedServer] serverPort];
- if (renderServerPort != MACH_PORT_NULL)
- parameters.acceleratedCompositingPort = IPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND);
</del><ins>+ parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -188,9 +188,7 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(HOSTED_CORE_ANIMATION)
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- mach_port_t renderServerPort = [[CARemoteLayerServer sharedServer] serverPort];
- if (renderServerPort != MACH_PORT_NULL)
- parameters.acceleratedCompositingPort = IPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND);
</del><ins>+ parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include <WebCore/HTTPHeaderMap.h>
</span><span class="cx"> #include <WebCore/HTTPHeaderNames.h>
</span><span class="cx"> #include <WebCore/IdentifierRep.h>
</span><ins>+#include <WebCore/MachSendRight.h>
</ins><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/ProtectionSpace.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="lines">@@ -489,7 +490,7 @@
</span><span class="cx"> case WKNVCALayerRenderServerPort: {
</span><span class="cx"> RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
</span><span class="cx">
</span><del>- *(mach_port_t*)value = plugin->compositingRenderServerPort();
</del><ins>+ *(mach_port_t*)value = plugin->compositingRenderServerPort().sendRight();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -39,9 +39,10 @@
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class HTTPHeaderMap;
- class ProtectionSpace;
- class SharedBuffer;
</del><ins>+class MachSendRight;
+class HTTPHeaderMap;
+class ProtectionSpace;
+class SharedBuffer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS WKNPAPIPlugInContainer;
</span><span class="lines">@@ -71,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> bool hasHandledAKeyDownEvent() const { return m_hasHandledAKeyDownEvent; }
</span><span class="cx">
</span><del>- mach_port_t compositingRenderServerPort();
</del><ins>+ const WebCore::MachSendRight& compositingRenderServerPort();
</ins><span class="cx"> void openPluginPreferencePane();
</span><span class="cx">
</span><span class="cx"> // Computes an affine transform from the given coordinate space to the screen coordinate space.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapemacNetscapePluginMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import "WebEvent.h"
</span><span class="cx"> #import <Carbon/Carbon.h>
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><ins>+#import <WebCore/MachSendRight.h>
</ins><span class="cx"> #import <WebCore/NotImplemented.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -170,11 +171,14 @@
</span><span class="cx"> return NPERR_NO_ERROR;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-mach_port_t NetscapePlugin::compositingRenderServerPort()
</del><ins>+const MachSendRight& NetscapePlugin::compositingRenderServerPort()
</ins><span class="cx"> {
</span><span class="cx"> #if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
</span><del>- if (m_layerHostingMode == LayerHostingMode::OutOfProcess)
- return MACH_PORT_NULL;
</del><ins>+ if (m_layerHostingMode == LayerHostingMode::OutOfProcess) {
+ static NeverDestroyed<MachSendRight> sendRight;
+
+ return sendRight;
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return controller()->compositingRenderServerPort();
</span><span class="lines">@@ -1052,7 +1056,7 @@
</span><span class="cx"> m_layerHostingMode = layerHostingMode;
</span><span class="cx">
</span><span class="cx"> // Tell the plug-in about the new compositing render server port. If it returns OK we'll ask it again for a new layer.
</span><del>- mach_port_t port = NetscapePlugin::compositingRenderServerPort();
</del><ins>+ mach_port_t port = NetscapePlugin::compositingRenderServerPort().sendRight();
</ins><span class="cx"> if (NPP_SetValue(static_cast<NPNVariable>(WKNVCALayerRenderServerPort), &port) != NPERR_NO_ERROR)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -37,10 +37,11 @@
</span><span class="cx"> typedef void* NPIdentifier;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class HTTPHeaderMap;
- class IntRect;
- class URL;
- class ProtectionSpace;
</del><ins>+class HTTPHeaderMap;
+class IntRect;
+class MachSendRight;
+class ProtectionSpace;
+class URL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -109,7 +110,7 @@
</span><span class="cx"> virtual void setComplexTextInputState(PluginComplexTextInputState) = 0;
</span><span class="cx">
</span><span class="cx"> // Returns the mach port of the compositing render server.
</span><del>- virtual mach_port_t compositingRenderServerPort() = 0;
</del><ins>+ virtual const WebCore::MachSendRight& compositingRenderServerPort() = 0;
</ins><span class="cx">
</span><span class="cx"> // Open the preference pane for this plug-in (as stated in the plug-in's Info.plist).
</span><span class="cx"> virtual void openPluginPreferencePane() = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -1530,7 +1530,7 @@
</span><span class="cx"> m_webPage->send(Messages::WebPageProxy::SetPluginComplexTextInputState(m_plugin->pluginComplexTextInputIdentifier(), pluginComplexTextInputState));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-mach_port_t PluginView::compositingRenderServerPort()
</del><ins>+const MachSendRight& PluginView::compositingRenderServerPort()
</ins><span class="cx"> {
</span><span class="cx"> return WebProcess::shared().compositingRenderServerPort();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class Frame;
</span><span class="cx"> class HTMLPlugInElement;
</span><ins>+class MachSendRight;
</ins><span class="cx"> class MouseEvent;
</span><span class="cx"> class RenderBoxModelObject;
</span><span class="cx"> }
</span><span class="lines">@@ -205,7 +206,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus) override;
</span><span class="cx"> virtual void setComplexTextInputState(PluginComplexTextInputState) override;
</span><del>- virtual mach_port_t compositingRenderServerPort() override;
</del><ins>+ virtual const WebCore::MachSendRight& compositingRenderServerPort() override;
</ins><span class="cx"> virtual void openPluginPreferencePane() override;
</span><span class="cx"> #endif
</span><span class="cx"> virtual float contentsScaleFactor() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -158,7 +158,6 @@
</span><span class="cx"> , m_cacheModel(CacheModelDocumentViewer)
</span><span class="cx"> , m_diskCacheIsDisabledForTesting(false)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- , m_compositingRenderServerPort(MACH_PORT_NULL)
</del><span class="cx"> , m_clearResourceCachesDispatchGroup(0)
</span><span class="cx"> #endif
</span><span class="cx"> , m_fullKeyboardAccessEnabled(false)
</span><span class="lines">@@ -270,7 +269,7 @@
</span><span class="cx"> return *supplement<AuthenticationManager>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parameters, IPC::MessageDecoder& decoder)
</del><ins>+void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters, IPC::MessageDecoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageMap.isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -278,7 +277,7 @@
</span><span class="cx"> m_usesNetworkProcess = parameters.usesNetworkProcess;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- platformInitializeWebProcess(parameters, decoder);
</del><ins>+ platformInitializeWebProcess(WTF::move(parameters), decoder);
</ins><span class="cx">
</span><span class="cx"> WTF::setCurrentThreadIsUserInitiated();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "ViewUpdateDispatcher.h"
</span><span class="cx"> #include "VisitedLinkTable.h"
</span><span class="cx"> #include "WebOriginDataManagerSupplement.h"
</span><ins>+#include <WebCore/MachSendRight.h>
</ins><span class="cx"> #include <WebCore/SessionIDHash.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -115,7 +116,7 @@
</span><span class="cx"> InjectedBundle* injectedBundle() const { return m_injectedBundle.get(); }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- mach_port_t compositingRenderServerPort() const { return m_compositingRenderServerPort; }
</del><ins>+ const WebCore::MachSendRight& compositingRenderServerPort() const { return m_compositingRenderServerPort; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool shouldPlugInAutoStartFromOrigin(WebPage&, const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
</span><span class="lines">@@ -203,8 +204,8 @@
</span><span class="cx"> virtual IPC::Connection* downloadProxyConnection() override;
</span><span class="cx"> virtual AuthenticationManager& downloadsAuthenticationManager() override;
</span><span class="cx">
</span><del>- void initializeWebProcess(const WebProcessCreationParameters&, IPC::MessageDecoder&);
- void platformInitializeWebProcess(const WebProcessCreationParameters&, IPC::MessageDecoder&);
</del><ins>+ void initializeWebProcess(WebProcessCreationParameters&&, IPC::MessageDecoder&);
+ void platformInitializeWebProcess(WebProcessCreationParameters&&, IPC::MessageDecoder&);
</ins><span class="cx">
</span><span class="cx"> void platformTerminate();
</span><span class="cx"> void registerURLSchemeAsEmptyDocument(const String&);
</span><span class="lines">@@ -314,7 +315,7 @@
</span><span class="cx"> bool m_diskCacheIsDisabledForTesting;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- mach_port_t m_compositingRenderServerPort;
</del><ins>+ WebCore::MachSendRight m_compositingRenderServerPort;
</ins><span class="cx"> pid_t m_presenterApplicationPid;
</span><span class="cx"> dispatch_group_t m_clearResourceCachesDispatchGroup;
</span><span class="cx"> bool m_shouldForceScreenFontSubstitution;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (177592 => 177593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-12-19 21:26:07 UTC (rev 177592)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-12-19 21:48:38 UTC (rev 177593)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, IPC::MessageDecoder&)
</del><ins>+void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters, IPC::MessageDecoder&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SANDBOX_EXTENSIONS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
</del><ins>+ m_compositingRenderServerPort = WTF::move(parameters.acceleratedCompositingPort);
</ins><span class="cx"> m_presenterApplicationPid = parameters.presenterApplicationPid;
</span><span class="cx"> m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;
</span><span class="cx"> Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
</span></span></pre>
</div>
</div>
</body>
</html>