<!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>[164192] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164192">164192</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-16 12:38:41 -0800 (Sun, 16 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in Source except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128885
Reviewed by Anders Carlsson.
Source/WebCore:
* loader/FrameLoaderClient.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* platform/Cursor.h: Changed PLATFORM(MAC) to USE(APPKIT) around uses of NSCursor.
* platform/LocalizedStrings.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* platform/graphics/PlatformLayer.h: Ditto.
* platform/graphics/cg/PDFDocumentImage.cpp: Ditto.
* rendering/RenderLayerCompositor.cpp: Ditto.
(WebCore::RenderLayerCompositor::requiresContentShadowLayer):
(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
Source/WebKit2:
* Configurations/WebKit2.xcconfig: Removed PageBannerMac.mm and WKBundlePageBannerMac.mm
from EXCLUDED_SOURCE_FILE_NAMES_iphoneos, now that these files are guarded with
!PLATFORM(IOS).
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: Changed PLATFORM(MAC) to
PLATFORM(COCOA).
(WKBundleFrameCopyWebArchiveFilteringSubframes):
* WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm: Guarded with !PLATFORM(IOS).
* WebProcess/InjectedBundle/InjectedBundle.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::InjectedBundle::setPrivateBrowsingEnabled):
* WebProcess/InjectedBundle/InjectedBundle.h: Changed PLATFORM(MAC) to USE(FOUNDATION)
around use of NSBundle.
* WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h: Changed PLATFORM(MAC) to
PLATFORM(COCOA).
(WebKit::InjectedBundleUserMessageEncoder::encode):
(WebKit::InjectedBundleUserMessageDecoder::decode):
* WebProcess/Network/WebResourceLoader.cpp: Ditto.
(WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: Ditto.
(WebKit::NPN_GetValue):
(WebKit::NPN_SetValue):
(WebKit::initializeBrowserFuncs):
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp: Ditto.
(WebKit::NetscapePlugin::NetscapePlugin):
(WebKit::NetscapePlugin::supportsSnapshotting):
* WebProcess/Plugins/Netscape/NetscapePlugin.h: Ditto.
* WebProcess/Plugins/Plugin.cpp: Ditto.
(WebKit::Plugin::Parameters::encode):
(WebKit::Plugin::Parameters::decode):
* WebProcess/Plugins/Plugin.h: Ditto.
* WebProcess/Plugins/PluginController.h: Ditto.
* WebProcess/Plugins/PluginProcessConnectionManager.cpp: Changed PLATFORM(MAC) to
USE(DARWIN) around use of Mach-based IPC.
(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
* WebProcess/Plugins/PluginProxy.cpp: Chanegd PLATFORM(MAC) to PLATFORM(COCOA).
* WebProcess/Plugins/PluginProxy.h: Ditto.
* WebProcess/Plugins/PluginProxy.messages.in: Ditto.
* WebProcess/Plugins/PluginView.cpp: Ditto.
(WebKit::PluginView::destroyPluginAndReset):
(WebKit::PluginView::viewStateDidChange):
(WebKit::PluginView::didInitializePlugin):
(WebKit::PluginView::invalidateRect):
(WebKit::PluginView::pluginSnapshotTimerFired):
* WebProcess/Plugins/PluginView.h: Ditto.
* WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp: Ditto.
* WebProcess/WebCoreSupport/WebChromeClient.cpp: Ditto.
(WebKit::WebChromeClient::windowRect):
* WebProcess/WebCoreSupport/WebChromeClient.h: Ditto.
* WebProcess/WebCoreSupport/WebContextMenuClient.cpp: Ditto.
* WebProcess/WebCoreSupport/WebContextMenuClient.h: Ditto.
* WebProcess/WebCoreSupport/WebDragClient.cpp: Ditto.
* WebProcess/WebCoreSupport/WebDragClient.h: Ditto.
* WebProcess/WebCoreSupport/WebEditorClient.cpp: Ditto.
(WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection):
* WebProcess/WebCoreSupport/WebEditorClient.h: Ditto.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: Ditto.
(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
(WebKit::WebFrameLoaderClient::createPlugin):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h: Ditto.
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Ditto.
* WebProcess/WebCoreSupport/WebPlatformStrategies.h: Ditto.
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm: Removed PLATFORM(MAC).
(InitWebCoreSystemInterface):
* WebProcess/WebPage/DrawingArea.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::DrawingArea::create):
* WebProcess/WebPage/DrawingArea.h: Ditto.
* WebProcess/WebPage/DrawingArea.messages.in: Ditto.
* WebProcess/WebPage/EventDispatcher.cpp: Ditto.
(WebKit::EventDispatcher::wheelEvent):
* WebProcess/WebPage/LayerTreeHost.h: Ditto.
* WebProcess/WebPage/PageBanner.cpp: Added !PLATFORM(IOS)
* WebProcess/WebPage/PageBanner.h: Ditto.
* WebProcess/WebPage/WebFrame.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* WebProcess/WebPage/WebFrame.h: Ditto.
* WebProcess/WebPage/WebInspector.cpp: Ditto.
(WebKit::WebInspector::WebInspector):
* WebProcess/WebPage/WebInspector.h: Ditto.
* WebProcess/WebPage/WebPage.cpp: Ditto.
(WebKit::WebPage::WebPage):
(WebKit::isContextClick):
(WebKit::WebPage::getSelectionAsWebArchiveData):
(WebKit::WebPage::getWebArchiveOfFrame):
(WebKit::WebPage::updatePreferences):
(WebKit::WebPage::sendSetWindowFrame):
(WebKit::WebPage::beginPrinting):
(WebKit::WebPage::computePagesForPrinting):
* WebProcess/WebPage/WebPage.h: Ditto.
* WebProcess/WebPage/WebPage.messages.in: Ditto.
* WebProcess/WebPage/mac/PageBannerMac.mm: Guarded with !PLATFORM(IOS).
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess): Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::WebProcess::initializeWebProcess): Ditto.
(WebKit::WebProcess::ensureNetworkProcessConnection): Changed PLATFORM(MAC) to OS(DARWIN).
(WebKit::WebProcess::ensurePrivateBrowsingSession): Changed PLATFORM(MAC) to
PLATFORM(COCOA).
(WebKit::WebProcess::destroyPrivateBrowsingSession): Ditto.
(WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Changed PLATFORM(MAC) to
OS(DARWIN).
(WebKit::WebProcess::nonVisibleProcessCleanupTimerFired): Changed PLATFORM(MAC) to
PLATFORM(COCOA)
* WebProcess/WebProcess.h: Ditto.
* WebProcess/WebProcess.messages.in: Removed PLATFORM(MAC) guard around
SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformCursorh">trunk/Source/WebCore/platform/Cursor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringscpp">trunk/Source/WebCore/platform/LocalizedStrings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformLayerh">trunk/Source/WebCore/platform/graphics/PlatformLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPDFDocumentImagecpp">trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKit2xcconfig">trunk/Source/WebKit2/Configurations/WebKit2.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFramecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMacmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleh">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleUserMessageCodersh">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Plugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginh">trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginControllerh">trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxycpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxyh">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxymessagesin">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessResourceCachecfWebResourceCacheManagerCFNetcpp">trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebContextMenuClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebContextMenuClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDragClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDragClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagePageBannercpp">trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagePageBannerh">trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFrameh">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorh">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPageBannerMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebCore/ChangeLog 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-02-16 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ Stop using PLATFORM(MAC) in Source except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128885
+
+ Reviewed by Anders Carlsson.
+
+ * loader/FrameLoaderClient.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * platform/Cursor.h: Changed PLATFORM(MAC) to USE(APPKIT) around uses of NSCursor.
+ * platform/LocalizedStrings.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * platform/graphics/PlatformLayer.h: Ditto.
+ * platform/graphics/cg/PDFDocumentImage.cpp: Ditto.
+ * rendering/RenderLayerCompositor.cpp: Ditto.
+ (WebCore::RenderLayerCompositor::requiresContentShadowLayer):
+ (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+
+2014-02-16 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Speculative iOS build fix after r164184.
</span><span class="cx">
</span><span class="cx"> * dom/Node.cpp:
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> typedef id RemoteAXObjectRef;
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx">
</span><span class="cx"> typedef class _jobject* jobject;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !defined(__OBJC__)
-class NSCachedURLResponse;
-class NSView;
</del><ins>+#if PLATFORM(COCOA)
+OBJC_CLASS NSCachedURLResponse;
+OBJC_CLASS NSView;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void registerForIconNotification(bool listen = true) = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Allow an accessibility object to retrieve a Frame parent if there's no PlatformWidget.
</span><span class="cx"> virtual RemoteAXObjectRef accessibilityRemoteObject() = 0;
</span><span class="cx"> virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Cursor.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Cursor.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebCore/platform/Cursor.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include "GRefPtrGtk.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> OBJC_CLASS NSCursor;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> HCURSOR m_nativeCursor;
</span><span class="cx"> };
</span><span class="cx"> typedef RefPtr<SharedCursor> PlatformCursor;
</span><del>-#elif PLATFORM(MAC) && !PLATFORM(IOS)
</del><ins>+#elif USE(APPKIT)
</ins><span class="cx"> typedef NSCursor *PlatformCursor;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef GRefPtr<GdkCursor> PlatformCursor;
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> float m_imageScaleFactor;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !USE(APPKIT)
</ins><span class="cx"> mutable PlatformCursor m_platformCursor;
</span><span class="cx"> #else
</span><span class="cx"> mutable RetainPtr<NSCursor> m_platformCursor;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -1074,7 +1074,7 @@
</span><span class="cx"> return WEB_UI_STRING_KEY("Unknown", "Unknown (text track)", "Menu item label for a text track that has no other name");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(WIN)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(WIN)
</ins><span class="cx"> String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language)
</span><span class="cx"> {
</span><span class="cx"> return formatLocalizedString(WEB_UI_STRING("%@ (%@-%@)", "Text track display name format that includes the country and language of the subtitle, in the form of 'Title (Language-Country)'"), title.createCFString().get(), language.createCFString().get(), country.createCFString().get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformLayer.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformLayer.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebCore/platform/graphics/PlatformLayer.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef PlatformLayer_h
</span><span class="cx"> #define PlatformLayer_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx"> typedef CALayer PlatformLayer;
</span><span class="cx"> #elif PLATFORM(WIN) && USE(CA)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPDFDocumentImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> #include "ImageSourceCG.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -2774,7 +2774,7 @@
</span><span class="cx"> if (m_renderView.document().ownerElement())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (viewHasTransparentBackground())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -3005,7 +3005,7 @@
</span><span class="cx"> m_layerForHorizontalScrollbar->setName("horizontal scrollbar container");
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) && USE(CA)
</del><ins>+#if PLATFORM(COCOA) && USE(CA)
</ins><span class="cx"> m_layerForHorizontalScrollbar->setAcceleratesDrawing(acceleratedDrawingEnabled());
</span><span class="cx"> #endif
</span><span class="cx"> m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get());
</span><span class="lines">@@ -3028,7 +3028,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> m_layerForVerticalScrollbar->setName("vertical scrollbar container");
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) && USE(CA)
</del><ins>+#if PLATFORM(COCOA) && USE(CA)
</ins><span class="cx"> m_layerForVerticalScrollbar->setAcceleratesDrawing(acceleratedDrawingEnabled());
</span><span class="cx"> #endif
</span><span class="cx"> m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get());
</span><span class="lines">@@ -3051,7 +3051,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> m_layerForScrollCorner->setName("scroll corner");
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) && USE(CA)
</del><ins>+#if PLATFORM(COCOA) && USE(CA)
</ins><span class="cx"> m_layerForScrollCorner->setAcceleratesDrawing(acceleratedDrawingEnabled());
</span><span class="cx"> #endif
</span><span class="cx"> m_overflowControlsHostLayer->addChild(m_layerForScrollCorner.get());
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -1,3 +1,113 @@
</span><ins>+2014-02-16 Dan Bernstein <mitz@apple.com>
+
+ Stop using PLATFORM(MAC) in Source except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128885
+
+ Reviewed by Anders Carlsson.
+
+ * Configurations/WebKit2.xcconfig: Removed PageBannerMac.mm and WKBundlePageBannerMac.mm
+ from EXCLUDED_SOURCE_FILE_NAMES_iphoneos, now that these files are guarded with
+ !PLATFORM(IOS).
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: Changed PLATFORM(MAC) to
+ PLATFORM(COCOA).
+ (WKBundleFrameCopyWebArchiveFilteringSubframes):
+ * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm: Guarded with !PLATFORM(IOS).
+ * WebProcess/InjectedBundle/InjectedBundle.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
+ * WebProcess/InjectedBundle/InjectedBundle.h: Changed PLATFORM(MAC) to USE(FOUNDATION)
+ around use of NSBundle.
+ * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h: Changed PLATFORM(MAC) to
+ PLATFORM(COCOA).
+ (WebKit::InjectedBundleUserMessageEncoder::encode):
+ (WebKit::InjectedBundleUserMessageDecoder::decode):
+ * WebProcess/Network/WebResourceLoader.cpp: Ditto.
+ (WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: Ditto.
+ (WebKit::NPN_GetValue):
+ (WebKit::NPN_SetValue):
+ (WebKit::initializeBrowserFuncs):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp: Ditto.
+ (WebKit::NetscapePlugin::NetscapePlugin):
+ (WebKit::NetscapePlugin::supportsSnapshotting):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h: Ditto.
+ * WebProcess/Plugins/Plugin.cpp: Ditto.
+ (WebKit::Plugin::Parameters::encode):
+ (WebKit::Plugin::Parameters::decode):
+ * WebProcess/Plugins/Plugin.h: Ditto.
+ * WebProcess/Plugins/PluginController.h: Ditto.
+ * WebProcess/Plugins/PluginProcessConnectionManager.cpp: Changed PLATFORM(MAC) to
+ USE(DARWIN) around use of Mach-based IPC.
+ (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
+ * WebProcess/Plugins/PluginProxy.cpp: Chanegd PLATFORM(MAC) to PLATFORM(COCOA).
+ * WebProcess/Plugins/PluginProxy.h: Ditto.
+ * WebProcess/Plugins/PluginProxy.messages.in: Ditto.
+ * WebProcess/Plugins/PluginView.cpp: Ditto.
+ (WebKit::PluginView::destroyPluginAndReset):
+ (WebKit::PluginView::viewStateDidChange):
+ (WebKit::PluginView::didInitializePlugin):
+ (WebKit::PluginView::invalidateRect):
+ (WebKit::PluginView::pluginSnapshotTimerFired):
+ * WebProcess/Plugins/PluginView.h: Ditto.
+ * WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp: Ditto.
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp: Ditto.
+ (WebKit::WebChromeClient::windowRect):
+ * WebProcess/WebCoreSupport/WebChromeClient.h: Ditto.
+ * WebProcess/WebCoreSupport/WebContextMenuClient.cpp: Ditto.
+ * WebProcess/WebCoreSupport/WebContextMenuClient.h: Ditto.
+ * WebProcess/WebCoreSupport/WebDragClient.cpp: Ditto.
+ * WebProcess/WebCoreSupport/WebDragClient.h: Ditto.
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp: Ditto.
+ (WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection):
+ * WebProcess/WebCoreSupport/WebEditorClient.h: Ditto.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: Ditto.
+ (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+ (WebKit::WebFrameLoaderClient::createPlugin):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h: Ditto.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Ditto.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h: Ditto.
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm: Removed PLATFORM(MAC).
+ (InitWebCoreSystemInterface):
+ * WebProcess/WebPage/DrawingArea.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::DrawingArea::create):
+ * WebProcess/WebPage/DrawingArea.h: Ditto.
+ * WebProcess/WebPage/DrawingArea.messages.in: Ditto.
+ * WebProcess/WebPage/EventDispatcher.cpp: Ditto.
+ (WebKit::EventDispatcher::wheelEvent):
+ * WebProcess/WebPage/LayerTreeHost.h: Ditto.
+ * WebProcess/WebPage/PageBanner.cpp: Added !PLATFORM(IOS)
+ * WebProcess/WebPage/PageBanner.h: Ditto.
+ * WebProcess/WebPage/WebFrame.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * WebProcess/WebPage/WebFrame.h: Ditto.
+ * WebProcess/WebPage/WebInspector.cpp: Ditto.
+ (WebKit::WebInspector::WebInspector):
+ * WebProcess/WebPage/WebInspector.h: Ditto.
+ * WebProcess/WebPage/WebPage.cpp: Ditto.
+ (WebKit::WebPage::WebPage):
+ (WebKit::isContextClick):
+ (WebKit::WebPage::getSelectionAsWebArchiveData):
+ (WebKit::WebPage::getWebArchiveOfFrame):
+ (WebKit::WebPage::updatePreferences):
+ (WebKit::WebPage::sendSetWindowFrame):
+ (WebKit::WebPage::beginPrinting):
+ (WebKit::WebPage::computePagesForPrinting):
+ * WebProcess/WebPage/WebPage.h: Ditto.
+ * WebProcess/WebPage/WebPage.messages.in: Ditto.
+ * WebProcess/WebPage/mac/PageBannerMac.mm: Guarded with !PLATFORM(IOS).
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess): Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::WebProcess::initializeWebProcess): Ditto.
+ (WebKit::WebProcess::ensureNetworkProcessConnection): Changed PLATFORM(MAC) to OS(DARWIN).
+ (WebKit::WebProcess::ensurePrivateBrowsingSession): Changed PLATFORM(MAC) to
+ PLATFORM(COCOA).
+ (WebKit::WebProcess::destroyPrivateBrowsingSession): Ditto.
+ (WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Changed PLATFORM(MAC) to
+ OS(DARWIN).
+ (WebKit::WebProcess::nonVisibleProcessCleanupTimerFired): Changed PLATFORM(MAC) to
+ PLATFORM(COCOA)
+ * WebProcess/WebProcess.h: Ditto.
+ * WebProcess/WebProcess.messages.in: Removed PLATFORM(MAC) guard around
+ SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.
+
</ins><span class="cx"> 2014-02-15 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] All WebKit clients should encrypt WebCrypto keys automatically
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKit2xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = BuiltInPDFView.mm DownloadMac.mm FindIndicatorWindow.mm NetworkProcessMac.mm PDFViewController.mm PageBannerMac.mm PageClientImpl.mm PasteboardTypes.mm PluginInfoStoreMac.mm PrintInfoMac.mm SecItemShimMethods.mm TextCheckerMac.mm WKAccessibilityWebPageObject.mm WKFullKeyboardAccessWatcher.mm WKInspector.cpp WKPrintingView.mm UIProcess/API/mac/WKView.mm WKBundlePageBannerMac.mm WebContextMenuProxyMac.mm WebEditorClientMac.mm WebInspectorProxyMac.mm WebPageMac.mm WebPageProxyMac.mm WebPlatformTouchPoint.cpp WebProcessMac.mm WebProcessProxyMac.mm WebTouchEvent.cpp *.pdf com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = BuiltInPDFView.mm DownloadMac.mm FindIndicatorWindow.mm NetworkProcessMac.mm PDFViewController.mm PageClientImpl.mm PasteboardTypes.mm PluginInfoStoreMac.mm PrintInfoMac.mm SecItemShimMethods.mm TextCheckerMac.mm WKAccessibilityWebPageObject.mm WKFullKeyboardAccessWatcher.mm WKInspector.cpp WKPrintingView.mm UIProcess/API/mac/WKView.mm WebContextMenuProxyMac.mm WebEditorClientMac.mm WebInspectorProxyMac.mm WebPageMac.mm WebPageProxyMac.mm WebPlatformTouchPoint.cpp WebProcessMac.mm WebProcessProxyMac.mm WebTouchEvent.cpp *.pdf com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm WKContentView.mm WKScrollView.mm UIWKRemoteView.mm WKGeolocationProviderIOSObjCSecurityOrigin.mm WKInteractionView.mm WebIOSEventFactory.mm WKActionSheet.mm WKActionSheetAssistant.mm;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKBundleFrameCopyWebArchiveFilteringSubframes(WKBundleFrameRef frameRef, WKBundleFrameFrameFilterCallback frameFilterCallback, void* context)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFDataRef> data = toImpl(frameRef)->webArchiveData(frameFilterCallback, context);
</span><span class="cx"> if (data)
</span><span class="cx"> return WKDataCreate(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKBundlePageBannerMac.h"
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #include "APIClient.h"
</span><span class="cx"> #include "PageBanner.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="lines">@@ -108,3 +110,5 @@
</span><span class="cx"> {
</span><span class="cx"> return toImpl(pageBanner)->layer();
</span><span class="cx"> }
</span><ins>+
+#endif // !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> void InjectedBundle::setPrivateBrowsingEnabled(WebPageGroupProxy* pageGroup, bool enabled)
</span><span class="cx"> {
</span><span class="cx"> // FIXME (NetworkProcess): This test-only function doesn't work with NetworkProcess, <https://bugs.webkit.org/show_bug.cgi?id=115274>.
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</ins><span class="cx"> if (enabled)
</span><span class="cx"> WebFrameNetworkingContext::ensurePrivateBrowsingSession(SessionTracker::legacyPrivateSessionID);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include <Eina.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> OBJC_CLASS NSBundle;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> typedef NSBundle *PlatformBundle;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef ::GModule* PlatformBundle;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "WebPageGroupProxy.h"
</span><span class="cx"> #include "WebProcess.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">@@ -80,7 +80,7 @@
</span><span class="cx"> encoder << pageGroup->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"> ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
</span><span class="cx"> encoder << InjectedBundleObjCObjectGraphEncoder(objectGraph, WebProcess::shared());
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> coder.m_root = WebProcess::shared().webPageGroup(pageGroupData);
</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"> InjectedBundleObjCObjectGraphDecoder objectGraphDecoder(objectGraph, WebProcess::shared());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceResponse responseCopy(response);
</span><span class="cx"> // FIXME: This should use CertificateInfo to avoid the platform ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=124724.
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> responseCopy.setCertificateChain(certificateInfo.certificateChain());
</span><span class="cx"> #elif USE(SOUP)
</span><span class="cx"> responseCopy.setSoupMessageCertificate(certificateInfo.certificate());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> return NPERR_NO_ERROR;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Whether the browser supports compositing of Core Animation plug-ins.
</span><span class="cx"> static const unsigned WKNVSupportsCompositingCoreAnimationPluginsBool = 74656;
</span><span class="cx">
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> *(NPBool*)value = plugin->isPrivateBrowsingEnabled();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case NPNVsupportsCoreGraphicsBool:
</span><span class="cx"> // Always claim to support the Core Graphics drawing model.
</span><span class="cx"> *(NPBool*)value = true;
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> static NPError NPN_SetValue(NPP npp, NPPVariable variable, void *value)
</span><span class="cx"> {
</span><span class="cx"> switch (variable) {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case NPPVpluginDrawingModel: {
</span><span class="cx"> RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
</span><span class="cx">
</span><span class="lines">@@ -940,7 +940,7 @@
</span><span class="cx"> plugin->unscheduleTimer(timerID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static NPError NPN_PopUpContextMenu(NPP npp, NPMenu* menu)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
</span><span class="lines">@@ -1022,7 +1022,7 @@
</span><span class="cx"> netscapeFuncs.getauthenticationinfo = NPN_GetAuthenticationInfo;
</span><span class="cx"> netscapeFuncs.scheduletimer = NPN_ScheduleTimer;
</span><span class="cx"> netscapeFuncs.unscheduletimer = NPN_UnscheduleTimer;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> netscapeFuncs.popupcontextmenu = NPN_PopUpContextMenu;
</span><span class="cx"> netscapeFuncs.convertpoint = NPN_ConvertPoint;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> , m_pluginModule(pluginModule)
</span><span class="cx"> , m_npWindow()
</span><span class="cx"> , m_isStarted(false)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_isWindowed(false)
</span><span class="cx"> #else
</span><span class="cx"> , m_isWindowed(true)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> , m_shouldUseManualLoader(false)
</span><span class="cx"> , m_hasCalledSetWindow(false)
</span><span class="cx"> , m_nextTimerID(0)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_drawingModel(static_cast<NPDrawingModel>(-1))
</span><span class="cx"> , m_eventModel(static_cast<NPEventModel>(-1))
</span><span class="cx"> , m_pluginReturnsNonretainedLayer(!m_pluginModule->pluginQuirks().contains(PluginQuirks::ReturnsRetainedCoreAnimationLayer))
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx">
</span><span class="cx"> bool NetscapePlugin::supportsSnapshotting() const
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return m_pluginModule && m_pluginModule->pluginQuirks().contains(PluginQuirks::SupportsSnapshotting);
</span><span class="cx"> #endif
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> // In-process NetscapePlugins don't support asynchronous initialization.
</span><span class="cx"> virtual bool isBeingAsynchronouslyInitialized() const { return false; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> NPError setDrawingModel(NPDrawingModel);
</span><span class="cx"> NPError setEventModel(NPEventModel);
</span><span class="cx"> NPBool convertPoint(double sourceX, double sourceY, NPCoordinateSpace sourceSpace, double& destX, double& destY, NPCoordinateSpace destSpace);
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> virtual void destroy();
</span><span class="cx"> virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
</span><span class="cx"> virtual PassRefPtr<ShareableBitmap> snapshot();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual PlatformLayer* pluginLayer();
</span><span class="cx"> #endif
</span><span class="cx"> virtual bool isTransparent();
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> virtual unsigned countFindMatches(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
</span><span class="cx"> virtual bool findString(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void windowFocusChanged(bool);
</span><span class="cx"> virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
</span><span class="cx"> virtual void windowVisibilityChanged(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Plugin.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Plugin.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Plugin.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> encoder << mimeType;
</span><span class="cx"> encoder << isFullFramePlugin;
</span><span class="cx"> encoder << shouldUseManualLoader;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> encoder.encodeEnum(layerHostingMode);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.shouldUseManualLoader))
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!decoder.decodeEnum(parameters.layerHostingMode))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "LayerHostingContext.h"
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS NSObject;
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> String mimeType;
</span><span class="cx"> bool isFullFramePlugin;
</span><span class="cx"> bool shouldUseManualLoader;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> LayerHostingMode layerHostingMode;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> // Tells the plug-in to draw itself into a bitmap, and return that.
</span><span class="cx"> virtual PassRefPtr<ShareableBitmap> snapshot() = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // If a plug-in is using the Core Animation drawing model, this returns its plug-in layer.
</span><span class="cx"> virtual PlatformLayer* pluginLayer() = 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> // Get the NPObject that corresponds to the plug-in's scriptable object. Returns a retained object.
</span><span class="cx"> virtual NPObject* pluginScriptableNPObject() = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Tells the plug-in about window focus changes.
</span><span class="cx"> virtual void windowFocusChanged(bool) = 0;
</span><span class="cx">
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> virtual WebCore::Scrollbar* horizontalScrollbar() = 0;
</span><span class="cx"> virtual WebCore::Scrollbar* verticalScrollbar() = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual RetainPtr<PDFDocument> pdfDocumentForPrinting() const { return 0; }
</span><span class="cx"> virtual NSObject *accessibilityObject() const { return 0; }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</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"> #endif
</span><span class="cx">
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> // Tells the controller that we're about to dispatch an event to the plug-in.
</span><span class="cx"> virtual void willSendEventToPlugin() = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Tells the controller that the plug-in focus or window focus did change.
</span><span class="cx"> virtual void pluginFocusOrWindowFocusChanged(bool) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.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">@@ -74,7 +74,7 @@
</span><span class="cx"> Messages::WebProcessProxy::GetPluginProcessConnection::Reply(encodedConnectionIdentifier, supportsAsynchronousInitialization), 0))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
</span><span class="cx"> if (IPC::Connection::identifierIsNull(connectionIdentifier))
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx"> return m_connection->npRemoteObjectMap()->createNPObjectProxy(pluginScriptableNPObjectID, this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void PluginProxy::windowFocusChanged(bool hasFocus)
</span><span class="cx"> {
</span><span class="cx"> m_connection->connection()->send(Messages::PluginControllerProxy::WindowFocusChanged(hasFocus), m_pluginInstanceID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <WebCore/SecurityOrigin.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 CALayer;
</span><span class="cx"> #endif
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
</span><span class="cx"> virtual bool supportsSnapshotting() const;
</span><span class="cx"> virtual PassRefPtr<ShareableBitmap> snapshot();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual PlatformLayer* pluginLayer();
</span><span class="cx"> #endif
</span><span class="cx"> virtual bool isTransparent();
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> virtual bool handlesPageScaleFactor();
</span><span class="cx">
</span><span class="cx"> virtual NPObject* pluginScriptableNPObject();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void windowFocusChanged(bool);
</span><span class="cx"> virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
</span><span class="cx"> virtual void windowVisibilityChanged(bool);
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> void cancelStreamLoad(uint64_t streamID);
</span><span class="cx"> void cancelManualStreamLoad();
</span><span class="cx"> void setStatusbarText(const String& statusbarText);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void pluginFocusOrWindowFocusChanged(bool);
</span><span class="cx"> void setComplexTextInputState(uint64_t);
</span><span class="cx"> void setLayerHostingContextID(uint32_t);
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> OwnPtr<PluginCreationParameters> m_pendingPluginCreationParameters;
</span><span class="cx"> bool m_waitingOnAsynchronousInitialization;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CALayer> m_pluginLayer;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> # Set the status bar text.
</span><span class="cx"> SetStatusbarText(String statusbarText)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> # Called when the plug-in's focus or its containing window focus changes.
</span><span class="cx"> PluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> m_pendingURLRequests.clear();
</span><span class="cx"> m_pendingURLRequestsTimer.stop();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (m_webPage)
</span><span class="cx"> pluginFocusOrWindowFocusChanged(false);
</span><span class="cx"> #endif
</span><span class="lines">@@ -498,12 +498,12 @@
</span><span class="cx">
</span><span class="cx"> void PluginView::viewStateDidChange(ViewState::Flags changed)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> platformViewStateDidChange(changed);
</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 PluginView::platformViewStateDidChange(ViewState::Flags changed)
</span><span class="cx"> {
</span><span class="cx"> if (!m_plugin || !m_isInitialized)
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_isInitialized = true;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> windowAndViewFramesChanged(m_webPage->windowFrameInScreenCoordinates(), m_webPage->viewFrameInWindowCoordinates());
</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"> redeliverManualStream();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (m_pluginElement->displayState() < HTMLPlugInElement::Restarting) {
</span><span class="cx"> if (m_plugin->pluginLayer() && frame()) {
</span><span class="cx"> frame()->view()->enterCompositingMode();
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> PlatformLayer* PluginView::platformLayer() const
</span><span class="cx"> {
</span><span class="cx"> // The plug-in can be null here if it failed to initialize.
</span><span class="lines">@@ -1263,7 +1263,7 @@
</span><span class="cx"> if (!parent() || !m_plugin || !m_isInitialized)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (m_plugin->pluginLayer())
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="lines">@@ -1458,7 +1458,7 @@
</span><span class="cx"> m_webPage->send(Messages::WebPageProxy::StopResponsivenessTimer());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void PluginView::pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus)
</span><span class="cx"> {
</span><span class="cx"> if (m_webPage)
</span><span class="lines">@@ -1610,7 +1610,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"> static bool isAlmostSolidColor(BitmapImage* bitmap)
</span><span class="cx"> {
</span><span class="cx"> CGImageRef image = bitmap->getCGImageRef();
</span><span class="lines">@@ -1685,7 +1685,7 @@
</span><span class="cx"> snapshotImage = snapshot->createImage();
</span><span class="cx"> m_pluginElement->updateSnapshot(snapshotImage.get());
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> unsigned maximumSnapshotRetries = frame() ? frame()->settings().maximumPlugInSnapshotAttempts() : 0;
</span><span class="cx"> if (snapshotImage && isAlmostSolidColor(toBitmapImage(snapshotImage.get())) && m_countSnapshotRetries < maximumSnapshotRetries) {
</span><span class="cx"> ++m_countSnapshotRetries;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void viewStateDidChange(WebCore::ViewState::Flags changed);
</span><span class="cx"> void setLayerHostingMode(LayerHostingMode);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void platformViewStateDidChange(WebCore::ViewState::Flags changed);
</span><span class="cx"> void setDeviceScaleFactor(float);
</span><span class="cx"> void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates);
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> bool shouldCreateTransientPaintingSnapshot() const;
</span><span class="cx">
</span><span class="cx"> // WebCore::PluginViewBase
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual PlatformLayer* platformLayer() const;
</span><span class="cx"> #endif
</span><span class="cx"> virtual JSC::JSObject* scriptObject(JSC::JSGlobalObject*);
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> virtual bool isAcceleratedCompositingEnabled();
</span><span class="cx"> virtual void pluginProcessCrashed();
</span><span class="cx"> virtual void willSendEventToPlugin();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus);
</span><span class="cx"> virtual void setComplexTextInputState(PluginComplexTextInputState);
</span><span class="cx"> virtual mach_port_t compositingRenderServerPort();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessResourceCachecfWebResourceCacheManagerCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <wtf/text/CString.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 "WebKitSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect WebChromeClient::windowRect()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (m_page->hasCachedWindowFrame())
</span><span class="cx"> return m_page->windowFrameInUnflippedScreenCoordinates();
</span><span class="cx"> #endif
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> m_page->send(Messages::WebPageProxy::SetFocus(false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void WebChromeClient::makeFirstResponder()
</span><span class="cx"> {
</span><span class="cx"> m_page->send(Messages::WebPageProxy::MakeFirstResponder());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> virtual void exitFullScreenForElement(WebCore::Element*) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void makeFirstResponder() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebContextMenuClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void WebContextMenuClient::searchWithGoogle(const Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> String searchString = frame->editor().selectedText();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> virtual void speak(const String&) override;
</span><span class="cx"> virtual void stopSpeaking() override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void searchWithSpotlight() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDragClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return DragSourceActionAny;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !PLATFORM(GTK)
</del><ins>+#if !PLATFORM(COCOA) && !PLATFORM(GTK)
</ins><span class="cx"> void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDragClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard&, WebCore::Frame&, bool linkDrag = false) override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> m_page->sendSync(Messages::WebPageProxy::ExecuteUndoRedo(static_cast<uint32_t>(WebPageProxy::Redo)), Messages::WebPageProxy::ExecuteUndoRedo::Reply(result));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK) && !PLATFORM(MAC) && !PLATFORM(EFL)
</del><ins>+#if !PLATFORM(GTK) && !PLATFORM(COCOA) && !PLATFORM(EFL)
</ins><span class="cx"> void WebEditorClient::handleKeyboardEvent(KeyboardEvent* event)
</span><span class="cx"> {
</span><span class="cx"> if (m_page->handleEditingKeyboardEvent(event))
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> bool WebEditorClient::shouldEraseMarkersAfterChangeSelection(WebCore::TextCheckingType type) const
</span><span class="cx"> {
</span><span class="cx"> // This prevents erasing spelling markers on OS X Lion or later to match AppKit on these Mac OS X versions.
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> return type != TextCheckingTypeSpelling;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(type);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> virtual void textWillBeDeletedInTextField(WebCore::Element*) override;
</span><span class="cx"> virtual void textDidChangeInTextArea(WebCore::Element*) override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual NSString *userVisibleString(NSURL *) override;
</span><span class="cx"> virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource>>&) override;
</span><span class="cx"> virtual void setInsertionPasteboard(const String& pasteboardName) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -1202,7 +1202,7 @@
</span><span class="cx">
</span><span class="cx"> m_frame->coreFrame()->view()->setProhibitsScrolling(shouldDisableScrolling);
</span><span class="cx"> m_frame->coreFrame()->view()->setVisualUpdatesAllowedByClient(!webPage->shouldExtendIncrementalRenderingSuppression());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_frame->coreFrame()->view()->setExposedRect(webPage->drawingArea()->exposedRect());
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -1288,7 +1288,7 @@
</span><span class="cx"> parameters.mimeType = mimeType;
</span><span class="cx"> parameters.isFullFramePlugin = loadManually;
</span><span class="cx"> parameters.shouldUseManualLoader = parameters.isFullFramePlugin && !m_frameCameFromPageCache;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> parameters.layerHostingMode = m_frame->page()->layerHostingMode();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1511,7 +1511,7 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> RemoteAXObjectRef WebFrameLoaderClient::accessibilityRemoteObject()
</span><span class="cx"> {
</span><span class="lines">@@ -1531,7 +1531,7 @@
</span><span class="cx"> return webPage->injectedBundleResourceLoadClient().shouldCacheResponse(webPage, m_frame, identifier) ? response : nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> bool WebFrameLoaderClient::shouldAlwaysUsePluginDocument(const String& /*mimeType*/) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void registerForIconNotification(bool listen = true) override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual RemoteAXObjectRef accessibilityRemoteObject() override;
</span><span class="cx">
</span><span class="cx"> virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> WebProcess::shared().addVisitedLink(linkHash);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // PasteboardStrategy
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::getTypes(Vector<String>& types, const String& pasteboardName)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> virtual WebCore::URL readURLFromPasteboard(int index, const String& pasteboardType) override;
</span><span class="cx"> virtual long changeCount() override;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void getTypes(Vector<String>& types, const String& pasteboardName) override;
</span><span class="cx"> virtual PassRefPtr<WebCore::SharedBuffer> bufferForType(const String& pasteboardType, const String& pasteboardName) override;
</span><span class="cx"> virtual void getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -164,10 +164,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> INIT(SpeechSynthesisGetVoiceIdentifiers);
</span><span class="cx"> INIT(SpeechSynthesisGetDefaultVoiceIdentifierForLocale);
</span><del>-#endif
</del><span class="cx"> INIT(GetAXTextMarkerTypeID);
</span><span class="cx"> INIT(GetAXTextMarkerRangeTypeID);
</span><span class="cx"> INIT(CreateAXTextMarker);
</span><span class="lines">@@ -211,7 +209,7 @@
</span><span class="cx"> INIT(GetVendorNameForNavigator);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</del><ins>+#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</ins><span class="cx"> INIT(NSElasticDeltaForTimeDelta);
</span><span class="cx"> INIT(NSElasticDeltaForReboundDelta);
</span><span class="cx"> INIT(NSReboundDeltaForElasticDelta);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx">
</span><span class="cx"> // Subclasses
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "RemoteLayerTreeDrawingArea.h"
</span><span class="cx"> #include "TiledCoreAnimationDrawingArea.h"
</span><span class="cx"> #else
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> std::unique_ptr<DrawingArea> DrawingArea::create(WebPage* webPage, const WebPageCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> switch (parameters.drawingAreaType) {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> case DrawingAreaTypeTiledCoreAnimation:
</span><span class="cx"> return std::make_unique<TiledCoreAnimationDrawingArea>(webPage, parameters);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> virtual void updatePreferences(const WebPreferencesStore&) { }
</span><span class="cx"> virtual void mainFrameContentSizeChanged(const WebCore::IntSize&) { }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void setExposedRect(const WebCore::FloatRect&) = 0;
</span><span class="cx"> virtual WebCore::FloatRect exposedRect() const = 0;
</span><span class="cx"> virtual void setCustomFixedPositionRect(const WebCore::FloatRect&) = 0;
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> const WebCore::IntSize& /*scrollOffset*/) { }
</span><span class="cx"> virtual void didUpdate() { }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span><span class="cx"> virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition) { }
</span><span class="cx"> virtual void setDeviceScaleFactor(float) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> UpdateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, WebCore::IntSize size, WebCore::IntSize scrollOffset)
</span><span class="cx"> DidUpdate()
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span><span class="cx"> UpdateGeometry(WebCore::IntSize viewSize, WebCore::IntSize layerPosition)
</span><span class="cx"> SetDeviceScaleFactor(float deviceScaleFactor)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> {
</span><span class="cx"> PlatformWheelEvent platformWheelEvent = platform(wheelEvent);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> switch (wheelEvent.phase()) {
</span><span class="cx"> case PlatformWheelEventPhaseBegan:
</span><span class="cx"> m_recentWheelEventDeltaTracker->beginTrackingDeltas();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> virtual void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection*, IPC::MessageDecoder&) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void setLayerHostingMode(LayerHostingMode) { }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagePageBannercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> m_client->pageBannerDestroyed(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(MAC) || PLATFORM(IOS)
</ins><span class="cx"> void PageBanner::addToPage(Type, WebPage*)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagePageBannerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> virtual bool mouseEvent(PageBanner*, WebEvent::Type, WebMouseEvent::Button, const WebCore::IntPoint&) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> static PassRefPtr<PageBanner> create(CALayer *, int height, Client*);
</span><span class="cx"> CALayer *layer();
</span><span class="cx"> #endif
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> void didAddParentLayer(WebCore::GraphicsLayer*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> explicit PageBanner(CALayer *, int height, Client*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> bool m_mouseDownInBanner;
</span><span class="cx"> bool m_isHidden;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> RetainPtr<CALayer> m_layer;
</span><span class="cx"> int m_height;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> #include <WebCore/TextResourceDecoder.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx"> m_coreFrame->editor().setBaseWritingDirection(RightToLeftWritingDirection);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFDataRef> WebFrame::webArchiveData(FrameFilterFunction callback, void* context)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<LegacyWebArchive> archive = LegacyWebArchive::create(coreFrame()->document(), [this, callback, context](Frame& frame) -> bool {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> void setLoadListener(LoadListener* loadListener) { m_loadListener = loadListener; }
</span><span class="cx"> LoadListener* loadListener() const { return m_loadListener; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> typedef bool (*FrameFilterFunction)(WKBundleFrameRef, WKBundleFrameRef subframe, void* context);
</span><span class="cx"> RetainPtr<CFDataRef> webArchiveData(FrameFilterFunction, void* context);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> , m_inspectorPage(0)
</span><span class="cx"> , m_frontendClient(0)
</span><span class="cx"> , m_frontendChannel(frontendChannel)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_hasLocalizedStringsURL(false)
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> WebPage* m_inspectorPage;
</span><span class="cx"> WebInspectorFrontendClient* m_frontendClient;
</span><span class="cx"> WebCore::InspectorFrontendChannel* m_frontendChannel;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> mutable String m_localizedStringsURL;
</span><span class="cx"> mutable bool m_hasLocalizedStringsURL;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -152,10 +152,6 @@
</span><span class="cx"> #include <WebCore/MHTMLArchive.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-#include "MachPort.h"
-#endif
-
</del><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> #include "WebBatteryClient.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -172,7 +168,7 @@
</span><span class="cx"> #include "WebDeviceProximityClient.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 "PDFPlugin.h"
</span><span class="cx"> #include <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -251,7 +247,7 @@
</span><span class="cx"> , m_determinePrimarySnapshottedPlugInTimer(RunLoop::main(), this, &WebPage::determinePrimarySnapshottedPlugInTimerFired)
</span><span class="cx"> #endif
</span><span class="cx"> , m_layerHostingMode(parameters.layerHostingMode)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_pdfPluginEnabled(false)
</span><span class="cx"> , m_hasCachedWindowFrame(false)
</span><span class="cx"> , m_keyboardEventBeingInterpreted(0)
</span><span class="lines">@@ -1607,7 +1603,7 @@
</span><span class="cx"> if (event.button() == WebCore::RightButton)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // FIXME: this really should be about OSX-style UI, not about the Mac port
</span><span class="cx"> if (event.button() == WebCore::LeftButton && event.ctrlKey())
</span><span class="cx"> return true;
</span><span class="lines">@@ -2259,7 +2255,7 @@
</span><span class="cx"> {
</span><span class="cx"> IPC::DataReference dataReference;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RefPtr<LegacyWebArchive> archive;
</span><span class="cx"> RetainPtr<CFDataRef> data;
</span><span class="cx">
</span><span class="lines">@@ -2351,7 +2347,7 @@
</span><span class="cx"> {
</span><span class="cx"> IPC::DataReference dataReference;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFDataRef> data;
</span><span class="cx"> if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
</span><span class="cx"> if ((data = frame->webArchiveData(0, 0)))
</span><span class="lines">@@ -2395,7 +2391,7 @@
</span><span class="cx">
</span><span class="cx"> m_scrollingPerformanceLoggingEnabled = store.getBoolValueForKey(WebPreferencesKey::scrollingPerformanceLoggingEnabledKey());
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_pdfPluginEnabled = store.getBoolValueForKey(WebPreferencesKey::pdfPluginEnabledKey());
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2451,7 +2447,7 @@
</span><span class="cx"> settings.setDefaultFontSize(store.getDoubleValueForKey(WebPreferencesKey::defaultFontSizeKey()));
</span><span class="cx"> settings.setDefaultFixedFontSize(store.getDoubleValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
</span><span class="cx"> settings.setScreenFontSubstitutionEnabled(store.getBoolValueForKey(WebPreferencesKey::screenFontSubstitutionEnabledKey())
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> || WebProcess::shared().shouldForceScreenFontSubstitution()
</span><span class="cx"> #endif
</span><span class="cx"> );
</span><span class="lines">@@ -2500,7 +2496,7 @@
</span><span class="cx"> settings.setAVFoundationEnabled(store.getBoolValueForKey(WebPreferencesKey::isAVFoundationEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> settings.setQTKitEnabled(store.getBoolValueForKey(WebPreferencesKey::isQTKitEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2633,7 +2629,7 @@
</span><span class="cx"> return m_notificationPermissionRequestManager.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK) && !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(GTK) && !PLATFORM(COCOA)
</ins><span class="cx"> bool WebPage::handleEditingKeyboardEvent(KeyboardEvent* evt)
</span><span class="cx"> {
</span><span class="cx"> Node* node = evt->target()->toNode();
</span><span class="lines">@@ -3095,13 +3091,13 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::sendSetWindowFrame(const FloatRect& windowFrame)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_hasCachedWindowFrame = false;
</span><span class="cx"> #endif
</span><span class="cx"> send(Messages::WebPageProxy::SetWindowFrame(windowFrame));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void WebPage::windowAndViewFramesChanged(const FloatRect& windowFrameInScreenCoordinates, const FloatRect& windowFrameInUnflippedScreenCoordinates, const FloatRect& viewFrameInWindowCoordinates, const FloatPoint& accessibilityViewCoordinates)
</span><span class="cx"> {
</span><span class="cx"> m_windowFrameInScreenCoordinates = windowFrameInScreenCoordinates;
</span><span class="lines">@@ -3326,7 +3322,7 @@
</span><span class="cx"> WebBackForwardListProxy::removeItem(itemID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> bool WebPage::isSpeaking()
</span><span class="cx"> {
</span><span class="lines">@@ -3362,7 +3358,7 @@
</span><span class="cx">
</span><span class="cx"> return pluginView->pdfDocumentForPrinting();
</span><span class="cx"> }
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> void WebPage::beginPrinting(uint64_t frameID, const PrintInfo& printInfo)
</span><span class="cx"> {
</span><span class="lines">@@ -3377,7 +3373,7 @@
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> if (pdfDocumentForPrintingFrame(coreFrame))
</span><span class="cx"> return;
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> if (!m_printContext)
</span><span class="cx"> m_printContext = adoptPtr(new PrintContext(coreFrame));
</span><span class="lines">@@ -3414,10 +3410,10 @@
</span><span class="cx"> resultPageRects = m_printContext->pageRects();
</span><span class="cx"> resultTotalScaleFactorForPrinting = m_printContext->computeAutomaticScaleFactor(FloatSize(printInfo.availablePaperWidth, printInfo.availablePaperHeight)) * printInfo.pageSetupScaleFactor;
</span><span class="cx"> }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> else
</span><span class="cx"> computePagesForPrintingPDFDocument(frameID, printInfo, resultPageRects);
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> // If we're asked to print, we should actually print at least a blank page.
</span><span class="cx"> if (resultPageRects.isEmpty())
</span><span class="lines">@@ -3426,7 +3422,7 @@
</span><span class="cx"> send(Messages::WebPageProxy::ComputedPagesCallback(resultPageRects, resultTotalScaleFactorForPrinting, callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void WebPage::drawRectToImage(uint64_t frameID, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> WebFrame* frame = WebProcess::shared().webFrame(frameID);
</span><span class="lines">@@ -3543,7 +3539,7 @@
</span><span class="cx"> send(Messages::WebPageProxy::SavePDFToFileInDownloadsFolder(suggestedFilename, originatingURLString, IPC::DataReference(data, size)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void WebPage::savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID)
</span><span class="cx"> {
</span><span class="cx"> send(Messages::WebPageProxy::SavePDFToTemporaryFolderAndOpenWithNativeApplication(suggestedFilename, originatingURLString, IPC::DataReference(data, size), pdfUUID));
</span><span class="lines">@@ -3603,7 +3599,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"> void WebPage::handleAlternativeTextUIResult(const String& result)
</span><span class="cx"> {
</span><span class="cx"> Frame& frame = m_page->focusController().focusedOrMainFrame();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> #include "InjectedBundlePageContextMenuClient.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 "DictionaryPopupInfo.h"
</span><span class="cx"> #include "LayerHostingContext.h"
</span><span class="cx"> #include "ViewGestureGeometryCollector.h"
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> void layoutIfNeeded();
</span><span class="cx">
</span><span class="cx"> // -- Called from WebCore clients.
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool handleEditingKeyboardEvent(WebCore::KeyboardEvent*, bool saveCommands);
</span><span class="cx"> #elif !PLATFORM(GTK)
</span><span class="cx"> bool handleEditingKeyboardEvent(WebCore::KeyboardEvent*);
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> LayerHostingMode layerHostingMode() const { return m_layerHostingMode; }
</span><span class="cx"> void setLayerHostingMode(unsigned);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void updatePluginsActiveAndFocusedState();
</span><span class="cx"> const WebCore::FloatRect& windowFrameInScreenCoordinates() const { return m_windowFrameInScreenCoordinates; }
</span><span class="cx"> const WebCore::FloatRect& windowFrameInUnflippedScreenCoordinates() const { return m_windowFrameInUnflippedScreenCoordinates; }
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> void updateHeaderAndFooterLayersForDeviceScaleChange(float scaleFactor);
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> bool windowIsFocused() const;
</span><span class="cx"> bool windowAndWebPageAreFocused() const;
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx">
</span><span class="cx"> void didChangeSelection();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void registerUIProcessAccessibilityTokens(const IPC::DataReference& elemenToken, const IPC::DataReference& windowToken);
</span><span class="cx"> WKAccessibilityWebPageObject* accessibilityRemoteObject();
</span><span class="cx"> NSObject *accessibilityObjectForMainFramePlugin();
</span><span class="lines">@@ -561,7 +561,7 @@
</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="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void performDictionaryLookupForSelection(WebCore::Frame*, const WebCore::VisibleSelection&);
</span><span class="cx">
</span><span class="cx"> bool isSpeaking();
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> void beginPrinting(uint64_t frameID, const PrintInfo&);
</span><span class="cx"> void endPrinting();
</span><span class="cx"> void computePagesForPrinting(uint64_t frameID, const PrintInfo&, uint64_t callbackID);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void drawRectToImage(uint64_t frameID, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, uint64_t callbackID);
</span><span class="cx"> void drawPagesToPDF(uint64_t frameID, const PrintInfo&, uint32_t first, uint32_t count, uint64_t callbackID);
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx">
</span><span class="cx"> void unmarkAllMisspellings();
</span><span class="cx"> void unmarkAllBadGrammar();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void handleAlternativeTextUIResult(const String&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -671,14 +671,14 @@
</span><span class="cx"> bool scrollingPerformanceLoggingEnabled() const { return m_scrollingPerformanceLoggingEnabled; }
</span><span class="cx"> void setScrollingPerformanceLoggingEnabled(bool);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool shouldUsePDFPlugin() const;
</span><span class="cx"> bool pdfPluginEnabled() const { return m_pdfPluginEnabled; }
</span><span class="cx"> void setPDFPluginEnabled(bool enabled) { m_pdfPluginEnabled = enabled; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -731,12 +731,12 @@
</span><span class="cx"> static void convertSelectionRectsToRootView(WebCore::FrameView*, Vector<WebCore::SelectionRect>&);
</span><span class="cx"> PassRefPtr<WebCore::Range> rangeForWebSelectionAtPosition(const WebCore::IntPoint&, const WebCore::VisiblePosition&, WKSelectionFlags&);
</span><span class="cx"> #endif
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> static const char* interpretKeyEvent(const WebCore::KeyboardEvent*);
</span><span class="cx"> #endif
</span><span class="cx"> bool performDefaultBehaviorForKeyEvent(const WebKeyboardEvent&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool executeKeypressCommandsInternal(const Vector<WebCore::KeypressCommand>&, WebCore::KeyboardEvent*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -823,7 +823,7 @@
</span><span class="cx"> void suspendActiveDOMObjectsAndAnimations();
</span><span class="cx"> void resumeActiveDOMObjectsAndAnimations();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
</span><span class="cx"> void performDictionaryLookupForRange(WebCore::Frame*, WebCore::Range*, NSDictionary *options);
</span><span class="cx">
</span><span class="lines">@@ -948,7 +948,7 @@
</span><span class="cx"> // The layer hosting mode.
</span><span class="cx"> LayerHostingMode m_layerHostingMode;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool m_pdfPluginEnabled;
</span><span class="cx">
</span><span class="cx"> bool m_hasCachedWindowFrame;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> RunJavaScriptInMainFrame(String script, uint64_t callbackID)
</span><span class="cx"> ForceRepaint(uint64_t callbackID)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> # Dictionary support.
</span><span class="cx"> PerformDictionaryLookupAtLocation(WebCore::FloatPoint point)
</span><span class="cx"> #endif
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> LowercaseWord()
</span><span class="cx"> CapitalizeWord()
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> SetSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled)
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> BeginPrinting(uint64_t frameID, WebKit::PrintInfo printInfo)
</span><span class="cx"> EndPrinting()
</span><span class="cx"> ComputePagesForPrinting(uint64_t frameID, WebKit::PrintInfo printInfo, uint64_t callbackID)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> DrawRectToImage(uint64_t frameID, WebKit::PrintInfo printInfo, WebCore::IntRect rect, WebCore::IntSize imageSize, uint64_t callbackID)
</span><span class="cx"> DrawPagesToPDF(uint64_t frameID, WebKit::PrintInfo printInfo, uint32_t first, uint32_t count, uint64_t callbackID)
</span><span class="cx"> #endif
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> CancelComposition()
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> # Complex text input support for plug-ins.
</span><span class="cx"> SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput)
</span><span class="cx">
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> FindZoomableAreaForPoint(WebCore::IntPoint point, WebCore::IntSize area)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> HandleAlternativeTextUIResult(String result)
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPageBannerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PageBanner.h"
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include <WebCore/FrameView.h>
</span><span class="cx"> #include <WebCore/GraphicsLayer.h>
</span><span class="lines">@@ -166,4 +168,6 @@
</span><span class="cx"> return m_layer.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // !PLATFORM(IOS)
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "CookieStorageShim.h"
</span><span class="cx"> #endif
</span><span class="cx"> #include "NetworkProcessConnection.h"
</span><span class="lines">@@ -155,10 +155,8 @@
</span><span class="cx"> , m_shouldTrackVisitedLinks(true)
</span><span class="cx"> , m_hasSetCacheModel(false)
</span><span class="cx"> , m_cacheModel(CacheModelDocumentViewer)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_compositingRenderServerPort(MACH_PORT_NULL)
</span><del>-#endif
-#if PLATFORM(MAC)
</del><span class="cx"> , m_clearResourceCachesDispatchGroup(0)
</span><span class="cx"> #endif
</span><span class="cx"> , m_fullKeyboardAccessEnabled(false)
</span><span class="lines">@@ -340,7 +338,7 @@
</span><span class="cx"> if (parameters.shouldUseFontSmoothing)
</span><span class="cx"> setShouldUseFontSmoothing(true);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -351,7 +349,7 @@
</span><span class="cx"> m_usesNetworkProcess = parameters.usesNetworkProcess;
</span><span class="cx"> ensureNetworkProcessConnection();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (usesNetworkProcess())
</span><span class="cx"> CookieStorageShim::shared().initialize();
</span><span class="cx"> #endif
</span><span class="lines">@@ -380,7 +378,7 @@
</span><span class="cx"> Messages::WebProcessProxy::GetNetworkProcessConnection::Reply(encodedConnectionIdentifier), 0))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
</span><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><span class="cx"> IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
</span><span class="lines">@@ -469,14 +467,14 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::ensurePrivateBrowsingSession(uint64_t sessionID)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</ins><span class="cx"> WebFrameNetworkingContext::ensurePrivateBrowsingSession(sessionID);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::destroyPrivateBrowsingSession(uint64_t sessionID)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</ins><span class="cx"> SessionTracker::destroySession(sessionID);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -1058,7 +1056,7 @@
</span><span class="cx"> Messages::WebProcessProxy::GetDatabaseProcessConnection::Reply(encodedConnectionIdentifier), 0))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
</span><span class="cx"> if (IPC::Connection::identifierIsNull(connectionIdentifier))
</span><span class="cx"> return;
</span><span class="lines">@@ -1136,7 +1134,7 @@
</span><span class="cx"> pageCache()->setCapacity(savedPageCacheCapacity);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void WebProcess::initializeProcessName(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -1186,7 +1184,7 @@
</span><span class="cx"> if (!m_pagesInWindows.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> wkDestroyRenderingResources();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <dispatch/dispatch.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> InjectedBundle* injectedBundle() const { return m_injectedBundle.get(); }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> mach_port_t compositingRenderServerPort() const { return m_compositingRenderServerPort; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> WebPageGroupProxy* webPageGroup(uint64_t pageGroupID);
</span><span class="cx"> WebPageGroupProxy* webPageGroup(const WebPageGroupData&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> pid_t presenterApplicationPid() const { return m_presenterApplicationPid; }
</span><span class="cx"> bool shouldForceScreenFontSubstitution() const { return m_shouldForceScreenFontSubstitution; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> bool m_hasSetCacheModel;
</span><span class="cx"> CacheModel m_cacheModel;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> mach_port_t m_compositingRenderServerPort;
</span><span class="cx"> pid_t m_presenterApplicationPid;
</span><span class="cx"> dispatch_group_t m_clearResourceCachesDispatchGroup;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (164191 => 164192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-02-16 17:41:20 UTC (rev 164191)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-02-16 20:38:41 UTC (rev 164192)
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx">
</span><span class="cx"> ReleasePageCache()
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> SetProcessSuppressionEnabled(bool flag)
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> SetQOS(int latencyQOS, int throughputQOS)
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>