<!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>[164172] 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/164172">164172</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-15 09:06:17 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in WebKit2/UIProcess except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128868
Reviewed by Anders Carlsoon.
* UIProcess/API/C/WKPage.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* UIProcess/Databases/DatabaseProcessProxy.cpp:
(WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection): Changed
PLATFORM(MAC) to OS(DARWIN) around use of Mach-based IPC.
* UIProcess/DrawingAreaProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA)
(WebKit::DrawingAreaProxy::DrawingAreaProxy):
* UIProcess/DrawingAreaProxy.h: Ditto.
* UIProcess/DrawingAreaProxy.messages.in: Ditto.
* UIProcess/Launcher/ProcessLauncher.cpp:
(WebKit::ProcessLauncher::didFinishLaunchingProcess): Changed PLATFORM(MAC) to OS(DARWIN)
around use of Mach API.
* UIProcess/Launcher/ProcessLauncher.h: Ditto.
* UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h: Changed PLATFORM(MAC) to
PLATFORM(COCOA)
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch): Changed PLATFORM(MAC)
to OS(DARWIN).
(WebKit::NetworkProcessProxy::didCreateNetworkConnectionToWebProcess): Ditto.
(WebKit::NetworkProcessProxy::didFinishLaunching): Changed PLATFORM(MAC) to PLATFORM(COCOA)
around process suppression call.
* UIProcess/Network/NetworkProcessProxy.h: Ditto.
* UIProcess/PageClient.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* UIProcess/Plugins/PluginInfoStore.cpp: Ditto.
* UIProcess/Plugins/PluginProcessManager.h: Ditto.
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::PluginProcessProxy): Ditto.
(WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch): Changed PLATFORM(MAC)
to OS(DARWIN).
(WebKit::PluginProcessProxy::didClose): Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::PluginProcessProxy::didFinishLaunching): Changed PLATFORM(MAC) to OS(DARWIN) around
use of Mach-based IPC, and to PLATFORM(COCOA) around SetQOS.
(WebKit::PluginProcessProxy::didCreateWebProcessConnection): Changed PLATFORM(MAC) to
OS(DARWIN).
* UIProcess/Plugins/PluginProcessProxy.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* UIProcess/Plugins/PluginProcessProxy.messages.in: Ditto.
* UIProcess/TextChecker.h: Ditto.
* UIProcess/WebContext.cpp: Ditto.
(WebKit::WebContext::ensureNetworkProcess):
(WebKit::WebContext::createNewWebProcess):
(WebKit::WebContext::setHTTPPipeliningEnabled):
(WebKit::WebContext::httpPipeliningEnabled):
(WebKit::WebContext::pluginInfoStoreDidLoadPlugins):
* UIProcess/WebContext.h: Ditto.
* UIProcess/WebContext.messages.in: Ditto.
* UIProcess/WebContextUserMessageCoders.h: Ditto.
(WebKit::WebContextUserMessageEncoder::encode):
(WebKit::WebContextUserMessageDecoder::decode):
* UIProcess/WebCookieManagerProxy.cpp: Ditto.
(WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
* UIProcess/WebCookieManagerProxy.h: Ditto.
* UIProcess/WebFormSubmissionListenerProxy.h: Ditto.
* UIProcess/WebFramePolicyListenerProxy.h: Ditto.
* UIProcess/WebInspectorProxy.h: Added !PLATFORM(IOS) around members reltated to managing
the inspector window and its view.
* UIProcess/WebPageProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::recordNavigationSnapshot):
(WebKit::WebPageProxy::canShowMIMEType):
(WebKit::canCoalesce):
(WebKit::coalesce):
(WebKit::WebPageProxy::findPlugin):
(WebKit::WebPageProxy::editorStateChanged):
(WebKit::WebPageProxy::contextMenuItemSelected):
(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::didBlockInsecurePluginVersion):
* UIProcess/WebPageProxy.h: Ditto.
* UIProcess/WebPageProxy.messages.in: Ditto.
* UIProcess/WebProcessProxy.cpp: Ditto.
(WebKit::WebProcessProxy::WebProcessProxy):
(WebKit::WebProcessProxy::createWebPage):
(WebKit::WebProcessProxy::addExistingWebPage):
(WebKit::WebProcessProxy::removeWebPage):
(WebKit::WebProcessProxy::didFinishLaunching):
(WebKit::WebProcessProxy::pageSuppressibilityChanged):
(WebKit::WebProcessProxy::pagePreferencesChanged):
* UIProcess/WebProcessProxy.h: Ditto.
* UIProcess/cf/WebPreferencesCF.cpp: Removed this file which was not used in any
configuration.
* UIProcess/ios/WebInspectorProxyIOS.mm: Removed functions that no longer need to be
implemented for iOS.
* WebKit2.xcodeproj/project.pbxproj: Removed reference to WebPreferencesCF.cpp.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp">trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxymessagesin">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLauncherh">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolsCustomProtocolManagerProxyh">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginInfoStorecpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessManagerh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxycpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessTextCheckerh">trunk/Source/WebKit2/UIProcess/TextChecker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextmessagesin">trunk/Source/WebKit2/UIProcess/WebContext.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextUserMessageCodersh">trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxyh">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFormSubmissionListenerProxyh">trunk/Source/WebKit2/UIProcess/WebFormSubmissionListenerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFramePolicyListenerProxyh">trunk/Source/WebKit2/UIProcess/WebFramePolicyListenerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebInspectorProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebInspectorProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcesscfWebPreferencesCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -1,3 +1,93 @@
</span><ins>+2014-02-15 Dan Bernstein <mitz@apple.com>
+
+ Stop using PLATFORM(MAC) in WebKit2/UIProcess except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128868
+
+ Reviewed by Anders Carlsoon.
+
+ * UIProcess/API/C/WKPage.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection): Changed
+ PLATFORM(MAC) to OS(DARWIN) around use of Mach-based IPC.
+ * UIProcess/DrawingAreaProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA)
+ (WebKit::DrawingAreaProxy::DrawingAreaProxy):
+ * UIProcess/DrawingAreaProxy.h: Ditto.
+ * UIProcess/DrawingAreaProxy.messages.in: Ditto.
+ * UIProcess/Launcher/ProcessLauncher.cpp:
+ (WebKit::ProcessLauncher::didFinishLaunchingProcess): Changed PLATFORM(MAC) to OS(DARWIN)
+ around use of Mach API.
+ * UIProcess/Launcher/ProcessLauncher.h: Ditto.
+ * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h: Changed PLATFORM(MAC) to
+ PLATFORM(COCOA)
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch): Changed PLATFORM(MAC)
+ to OS(DARWIN).
+ (WebKit::NetworkProcessProxy::didCreateNetworkConnectionToWebProcess): Ditto.
+ (WebKit::NetworkProcessProxy::didFinishLaunching): Changed PLATFORM(MAC) to PLATFORM(COCOA)
+ around process suppression call.
+ * UIProcess/Network/NetworkProcessProxy.h: Ditto.
+ * UIProcess/PageClient.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * UIProcess/Plugins/PluginInfoStore.cpp: Ditto.
+ * UIProcess/Plugins/PluginProcessManager.h: Ditto.
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::PluginProcessProxy): Ditto.
+ (WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch): Changed PLATFORM(MAC)
+ to OS(DARWIN).
+ (WebKit::PluginProcessProxy::didClose): Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::PluginProcessProxy::didFinishLaunching): Changed PLATFORM(MAC) to OS(DARWIN) around
+ use of Mach-based IPC, and to PLATFORM(COCOA) around SetQOS.
+ (WebKit::PluginProcessProxy::didCreateWebProcessConnection): Changed PLATFORM(MAC) to
+ OS(DARWIN).
+ * UIProcess/Plugins/PluginProcessProxy.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * UIProcess/Plugins/PluginProcessProxy.messages.in: Ditto.
+ * UIProcess/TextChecker.h: Ditto.
+ * UIProcess/WebContext.cpp: Ditto.
+ (WebKit::WebContext::ensureNetworkProcess):
+ (WebKit::WebContext::createNewWebProcess):
+ (WebKit::WebContext::setHTTPPipeliningEnabled):
+ (WebKit::WebContext::httpPipeliningEnabled):
+ (WebKit::WebContext::pluginInfoStoreDidLoadPlugins):
+ * UIProcess/WebContext.h: Ditto.
+ * UIProcess/WebContext.messages.in: Ditto.
+ * UIProcess/WebContextUserMessageCoders.h: Ditto.
+ (WebKit::WebContextUserMessageEncoder::encode):
+ (WebKit::WebContextUserMessageDecoder::decode):
+ * UIProcess/WebCookieManagerProxy.cpp: Ditto.
+ (WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
+ * UIProcess/WebCookieManagerProxy.h: Ditto.
+ * UIProcess/WebFormSubmissionListenerProxy.h: Ditto.
+ * UIProcess/WebFramePolicyListenerProxy.h: Ditto.
+ * UIProcess/WebInspectorProxy.h: Added !PLATFORM(IOS) around members reltated to managing
+ the inspector window and its view.
+ * UIProcess/WebPageProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::initializeWebPage):
+ (WebKit::WebPageProxy::recordNavigationSnapshot):
+ (WebKit::WebPageProxy::canShowMIMEType):
+ (WebKit::canCoalesce):
+ (WebKit::coalesce):
+ (WebKit::WebPageProxy::findPlugin):
+ (WebKit::WebPageProxy::editorStateChanged):
+ (WebKit::WebPageProxy::contextMenuItemSelected):
+ (WebKit::WebPageProxy::didReceiveEvent):
+ (WebKit::WebPageProxy::didBlockInsecurePluginVersion):
+ * UIProcess/WebPageProxy.h: Ditto.
+ * UIProcess/WebPageProxy.messages.in: Ditto.
+ * UIProcess/WebProcessProxy.cpp: Ditto.
+ (WebKit::WebProcessProxy::WebProcessProxy):
+ (WebKit::WebProcessProxy::createWebPage):
+ (WebKit::WebProcessProxy::addExistingWebPage):
+ (WebKit::WebProcessProxy::removeWebPage):
+ (WebKit::WebProcessProxy::didFinishLaunching):
+ (WebKit::WebProcessProxy::pageSuppressibilityChanged):
+ (WebKit::WebProcessProxy::pagePreferencesChanged):
+ * UIProcess/WebProcessProxy.h: Ditto.
+ * UIProcess/cf/WebPreferencesCF.cpp: Removed this file which was not used in any
+ configuration.
+ * UIProcess/ios/WebInspectorProxyIOS.mm: Removed functions that no longer need to be
+ implemented for iOS.
+ * WebKit2.xcodeproj/project.pbxproj: Removed reference to WebPreferencesCF.cpp.
+
</ins><span class="cx"> 2014-02-15 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> messages.py doesn't handle parameters with more than one level of scope.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -1586,7 +1586,7 @@
</span><span class="cx"> toImpl(pageRef)->executeEditCommand(toImpl(command)->string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> struct ComputedPagesContext {
</span><span class="cx"> ComputedPagesContext(WKPageComputePagesForPrintingFunction callback, void* context)
</span><span class="cx"> : callback(callback)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
</span><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> : m_type(type)
</span><span class="cx"> , m_webPageProxy(webPageProxy)
</span><span class="cx"> , m_size(webPageProxy->viewSize())
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_exposedRectChangedTimer(this, &DrawingAreaProxy::exposedRectChangedTimerFired)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> sizeDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void DrawingAreaProxy::setExposedRect(const FloatRect& exposedRect)
</span><span class="cx"> {
</span><span class="cx"> if (!m_webPageProxy->isValid())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> virtual void adjustTransientZoom(double, WebCore::FloatPoint) { }
</span><span class="cx"> virtual void commitTransientZoom(double, WebCore::FloatPoint) { }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void setExposedRect(const WebCore::FloatRect&);
</span><span class="cx"> WebCore::FloatRect exposedRect() const { return m_exposedRect; }
</span><span class="cx"> void exposedRectChangedTimerFired(WebCore::Timer<DrawingAreaProxy>*);
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> virtual void enterAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const LayerTreeContext&) { }
</span><span class="cx"> virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const UpdateInfo&) { }
</span><span class="cx"> virtual void updateAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const LayerTreeContext&) { }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void didUpdateGeometry() { }
</span><span class="cx"> virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& newIntrinsicContentSize) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> ExitAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::UpdateInfo updateInfo)
</span><span class="cx"> UpdateAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::LayerTreeContext context)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Used by TiledCoreAnimationDrawingAreaProxy.
</span><span class="cx"> DidUpdateGeometry()
</span><span class="cx"> IntrinsicContentSizeDidChange(WebCore::IntSize newIntrinsicContentSize)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_client) {
</span><span class="cx"> // FIXME: Make Identifier a move-only object and release port rights/connections in the destructor.
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> if (identifier.port)
</span><span class="cx"> mach_port_mod_refs(mach_task_self(), identifier.port, MACH_PORT_RIGHT_RECEIVE, -1);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLauncherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> struct LaunchOptions {
</span><span class="cx"> ProcessType processType;
</span><span class="cx"> HashMap<String, String> extraInitializationData;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> static const cpu_type_t MatchCurrentArchitecture = 0;
</span><span class="cx"> cpu_type_t architecture;
</span><span class="cx"> bool executableHeap;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolsCustomProtocolManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS WKCustomProtocolLoader;
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> ChildProcessProxy* m_childProcessProxy;
</span><span class="cx"> WebContext& m_webContext;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> typedef HashMap<uint64_t, RetainPtr<WKCustomProtocolLoader>> LoaderMap;
</span><span class="cx"> LoaderMap m_loaderMap;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> while (!m_pendingConnectionReplies.isEmpty()) {
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
</span><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><span class="cx"> reply->send(IPC::Attachment());
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> // Grab the first pending connection reply.
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
</span><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><span class="cx"> reply->send(connectionIdentifier);
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> m_numPendingConnectionRequests = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (m_webContext.processSuppressionEnabled())
</span><span class="cx"> setProcessSuppressionEnabled(true);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxy* createDownloadProxy();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <WebCore/EditorClient.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "PluginComplexTextInputState.h"
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS CALayer;
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> class WebFullScreenManagerProxyClient;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> struct ColorSpaceData;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> virtual void clearAllEditCommands() = 0;
</span><span class="cx"> virtual bool canUndoRedo(WebPageProxy::UndoOrRedo) = 0;
</span><span class="cx"> virtual void executeUndoRedo(WebPageProxy::UndoOrRedo) = 0;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) = 0;
</span><span class="cx"> virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, Vector<WebCore::KeypressCommand>&) = 0;
</span><span class="cx"> virtual bool executeSavedCommandBySelector(const String& selector) = 0;
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> virtual Vector<String> dictationAlternatives(uint64_t dictationContext) = 0;
</span><span class="cx"> #endif // USE(DICTATION_ALTERNATIVES)
</span><span class="cx"> #endif // USE(APPKIT)
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // !PLATFORM(IOS) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color&, const Vector<WebCore::FloatQuad>& highlightedQuads, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginInfoStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> return extension;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> PluginModuleLoadPolicy PluginInfoStore::defaultLoadPolicyForPlugin(const PluginModuleInfo&)
</span><span class="cx"> {
</span><span class="cx"> return PluginModuleLoadNormally;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void getSitesWithData(const PluginModuleInfo&, WebPluginSiteDataManager*, uint64_t callbackID);
</span><span class="cx"> void clearSiteData(const PluginModuleInfo&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> #include "MachPort.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> , m_pluginProcessAttributes(pluginProcessAttributes)
</span><span class="cx"> , m_pluginProcessToken(pluginProcessToken)
</span><span class="cx"> , m_numPendingConnectionRequests(0)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_modalWindowIsShowing(false)
</span><span class="cx"> , m_fullscreenWindowIsShowing(false)
</span><span class="cx"> , m_preFullscreenAppPresentationOptions(0)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> while (!m_pendingConnectionReplies.isEmpty()) {
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND), false);
</span><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><span class="cx"> reply->send(IPC::Attachment(), false);
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx">
</span><span class="cx"> void PluginProcessProxy::didClose(IPC::Connection*)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (m_modalWindowIsShowing)
</span><span class="cx"> endModal();
</span><span class="cx">
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_connection = IPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> m_connection->setShouldCloseConnectionOnMachExceptions();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> // Initialize the plug-in host process.
</span><span class="cx"> m_connection->send(Messages::PluginProcess::InitializePluginProcess(parameters), 0);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_connection->send(Messages::PluginProcess::SetQOS(pluginProcessLatencyQOS(), pluginProcessThroughputQOS()), 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">
</span><span class="cx"> m_numPendingConnectionRequests = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (WebContext::processSuppressionIsEnabledForAllContexts())
</span><span class="cx"> setProcessSuppressionEnabled(true);
</span><span class="cx"> #endif
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> // Grab the first pending connection reply.
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND), supportsAsynchronousPluginInitialization);
</span><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><span class="cx"> reply->send(connectionIdentifier, supportsAsynchronousPluginInitialization);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSObject;
</span><span class="cx"> OBJC_CLASS WKPlaceholderModalWindow;
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> int pluginProcessLatencyQOS();
</span><span class="cx"> int pluginProcessThroughputQOS();
</span><span class="cx"> #endif
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> bool isValid() const { return m_connection; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="cx">
</span><span class="cx"> // Returns whether the plug-in needs the heap to be marked executable.
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
</span><span class="cx"> void didClearSiteData(uint64_t callbackID);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool getPluginProcessSerialNumber(ProcessSerialNumber&);
</span><span class="cx"> void makePluginProcessTheFrontProcess();
</span><span class="cx"> void makeUIProcessTheFrontProcess();
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> // when the process finishes launching.
</span><span class="cx"> unsigned m_numPendingConnectionRequests;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<NSObject> m_activationObserver;
</span><span class="cx"> RetainPtr<WKPlaceholderModalWindow *> m_placeholderWindow;
</span><span class="cx"> bool m_modalWindowIsShowing;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> DidGetSitesWithData(Vector<String> sites, uint64_t callbackID)
</span><span class="cx"> DidClearSiteData(uint64_t callbackID)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> SetModalWindowIsShowing(bool modalWindowIsShowing)
</span><span class="cx"> SetFullscreenWindowIsShowing(bool fullscreenWindowIsShowing)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessTextCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/TextChecker.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/TextChecker.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/TextChecker.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> static void setContinuousSpellCheckingEnabled(bool);
</span><span class="cx"> static void setGrammarCheckingEnabled(bool);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static void setAutomaticSpellingCorrectionEnabled(bool);
</span><span class="cx"> static void setAutomaticQuoteSubstitutionEnabled(bool);
</span><span class="cx"> static void setAutomaticDashSubstitutionEnabled(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> m_storageManager->setLocalStorageDirectory(localStorageDirectory());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void WebContext::platformInitialize()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> // Initialize the network process.
</span><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::InitializeNetworkProcess(parameters), 0);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::SetQOS(networkProcessLatencyQOS(), networkProcessThroughputQOS()), 0);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> injectedBundleInitializationUserData = m_injectedBundleInitializationUserData;
</span><span class="cx"> process->send(Messages::WebProcess::InitializeWebProcess(parameters, WebContextUserMessageEncoder(injectedBundleInitializationUserData.get(), *process)), 0);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> process->send(Messages::WebProcess::SetQOS(webProcessLatencyQOS(), webProcessThroughputQOS()), 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1207,7 +1207,7 @@
</span><span class="cx">
</span><span class="cx"> void WebContext::setHTTPPipeliningEnabled(bool enabled)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ResourceRequest::setHTTPPipeliningEnabled(enabled);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(enabled);
</span><span class="lines">@@ -1216,7 +1216,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebContext::httpPipeliningEnabled() const
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return ResourceRequest::httpPipeliningEnabled();
</span><span class="cx"> #else
</span><span class="cx"> return false;
</span><span class="lines">@@ -1277,7 +1277,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void WebContext::dummy(bool&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -1372,7 +1372,7 @@
</span><span class="cx"> mimeTypes.uncheckedAppend(API::String::create(mimeClassInfo.type));
</span><span class="cx"> map.set(ASCIILiteral("mimes"), API::Array::create(std::move(mimeTypes)));
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> map.set(ASCIILiteral("bundleId"), API::String::create(pluginModule.bundleIdentifier));
</span><span class="cx"> map.set(ASCIILiteral("version"), API::String::create(pluginModule.versionString));
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> #include "NetworkProcessProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSObject;
</span><span class="cx"> OBJC_CLASS NSString;
</span><span class="cx"> #endif
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> int networkProcessLatencyQOS();
</span><span class="cx"> int networkProcessThroughputQOS();
</span><span class="cx"> int webProcessLatencyQOS();
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> void garbageCollectJavaScriptObjects();
</span><span class="cx"> void setJavaScriptGarbageCollectorTimerEnabled(bool flag);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static bool omitPDFSupport();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool processSuppressionEnabled() const;
</span><span class="cx"> static bool processSuppressionIsEnabledForAllContexts();
</span><span class="cx"> #endif
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> static void unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void updateProcessSuppressionState() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -348,7 +348,6 @@
</span><span class="cx"> void platformInitializeNetworkProcess(NetworkProcessCreationParameters&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void writeWebContentToPasteboard(const WebCore::PasteboardWebContent&);
</span><span class="cx"> void writeImageToPasteboard(const WebCore::PasteboardImage&);
</span><span class="lines">@@ -358,6 +357,7 @@
</span><span class="cx"> void readBufferFromPasteboard(uint64_t index, const String& pasteboardType, SharedMemory::Handle&, uint64_t& size);
</span><span class="cx"> void getPasteboardItemsCount(uint64_t& itemsCount);
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void getPasteboardTypes(const String& pasteboardName, Vector<String>& pasteboardTypes);
</span><span class="cx"> void getPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, Vector<String>& pathnames);
</span><span class="cx"> void getPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, String&);
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> void setPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, const SharedMemory::Handle&, uint64_t size, uint64_t& newChangeCount);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
</span><span class="cx"> // any synchronous messages, and should be removed when <rdar://problem/8775115> is fixed.
</span><span class="cx"> void dummy(bool&);
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> String cookieStorageDirectory() const;
</span><span class="cx"> String platformDefaultCookieStorageDirectory() const;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void registerNotificationObservers();
</span><span class="cx"> void unregisterNotificationObservers();
</span><span class="cx"> #endif
</span><span class="lines">@@ -485,11 +485,11 @@
</span><span class="cx"> HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> RetainPtr<NSObject> m_enhancedAccessibilityObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticTextReplacementNotificationObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticSpellingCorrectionNotificationObserver;
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> RetainPtr<NSObject> m_automaticQuoteSubstitutionNotificationObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticDashSubstitutionNotificationObserver;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.messages.in (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.messages.in 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebContext.messages.in 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> GetPasteboardItemsCount() -> (uint64_t itemsCount)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> # Pasteboard messages.
</span><span class="cx"> GetPasteboardTypes(String pasteboardName) -> (Vector<String> types)
</span><span class="cx"> GetPasteboardPathnamesForType(String pasteboardName, String pasteboardType) -> (Vector<String> pathnames)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> SetPasteboardBufferForType(String pasteboardName, String pasteboardType, WebKit::SharedMemory::Handle handle, uint64_t size) -> (uint64_t changeCount)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
</span><span class="cx"> // any synchronous messages, and should be removed when <rdar://problem/8775115> is fixed.
</span><span class="cx"> Dummy() -> (bool dummyReturn)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "WebPageGroupData.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "ObjCObjectGraphCoders.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> encoder << pageGroup->data();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case API::Object::Type::ObjCObjectGraph: {
</span><span class="cx"> ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
</span><span class="cx"> encoder << WebContextObjCObjectGraphEncoder(objectGraph, m_process);
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> coder.m_root = WebPageGroup::get(pageGroupID);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case API::Object::Type::ObjCObjectGraph: {
</span><span class="cx"> RefPtr<ObjCObjectGraph> objectGraph;
</span><span class="cx"> WebContextObjCObjectGraphDecoder objectGraphDecoder(objectGraph, coder.m_process);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> persistHTTPCookieAcceptPolicy(policy);
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void persistHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFormSubmissionListenerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFormSubmissionListenerProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFormSubmissionListenerProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebFormSubmissionListenerProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #include "WebFrameListenerProxy.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WKFoundation.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(MAC) && WK_API_ENABLED)
</del><ins>+#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(COCOA) && WK_API_ENABLED)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFramePolicyListenerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFramePolicyListenerProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFramePolicyListenerProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebFramePolicyListenerProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #include "WebFrameListenerProxy.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WKFoundation.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(MAC) && WK_API_ENABLED)
</del><ins>+#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(COCOA) && WK_API_ENABLED)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> #include "WKGeometry.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> void hide();
</span><span class="cx"> void close();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> void createInspectorWindow();
</span><span class="cx"> void updateInspectorWindowTitle() const;
</span><span class="cx"> void inspectedViewFrameDidChange(CGFloat = 0);
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx">
</span><span class="cx"> AttachmentSide m_attachmentSide;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> RetainPtr<WKWebInspectorWKView> m_inspectorView;
</span><span class="cx"> RetainPtr<NSWindow> m_inspectorWindow;
</span><span class="cx"> RetainPtr<NSButton> m_dockBottomButton;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> #include "NetworkProcessMessages.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "ViewSnapshotStore.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> , m_pageID(pageID)
</span><span class="cx"> , m_session(*configuration.session)
</span><span class="cx"> , m_isPageSuspended(false)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_isSmartInsertDeleteEnabled(TextChecker::isSmartInsertDeleteEnabled())
</span><span class="cx"> #endif
</span><span class="cx"> , m_spellDocumentTag(0)
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx">
</span><span class="cx"> process().send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -783,7 +783,7 @@
</span><span class="cx"> if (!m_shouldRecordNavigationSnapshots)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ViewSnapshotStore::shared().recordSnapshot(*this);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -887,11 +887,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // On Mac, we can show PDFs.
</span><span class="cx"> if (MIMETypeRegistry::isPDFOrPostScriptMIMEType(mimeType) && !WebContext::omitPDFSupport())
</span><span class="cx"> return true;
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1221,7 +1221,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (a.granularity() != b.granularity())
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (a.phase() != b.phase())
</span><span class="cx"> return false;
</span><span class="cx"> if (a.momentumPhase() != b.momentumPhase())
</span><span class="lines">@@ -1240,7 +1240,7 @@
</span><span class="cx"> FloatSize mergedDelta = a.delta() + b.delta();
</span><span class="cx"> FloatSize mergedWheelTicks = a.wheelTicks() + b.wheelTicks();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> FloatSize mergedUnacceleratedScrollingDelta = a.unacceleratedScrollingDelta() + b.unacceleratedScrollingDelta();
</span><span class="cx">
</span><span class="cx"> return WebWheelEvent(WebEvent::Wheel, b.position(), b.globalPosition(), mergedDelta, mergedWheelTicks, b.granularity(), b.directionInvertedFromDevice(), b.phase(), b.momentumPhase(), b.hasPreciseScrollingDeltas(), b.scrollCount(), mergedUnacceleratedScrollingDelta, b.modifiers(), b.timestamp());
</span><span class="lines">@@ -1372,7 +1372,7 @@
</span><span class="cx">
</span><span class="cx"> pluginLoadPolicy = PluginInfoStore::defaultLoadPolicyForPlugin(plugin);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RefPtr<ImmutableDictionary> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, String(), pageURLString, String(), String());
</span><span class="cx"> pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription);
</span><span class="cx"> #else
</span><span class="lines">@@ -3040,7 +3040,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::editorStateChanged(const EditorState& editorState)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool couldChangeSecureInputState = m_editorState.isInPasswordField != editorState.isInPasswordField || m_editorState.selectionIsNone;
</span><span class="cx"> bool closedComposition = !editorState.shouldIgnoreCompositionSelectionChange && !editorState.hasComposition && (m_editorState.hasComposition || m_temporarilyClosedComposition);
</span><span class="cx"> m_temporarilyClosedComposition = editorState.shouldIgnoreCompositionSelectionChange && (m_temporarilyClosedComposition || m_editorState.hasComposition) && !editorState.hasComposition;
</span><span class="lines">@@ -3048,7 +3048,7 @@
</span><span class="cx">
</span><span class="cx"> m_editorState = editorState;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Selection being none is a temporary state when editing. Flipping secure input state too quickly was causing trouble (not fully understood).
</span><span class="cx"> if (couldChangeSecureInputState && !editorState.selectionIsNone)
</span><span class="cx"> m_pageClient.updateSecureInputState();
</span><span class="lines">@@ -3282,7 +3282,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (item.action() == ContextMenuItemTagSmartCopyPaste) {
</span><span class="cx"> setSmartInsertDeleteEnabled(!isSmartInsertDeleteEnabled());
</span><span class="cx"> return;
</span><span class="lines">@@ -3584,7 +3584,7 @@
</span><span class="cx"> if (!handled) {
</span><span class="cx"> if (m_uiClient->implementsDidNotHandleWheelEvent())
</span><span class="cx"> m_uiClient->didNotHandleWheelEvent(this, oldestCoalescedEvent->last());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_pageClient.wheelEventWasNotHandledByWebCore(oldestCoalescedEvent->last());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -4182,7 +4182,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ImmutableDictionary> pluginInformation;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(NETSCAPE_PLUGIN_API)
</del><ins>+#if PLATFORM(COCOA) && ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> String newMimeType = mimeType;
</span><span class="cx"> PluginModuleInfo plugin = m_process->context().pluginInfoStore().findPlugin(newMimeType, URL(URL(), pluginURLString));
</span><span class="cx"> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, mimeType, pageURLString, String(), String(), replacementObscured);
</span><span class="lines">@@ -4257,7 +4257,7 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ComputePagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void WebPageProxy::drawRectToImage(WebFrameProxy* frame, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, PassRefPtr<ImageCallback> prpCallback)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ImageCallback> callback = prpCallback;
</span><span class="lines">@@ -4412,7 +4412,7 @@
</span><span class="cx">
</span><span class="cx"> #endif // !PLATFORM(IOS) && PLATFORM(MAC)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CGImageRef> WebPageProxy::takeViewSnapshot()
</span><span class="cx"> {
</span><span class="cx"> return m_pageClient.takeViewSnapshot();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> #include <Evas.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <WebCore/PlatformLayer.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> void setInputMethodState(bool enabled);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void windowAndViewFramesChanged(const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates);
</span><span class="cx"> void setMainFrameIsScrollable(bool);
</span><span class="cx">
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> WKView* wkView() const;
</span><span class="cx"> void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize);
</span><span class="cx"> #endif
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx"> void handleInputMethodKeydown(bool& handled);
</span><span class="cx"> void confirmComposition(const String&);
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx"> double gapBetweenPages() const { return m_gapBetweenPages; }
</span><span class="cx"> unsigned pageCount() const { return m_pageCount; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Called by the web process through a message.
</span><span class="cx"> void registerWebProcessAccessibilityToken(const IPC::DataReference&);
</span><span class="cx"> // Called by the UI process when it is ready to send its tokens to the web process.
</span><span class="lines">@@ -683,7 +683,7 @@
</span><span class="cx"> void drawHeader(WebFrameProxy*, const WebCore::FloatRect&);
</span><span class="cx"> void drawFooter(WebFrameProxy*, const WebCore::FloatRect&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Dictionary.
</span><span class="cx"> void performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx">
</span><span class="cx"> void didPerformDragControllerAction(WebCore::DragSession);
</span><span class="cx"> void dragEnded(const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t operation);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void setDragImage(const WebCore::IntPoint& clientPosition, const ShareableBitmap::Handle& dragImageHandle, bool isLinkDrag);
</span><span class="cx"> void setPromisedData(const String& pasteboardName, const SharedMemory::Handle& imageHandle, uint64_t imageSize, const String& filename, const String& extension,
</span><span class="cx"> const String& title, const String& url, const String& visibleURL, const SharedMemory::Handle& archiveHandle, uint64_t archiveSize);
</span><span class="lines">@@ -728,7 +728,7 @@
</span><span class="cx"> bool isValidEditCommand(WebEditCommandProxy*);
</span><span class="cx"> void registerEditCommand(PassRefPtr<WebEditCommandProxy>, UndoOrRedo);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void registerKeypressCommandName(const String& name) { m_knownKeypressCommandNames.add(name); }
</span><span class="cx"> bool isValidKeypressCommandName(const String& name) const { return m_knownKeypressCommandNames.contains(name); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx"> void capitalizeWord();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool isSmartInsertDeleteEnabled() const { return m_isSmartInsertDeleteEnabled; }
</span><span class="cx"> void setSmartInsertDeleteEnabled(bool);
</span><span class="cx"> #endif
</span><span class="lines">@@ -797,7 +797,7 @@
</span><span class="cx"> void beginPrinting(WebFrameProxy*, const PrintInfo&);
</span><span class="cx"> void endPrinting();
</span><span class="cx"> void computePagesForPrinting(WebFrameProxy*, const PrintInfo&, PassRefPtr<ComputedPagesCallback>);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void drawRectToImage(WebFrameProxy*, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, PassRefPtr<ImageCallback>);
</span><span class="cx"> void drawPagesToPDF(WebFrameProxy*, const PrintInfo&, uint32_t first, uint32_t count, PassRefPtr<DataCallback>);
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="lines">@@ -806,13 +806,13 @@
</span><span class="cx">
</span><span class="cx"> PageLoadState& pageLoadState() { return m_pageLoadState; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void handleAlternativeTextUIResult(const String& result);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data*);
</span><span class="cx"> void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const IPC::DataReference&);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void savePDFToTemporaryFolderAndOpenWithNativeApplicationRaw(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID);
</span><span class="cx"> void savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const IPC::DataReference&, const String& pdfUUID);
</span><span class="cx"> void openPDFFromTemporaryFolderWithNativeApplication(const String& pdfUUID);
</span><span class="lines">@@ -883,7 +883,7 @@
</span><span class="cx"> void setShouldRecordNavigationSnapshots(bool shouldRecordSnapshots) { m_shouldRecordNavigationSnapshots = shouldRecordSnapshots; }
</span><span class="cx"> void recordNavigationSnapshot();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CGImageRef> takeViewSnapshot();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1045,7 +1045,7 @@
</span><span class="cx"> void executeUndoRedo(uint32_t action, bool& result);
</span><span class="cx">
</span><span class="cx"> // Keyboard handling
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void interpretQueuedKeyEvent(const EditorState&, bool& handled, Vector<WebCore::KeypressCommand>&);
</span><span class="cx"> void executeSavedCommandBySelector(const String& selector, bool& handled);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1072,7 +1072,7 @@
</span><span class="cx"> void saveRecentSearches(const String&, const Vector<String>&);
</span><span class="cx"> void loadRecentSearches(const String&, Vector<String>&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Speech.
</span><span class="cx"> void getIsSpeaking(bool&);
</span><span class="cx"> void speak(const String&);
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx"> void canAuthenticateAgainstProtectionSpaceInFrame(uint64_t frameID, const WebCore::ProtectionSpace&, bool& canAuthenticate);
</span><span class="cx"> void didReceiveAuthenticationChallenge(uint64_t frameID, const WebCore::AuthenticationChallenge&, uint64_t challengeID);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus);
</span><span class="cx"> void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, uint64_t complexTextInputState);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1260,7 +1260,7 @@
</span><span class="cx">
</span><span class="cx"> HashSet<WebEditCommandProxy*> m_editCommandSet;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> HashSet<String> m_knownKeypressCommandNames;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1357,7 +1357,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_isPageSuspended;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool m_isSmartInsertDeleteEnabled;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1417,7 +1417,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_waitingForDidUpdateViewState;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> HashMap<String, String> m_temporaryPDFFiles;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> DidPerformDragControllerAction(WebCore::DragSession dragSession)
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) && ENABLE(DRAG_SUPPORT)
</del><ins>+#if PLATFORM(COCOA) && ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> SetDragImage(WebCore::IntPoint clientPosition, WebKit::ShareableBitmap::Handle dragImage, bool linkDrag)
</span><span class="cx"> SetPromisedData(String pasteboardName, WebKit::SharedMemory::Handle imageHandle, uint64_t imageSize, String filename, String extension, String title, String url, String visibleURL, WebKit::SharedMemory::Handle archiveHandle, uint64_t archiveSize)
</span><span class="cx"> #endif
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> StartDrag(WebCore::DragData dragData, WebKit::ShareableBitmap::Handle dragImage)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> # Dictionary support.
</span><span class="cx"> DidPerformDictionaryLookup(WebKit::AttributedString text, WebKit::DictionaryPopupInfo dictionaryPopupInfo)
</span><span class="cx">
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx">
</span><span class="cx"> SavePDFToFileInDownloadsFolder(String suggestedFilename, String originatingURLString, IPC::DataReference data)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> SavePDFToTemporaryFolderAndOpenWithNativeApplication(String suggestedFilename, String originatingURLString, IPC::DataReference data, String pdfUUID)
</span><span class="cx"> OpenPDFFromTemporaryFolderWithNativeApplication(String pdfUUID)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "PDFPlugin.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span><span class="cx"> , m_customProtocolManagerProxy(this, context)
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_processSuppressionEnabled(false)
</span><span class="cx"> #endif
</span><span class="cx"> , m_numberOfTimesSuddenTerminationWasDisabled(0)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageID, configuration);
</span><span class="cx"> m_pageMap.set(pageID, webPage.get());
</span><span class="cx"> globalPageMap().set(pageID, webPage.get());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (webPage->isProcessSuppressible())
</span><span class="cx"> m_processSuppressiblePages.add(pageID);
</span><span class="cx"> updateProcessSuppressionState();
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_pageMap.set(pageID, webPage);
</span><span class="cx"> globalPageMap().set(pageID, webPage);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (webPage->isProcessSuppressible())
</span><span class="cx"> m_processSuppressiblePages.add(pageID);
</span><span class="cx"> updateProcessSuppressionState();
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_pageMap.remove(pageID);
</span><span class="cx"> globalPageMap().remove(pageID);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_processSuppressiblePages.remove(pageID);
</span><span class="cx"> updateProcessSuppressionState();
</span><span class="cx"> #endif
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> bool WebProcessProxy::fullKeyboardAccessEnabled()
</span><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx">
</span><span class="cx"> m_context->processDidFinishLaunching(this);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> updateProcessSuppressionState();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -608,7 +608,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::pageSuppressibilityChanged(WebKit::WebPageProxy *page)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (page->isProcessSuppressible())
</span><span class="cx"> m_processSuppressiblePages.add(page->pageID());
</span><span class="cx"> else
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::pagePreferencesChanged(WebKit::WebPageProxy *page)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (page->isProcessSuppressible())
</span><span class="cx"> m_processSuppressiblePages.add(page->pageID());
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> void didSaveToPageCache();
</span><span class="cx"> void releasePageCache();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool allPagesAreProcessSuppressible() const;
</span><span class="cx"> void updateProcessSuppressionState();
</span><span class="cx"> #endif
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> HashSet<uint64_t> m_processSuppressiblePages;
</span><span class="cx"> bool m_processSuppressionEnabled;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscfWebPreferencesCFcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/cf/WebPreferencesCF.cpp 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -1,150 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * 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 "WebPreferences.h"
-
-#include <wtf/RetainPtr.h>
-#include <wtf/text/StringConcatenate.h>
-
-#if !PLATFORM(MAC)
-
-namespace WebKit {
-
-static inline RetainPtr<CFStringRef> makeKey(const String& identifier, const String& baseKey)
-{
- return makeString(identifier, ".WebKit2", baseKey).createCFString();
-}
-
-static void setStringValueIfInUserDefaults(const String& identifier, const String& baseKey, WebPreferencesStore& store)
-{
- RetainPtr<CFPropertyListRef> value = adoptCF(CFPreferencesCopyAppValue(makeKey(identifier, baseKey).get(), kCFPreferencesCurrentApplication));
- if (!value)
- return;
- if (CFGetTypeID(value.get()) != CFStringGetTypeID())
- return;
-
- store.setStringValueForKey(baseKey, (CFStringRef)value.get());
-}
-
-static void setBoolValueIfInUserDefaults(const String& identifier, const String& baseKey, WebPreferencesStore& store)
-{
- RetainPtr<CFPropertyListRef> value = adoptCF(CFPreferencesCopyAppValue(makeKey(identifier, baseKey).get(), kCFPreferencesCurrentApplication));
- if (!value)
- return;
- if (CFGetTypeID(value.get()) != CFBooleanGetTypeID())
- return;
-
- store.setBoolValueForKey(baseKey, CFBooleanGetValue((CFBooleanRef)value.get()) ? true : false);
-}
-
-static void setUInt32ValueIfInUserDefaults(const String& identifier, const String& baseKey, WebPreferencesStore& store)
-{
- RetainPtr<CFPropertyListRef> value = adoptCF(CFPreferencesCopyAppValue(makeKey(identifier, baseKey).get(), kCFPreferencesCurrentApplication));
- if (!value)
- return;
- if (CFGetTypeID(value.get()) != CFNumberGetTypeID())
- return;
- int32_t intValue = 0;
- if (!CFNumberGetValue((CFNumberRef)value.get(), kCFNumberSInt32Type, &intValue))
- return;
-
- store.setUInt32ValueForKey(baseKey, intValue);
-}
-
-static void setDoubleValueIfInUserDefaults(const String& identifier, const String& baseKey, WebPreferencesStore& store)
-{
- RetainPtr<CFPropertyListRef> value = adoptCF(CFPreferencesCopyAppValue(makeKey(identifier, baseKey).get(), kCFPreferencesCurrentApplication));
- if (!value)
- return;
- if (CFGetTypeID(value.get()) != CFNumberGetTypeID())
- return;
- double doubleValue = 0;
- if (!CFNumberGetValue((CFNumberRef)value.get(), kCFNumberDoubleType, &doubleValue))
- return;
-
- store.setDoubleValueForKey(baseKey, doubleValue);
-}
-
-void WebPreferences::platformInitializeStore()
-{
- if (!m_identifier)
- return;
-
-#define INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \
- set##TypeName##ValueIfInUserDefaults(m_identifier, WebPreferencesKey::KeyLower##Key(), m_store);
-
- FOR_EACH_WEBKIT_PREFERENCE(INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS)
-
-#undef INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS
-
-}
-
-void WebPreferences::platformUpdateStringValueForKey(const String& key, const String& value)
-{
- if (!m_identifier)
- return;
-
- CFPreferencesSetAppValue(makeKey(m_identifier, key).get(), cfStringFromWebCoreString(value).get(), kCFPreferencesCurrentApplication);
-}
-
-void WebPreferences::platformUpdateBoolValueForKey(const String& key, bool value)
-{
- if (!m_identifier)
- return;
-
- CFPreferencesSetAppValue(makeKey(m_identifier, key).get(), value ? kCFBooleanTrue : kCFBooleanFalse, kCFPreferencesCurrentApplication);
-}
-
-void WebPreferences::platformUpdateUInt32ValueForKey(const String& key, uint32_t value)
-{
- if (!m_identifier)
- return;
-
- RetainPtr<CFNumberRef> number = adoptCF(CFNumberCreate(0, kCFNumberSInt32Type, &value));
- CFPreferencesSetAppValue(makeKey(m_identifier, key).get(), number.get(), kCFPreferencesCurrentApplication);
-}
-
-void WebPreferences::platformUpdateDoubleValueForKey(const String& key, double value)
-{
- if (!m_identifier)
- return;
-
- RetainPtr<CFNumberRef> number = adoptCF(CFNumberCreate(0, kCFNumberDoubleType, &value));
- CFPreferencesSetAppValue(makeKey(m_identifier, key).get(), number.get(), kCFPreferencesCurrentApplication);
-}
-
-void WebPreferences::platformUpdateFloatValueForKey(const String& key, float value)
-{
- if (!m_identifier)
- return;
-
- RetainPtr<CFNumberRef> number = adoptCF(CFNumberCreate(0, kCFNumberFloatType, &value));
- CFPreferencesSetAppValue(makeKey(m_identifier, key).get(), number.get(), kCFPreferencesCurrentApplication);
-}
-
-} // namespace WebKit
-
-#endif // !PLATFORM(MAC)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebInspectorProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebInspectorProxyIOS.mm (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebInspectorProxyIOS.mm 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/UIProcess/ios/WebInspectorProxyIOS.mm 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -32,16 +32,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void WebInspectorProxy::createInspectorWindow()
-{
- notImplemented();
-}
-
-void WebInspectorProxy::updateInspectorWindowTitle() const
-{
- notImplemented();
-}
-
</del><span class="cx"> WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="lines">@@ -84,11 +74,6 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebInspectorProxy::inspectedViewFrameDidChange(CGFloat)
-{
- notImplemented();
-}
-
</del><span class="cx"> unsigned WebInspectorProxy::platformInspectedWindowHeight()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (164171 => 164172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-15 09:28:01 UTC (rev 164171)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-15 17:06:17 UTC (rev 164172)
</span><span class="lines">@@ -1030,7 +1030,6 @@
</span><span class="cx"> BC2652171182608100243E12 /* DrawingAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2652131182608100243E12 /* DrawingAreaProxy.h */; };
</span><span class="cx"> BC2D021712AC41CB00E732A3 /* SameDocumentNavigationType.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2D021612AC41CB00E732A3 /* SameDocumentNavigationType.h */; };
</span><span class="cx"> BC2D021912AC426C00E732A3 /* WKPageLoadTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2D021812AC426C00E732A3 /* WKPageLoadTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC2DFBA312A761A500E732A3 /* WebPreferencesCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2DFBA212A761A500E732A3 /* WebPreferencesCF.cpp */; };
</del><span class="cx"> BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2E6E7D1141970C00A63B1E /* WorkQueue.cpp */; };
</span><span class="cx"> BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E6E7E1141970C00A63B1E /* WorkQueue.h */; };
</span><span class="cx"> BC3065C412592F8900E71278 /* WebProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC3065C312592F8900E71278 /* WebProcessMac.mm */; };
</span><span class="lines">@@ -2790,7 +2789,6 @@
</span><span class="cx"> BC2652131182608100243E12 /* DrawingAreaProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> BC2D021612AC41CB00E732A3 /* SameDocumentNavigationType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SameDocumentNavigationType.h; sourceTree = "<group>"; };
</span><span class="cx"> BC2D021812AC426C00E732A3 /* WKPageLoadTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageLoadTypes.h; sourceTree = "<group>"; };
</span><del>- BC2DFBA212A761A500E732A3 /* WebPreferencesCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPreferencesCF.cpp; path = cf/WebPreferencesCF.cpp; sourceTree = "<group>"; };
</del><span class="cx"> BC2E6E7D1141970C00A63B1E /* WorkQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC2E6E7E1141970C00A63B1E /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
</span><span class="cx"> BC3065C312592F8900E71278 /* WebProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -4718,7 +4716,6 @@
</span><span class="cx"> children = (
</span><span class="cx"> 51B3004E12529D0E000B5CA0 /* WebBackForwardListCF.cpp */,
</span><span class="cx"> 51B3004F12529D0E000B5CA0 /* WebPageProxyCF.cpp */,
</span><del>- BC2DFBA212A761A500E732A3 /* WebPreferencesCF.cpp */,
</del><span class="cx"> );
</span><span class="cx"> name = cf;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -8121,7 +8118,6 @@
</span><span class="cx"> BCC43AC7127B99DE00317F16 /* WebPopupMenuMac.mm in Sources */,
</span><span class="cx"> BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */,
</span><span class="cx"> BCD59800112B57BE00EC8C23 /* WebPreferences.cpp in Sources */,
</span><del>- BC2DFBA312A761A500E732A3 /* WebPreferencesCF.cpp in Sources */,
</del><span class="cx"> BC84EB1812A7100C0083F2DA /* WebPreferencesMac.mm in Sources */,
</span><span class="cx"> BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */,
</span><span class="cx"> BC111AE4112F5C2600337BAB /* WebProcess.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>