<!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>[164112] trunk/Source/WebKit2</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/164112">164112</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 11:38:17 -0800 (Fri, 14 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in WebKit2/PluginProcess except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128802

Reviewed by Darin Adler.

* PluginProcess/PluginControllerProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::PluginControllerProxy::PluginControllerProxy):
(WebKit::PluginControllerProxy::paint):
* PluginProcess/PluginControllerProxy.h: Ditto.
* PluginProcess/PluginControllerProxy.messages.in: Ditto.
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::PluginProcess): Ditto.
(WebKit::PluginProcess::netscapePluginModule): Added &amp;&amp; !PLATFORM(IOS) around Mac-specific
quirk.
(WebKit::PluginProcess::createWebProcessConnection): Changed PLATFORM(MAC) to OS(DARWIN)
around use of Mach-based IPC.
* PluginProcess/PluginProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA), and to
USE(APPKIT) around override of stopRunLoop, which is implemented using AppKit.
* PluginProcess/PluginProcess.messages.in: Removed PLATFORM(MAC) guard around
SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.
* PluginProcess/WebProcessConnection.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::WebProcessConnection::createPluginInternal):
(WebKit::WebProcessConnection::createPlugin):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxycpp">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxyh">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxymessagesin">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in</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="#trunkSourceWebKit2PluginProcessPluginProcessmessagesin">trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessWebProcessConnectioncpp">trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164111 => 164112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-02-14 19:26:32 UTC (rev 164111)
+++ trunk/Source/WebKit2/ChangeLog        2014-02-14 19:38:17 UTC (rev 164112)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-02-14  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        Stop using PLATFORM(MAC) in WebKit2/PluginProcess except where it means “OS X but not iOS”
+        https://bugs.webkit.org/show_bug.cgi?id=128802
+
+        Reviewed by Darin Adler.
+
+        * PluginProcess/PluginControllerProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+        (WebKit::PluginControllerProxy::PluginControllerProxy):
+        (WebKit::PluginControllerProxy::paint):
+        * PluginProcess/PluginControllerProxy.h: Ditto.
+        * PluginProcess/PluginControllerProxy.messages.in: Ditto.
+        * PluginProcess/PluginProcess.cpp:
+        (WebKit::PluginProcess::PluginProcess): Ditto.
+        (WebKit::PluginProcess::netscapePluginModule): Added &amp;&amp; !PLATFORM(IOS) around Mac-specific
+        quirk.
+        (WebKit::PluginProcess::createWebProcessConnection): Changed PLATFORM(MAC) to OS(DARWIN)
+        around use of Mach-based IPC.
+        * PluginProcess/PluginProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA), and to
+        USE(APPKIT) around override of stopRunLoop, which is implemented using AppKit.
+        * PluginProcess/PluginProcess.messages.in: Removed PLATFORM(MAC) guard around
+        SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.
+        * PluginProcess/WebProcessConnection.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+        (WebKit::WebProcessConnection::createPluginInternal):
+        (WebKit::WebProcessConnection::createPlugin):
+
</ins><span class="cx"> 2014-02-14  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add -[WKWebView estimatedProgress]
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (164111 => 164112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp        2014-02-14 19:26:32 UTC (rev 164111)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp        2014-02-14 19:38:17 UTC (rev 164112)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> #include &lt;wtf/TemporaryChange.h&gt;
</span><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include &quot;LayerHostingContext.h&quot;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     , m_pluginDestroyTimer(RunLoop::main(), this, &amp;PluginControllerProxy::destroy)
</span><span class="cx">     , m_waitingForDidUpdate(false)
</span><span class="cx">     , m_pluginCanceledManualStreamLoad(false)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     , m_isComplexTextInputEnabled(false)
</span><span class="cx"> #endif
</span><span class="cx">     , m_contentsScaleFactor(creationParameters.contentsScaleFactor)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">     // Create a graphics context.
</span><span class="cx">     auto graphicsContext = m_backingStore-&gt;createGraphicsContext();
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     // FIXME: We should really call applyDeviceScaleFactor instead of scale, but that ends up calling into WKSI
</span><span class="cx">     // which we currently don't have initiated in the plug-in process.
</span><span class="cx">     graphicsContext-&gt;scale(FloatSize(m_contentsScaleFactor, m_contentsScaleFactor));
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (164111 => 164112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h        2014-02-14 19:26:32 UTC (rev 164111)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h        2014-02-14 19:38:17 UTC (rev 164112)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool wantsWheelEvents() const;
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     uint32_t remoteLayerClientID() const;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">     virtual void didInitializePlugin() override;
</span><span class="cx">     virtual void didFailToInitializePlugin() override;
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     virtual void pluginFocusOrWindowFocusChanged(bool) override;
</span><span class="cx">     virtual void setComplexTextInputState(PluginComplexTextInputState) override;
</span><span class="cx">     virtual mach_port_t compositingRenderServerPort() override;
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">     void didUpdate();
</span><span class="cx">     void getPluginScriptableNPObject(uint64_t&amp; pluginScriptableNPObjectID);
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     void windowFocusChanged(bool);
</span><span class="cx">     void windowAndViewFramesChanged(const WebCore::IntRect&amp; windowFrameInScreenCoordinates, const WebCore::IntRect&amp; viewFrameInWindowCoordinates);
</span><span class="cx">     void windowVisibilityChanged(bool);
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">     // Whether the plug-in has canceled the manual stream load.
</span><span class="cx">     bool m_pluginCanceledManualStreamLoad;
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     // Whether complex text input is enabled for this plug-in.
</span><span class="cx">     bool m_isComplexTextInputEnabled;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in (164111 => 164112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in        2014-02-14 19:26:32 UTC (rev 164111)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in        2014-02-14 19:38:17 UTC (rev 164112)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">     # Get a reference to the plug-in's scriptable NPObject.
</span><span class="cx">     GetPluginScriptableNPObject() -&gt; (uint64_t pluginScriptableNPObjectID)
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     # Send the complex text input to the plug-in.
</span><span class="cx">     SendComplexTextInput(String textInput)
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (164111 => 164112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp        2014-02-14 19:26:32 UTC (rev 164111)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp        2014-02-14 19:38:17 UTC (rev 164112)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include &lt;WebCore/NotImplemented.h&gt;
</span><span class="cx"> #include &lt;wtf/RunLoop.h&gt;
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) &amp;&amp; !PLATFORM(IOS)
</ins><span class="cx"> #include &lt;crt_externs.h&gt;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> PluginProcess::PluginProcess()
</span><span class="cx">     : m_supportsAsynchronousPluginInitialization(false)
</span><span class="cx">     , m_minimumLifetimeTimer(RunLoop::main(), this, &amp;PluginProcess::minimumLifetimeTimerFired)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     , m_compositingRenderServerPort(MACH_PORT_NULL)
</span><span class="cx"> #endif
</span><span class="cx">     , m_connectionActivity(&quot;PluginProcess connection activity.&quot;)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">         ASSERT(!m_pluginPath.isNull());
</span><span class="cx">         m_pluginModule = NetscapePluginModule::getOrCreate(m_pluginPath);
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) &amp;&amp; !PLATFORM(IOS)
</ins><span class="cx">         if (m_pluginModule) {
</span><span class="cx">             if (m_pluginModule-&gt;pluginQuirks().contains(PluginQuirks::PrognameShouldBeWebKitPluginHost))
</span><span class="cx">                 *const_cast&lt;const char**&gt;(_NSGetProgname()) = &quot;WebKitPluginHost&quot;;
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> {
</span><span class="cx">     bool didHaveAnyWebProcessConnections = !m_webProcessConnections.isEmpty();
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx">     // Create the listening port.
</span><span class="cx">     mach_port_t listeningPort;
</span><span class="cx">     mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &amp;listeningPort);
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">     enableTermination();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void PluginProcess::initializeProcessName(const ChildProcessInitializationParameters&amp;)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (164111 => 164112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h        2014-02-14 19:26:32 UTC (rev 164111)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h        2014-02-14 19:38:17 UTC (rev 164112)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> 
</span><span class="cx">     const String&amp; pluginPath() const { return m_pluginPath; }
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     void setModalWindowIsShowing(bool);
</span><span class="cx">     void setFullscreenWindowIsShowing(bool);
</span><span class="cx"> 
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     virtual bool shouldTerminate() override;
</span><span class="cx">     void platformInitializeProcess(const ChildProcessInitializationParameters&amp;);
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx">     virtual void stopRunLoop() override;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">     // The plug-in path.
</span><span class="cx">     String m_pluginPath;
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     String m_pluginBundleIdentifier;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> 
</span><span class="cx">     RunLoop::Timer&lt;PluginProcess&gt; m_minimumLifetimeTimer;
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     // The Mach port used for accelerated compositing.
</span><span class="cx">     mach_port_t m_compositingRenderServerPort;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in (164111 => 164112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in        2014-02-14 19:26:32 UTC (rev 164111)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in        2014-02-14 19:38:17 UTC (rev 164112)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">     # a DidClearSiteData message when done.
</span><span class="cx">     ClearSiteData(Vector&lt;String&gt; sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC)
</del><span class="cx">     SetProcessSuppressionEnabled(bool flag)
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     SetQOS(int latencyQOS, int throughputQOS)
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessWebProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp (164111 => 164112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp        2014-02-14 19:26:32 UTC (rev 164111)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp        2014-02-14 19:38:17 UTC (rev 164112)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     wantsWheelEvents = pluginControllerProxyPtr-&gt;wantsWheelEvents();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">     remoteLayerClientID = pluginControllerProxyPtr-&gt;remoteLayerClientID();
</span><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(remoteLayerClientID);
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">         }
</span><span class="cx">         
</span><span class="cx">         // If its initialization is complete then we need to respond to this message with the correct information about its creation.
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">         reply-&gt;send(true, pluginControllerProxy-&gt;wantsWheelEvents(), pluginControllerProxy-&gt;remoteLayerClientID());
</span><span class="cx"> #else
</span><span class="cx">         reply-&gt;send(true, pluginControllerProxy-&gt;wantsWheelEvents(), 0);
</span></span></pre>
</div>
</div>

</body>
</html>