<!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>[163886] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163886">163886</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 10:00:45 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in WebKit2/Shared except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128582
Reviewed by Darin Adler.
* Shared/API/c/WKContextMenuItem.cpp: Removed workaround for Mac Safari 6 compatibility.
(WKContextMenuItemGetTag):
* Shared/API/c/WKDeprecatedFunctions.cpp: Added && !PLATFORM(IOS), because these functions
are not needed on iOS.
* Shared/API/c/WKSharedAPICast.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::toAPI):
(WebKit::toImpl):
* Shared/APIObject.h: Ditto.
* Shared/ChildProcess.cpp: Ditto.
* Shared/ChildProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA) around
setApplicationIsDaemon and setQOS. Changed it to USE(APPKIT) around stopNSAppRunLoop.
* Shared/CommandLine.h: Changed PLATFORM(MAC) to OS(UNIX) around parse().
* Shared/DictionaryPopupInfo.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::DictionaryPopupInfo::encode):
(WebKit::DictionaryPopupInfo::decode):
* Shared/DictionaryPopupInfo.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* Shared/Downloads/Download.h: Ditto.
* Shared/DrawingAreaInfo.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* Shared/FontInfo.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::FontInfo::encode):
(WebKit::FontInfo::decode):
* Shared/FontInfo.h: Ditto.
* Shared/LayerTreeContext.h: Ditto.
* Shared/NativeWebKeyboardEvent.h: Changed PLATFORM(MAC) to USE(APPKIT) around
forward-declaration of NSView.
* Shared/NativeWebMouseEvent.h: Ditto.
* Shared/NativeWebWheelEvent.h: Ditto.
* Shared/Network/CustomProtocols/Cocoa: Renamed from mac.
* Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm: Renamed from CustomProtocolManagerMac.mm.
* Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerMac.mm: Removed.
* Shared/Network/CustomProtocols/CustomProtocolManager.h: Changed PLATFORM(MAC) to
PLATFORM(COCOA).
* Shared/Network/CustomProtocols/mac: Removed.
* Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm: Removed.
* Shared/PlatformPopupMenuData.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::PlatformPopupMenuData::encode):
(WebKit::PlatformPopupMenuData::decode):
* Shared/PlatformPopupMenuData.h: Ditto.
* Shared/Plugins/Netscape/PluginInformation.cpp: Ditto.
* Shared/Plugins/PluginModuleInfo.h: Ditto.
* Shared/Plugins/PluginProcessCreationParameters.cpp: Ditto.
(WebKit::PluginProcessCreationParameters::encode):
(WebKit::PluginProcessCreationParameters::decode):
* Shared/Plugins/PluginProcessCreationParameters.h: Ditto.
* Shared/PrintInfo.h: Changed PLATFORM(MAC) to USE(APPKIT) around forward declaration of
NSPrintInfo.
* Shared/SandboxInitializationParameters.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* Shared/TextCheckerState.h: Changed PLATFORM(MAC) to USE(APPKIT).
* Shared/WebArchive.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* Shared/WebArchive.h: Ditto.
* Shared/WebArchiveResource.cpp: Ditto.
* Shared/WebArchiveResource.h: Ditto.
* Shared/WebCoreArgumentCoders.cpp: Ditto.
(IPC::ArgumentCoder<ResourceResponse>::encode):
(IPC::ArgumentCoder<ResourceResponse>::decode):
* Shared/WebCoreArgumentCoders.h: Ditto.
* Shared/WebEvent.h: Ditto.
* Shared/WebEventConversion.cpp: Ditto.
(WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):
* Shared/WebKit2Initialize.cpp: Ditto.
(WebKit::InitializeWebKit2):
* Shared/WebPageCreationParameters.cpp: Ditto.
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h: Ditto.
* Shared/WebPreferencesStore.h: Ditto.
* Shared/WebProcessCreationParameters.cpp: Ditto.
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h: Ditto.
* Shared/WebWheelEvent.cpp: Ditto.
(WebKit::WebWheelEvent::WebWheelEvent):
(WebKit::WebWheelEvent::encode):
(WebKit::WebWheelEvent::decode):
* Shared/cf/ArgumentCodersCF.cpp: Changed PLATFORM(MAC) to USE(FOUNDATION).
(IPC::decode):
* Shared/mac/CommandLineMac.cpp: Removed.
* Shared/mac/PDFKitImports.h: Removed PLATFORM(MAC)
* Shared/posix: Added.
* Shared/posix/CommandLinePOSIX.cpp: Renamed from mac/CommandLineMac.cpp and removed
comment.
* WebKit2.xcodeproj/project.pbxproj: Updated for moves and renames.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKContextMenuItemcpp">trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIObjecth">trunk/Source/WebKit2/Shared/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcesscpp">trunk/Source/WebKit2/Shared/ChildProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcessh">trunk/Source/WebKit2/Shared/ChildProcess.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCommandLineh">trunk/Source/WebKit2/Shared/CommandLine.h</a></li>
<li><a href="#trunkSourceWebKit2SharedDictionaryPopupInfocpp">trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedDictionaryPopupInfoh">trunk/Source/WebKit2/Shared/DictionaryPopupInfo.h</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadh">trunk/Source/WebKit2/Shared/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2SharedDrawingAreaInfoh">trunk/Source/WebKit2/Shared/DrawingAreaInfo.h</a></li>
<li><a href="#trunkSourceWebKit2SharedFontInfocpp">trunk/Source/WebKit2/Shared/FontInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedFontInfoh">trunk/Source/WebKit2/Shared/FontInfo.h</a></li>
<li><a href="#trunkSourceWebKit2SharedLayerTreeContexth">trunk/Source/WebKit2/Shared/LayerTreeContext.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebKeyboardEventh">trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebMouseEventh">trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebWheelEventh">trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagerh">trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPlatformPopupMenuDatacpp">trunk/Source/WebKit2/Shared/PlatformPopupMenuData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPlatformPopupMenuDatah">trunk/Source/WebKit2/Shared/PlatformPopupMenuData.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp">trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginModuleInfoh">trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginProcessCreationParametersh">trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPrintInfoh">trunk/Source/WebKit2/Shared/PrintInfo.h</a></li>
<li><a href="#trunkSourceWebKit2SharedSandboxInitializationParametersh">trunk/Source/WebKit2/Shared/SandboxInitializationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedTextCheckerStateh">trunk/Source/WebKit2/Shared/TextCheckerState.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchivecpp">trunk/Source/WebKit2/Shared/WebArchive.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchiveh">trunk/Source/WebKit2/Shared/WebArchive.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchiveResourcecpp">trunk/Source/WebKit2/Shared/WebArchiveResource.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchiveResourceh">trunk/Source/WebKit2/Shared/WebArchiveResource.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventh">trunk/Source/WebKit2/Shared/WebEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventConversioncpp">trunk/Source/WebKit2/Shared/WebEventConversion.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebKit2Initializecpp">trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStoreh">trunk/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebWheelEventcpp">trunk/Source/WebKit2/Shared/WebWheelEvent.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedcfArgumentCodersCFcpp">trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacPDFKitImportsh">trunk/Source/WebKit2/Shared/mac/PDFKitImports.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/</li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsCocoaCustomProtocolManagerCocoamm">trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm</a></li>
<li>trunk/Source/WebKit2/Shared/posix/</li>
<li><a href="#trunkSourceWebKit2SharedposixCommandLinePOSIXcpp">trunk/Source/WebKit2/Shared/posix/CommandLinePOSIX.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/</li>
<li><a href="#trunkSourceWebKit2SharedmacCommandLineMaccpp">trunk/Source/WebKit2/Shared/mac/CommandLineMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -1,3 +1,94 @@
</span><ins>+2014-02-11 Dan Bernstein <mitz@apple.com>
+
+ Stop using PLATFORM(MAC) in WebKit2/Shared except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128582
+
+ Reviewed by Darin Adler.
+
+ * Shared/API/c/WKContextMenuItem.cpp: Removed workaround for Mac Safari 6 compatibility.
+ (WKContextMenuItemGetTag):
+ * Shared/API/c/WKDeprecatedFunctions.cpp: Added && !PLATFORM(IOS), because these functions
+ are not needed on iOS.
+ * Shared/API/c/WKSharedAPICast.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::toAPI):
+ (WebKit::toImpl):
+ * Shared/APIObject.h: Ditto.
+ * Shared/ChildProcess.cpp: Ditto.
+ * Shared/ChildProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA) around
+ setApplicationIsDaemon and setQOS. Changed it to USE(APPKIT) around stopNSAppRunLoop.
+ * Shared/CommandLine.h: Changed PLATFORM(MAC) to OS(UNIX) around parse().
+ * Shared/DictionaryPopupInfo.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::DictionaryPopupInfo::encode):
+ (WebKit::DictionaryPopupInfo::decode):
+ * Shared/DictionaryPopupInfo.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * Shared/Downloads/Download.h: Ditto.
+ * Shared/DrawingAreaInfo.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * Shared/FontInfo.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::FontInfo::encode):
+ (WebKit::FontInfo::decode):
+ * Shared/FontInfo.h: Ditto.
+ * Shared/LayerTreeContext.h: Ditto.
+ * Shared/NativeWebKeyboardEvent.h: Changed PLATFORM(MAC) to USE(APPKIT) around
+ forward-declaration of NSView.
+ * Shared/NativeWebMouseEvent.h: Ditto.
+ * Shared/NativeWebWheelEvent.h: Ditto.
+ * Shared/Network/CustomProtocols/Cocoa: Renamed from mac.
+ * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm: Renamed from CustomProtocolManagerMac.mm.
+ * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerMac.mm: Removed.
+ * Shared/Network/CustomProtocols/CustomProtocolManager.h: Changed PLATFORM(MAC) to
+ PLATFORM(COCOA).
+ * Shared/Network/CustomProtocols/mac: Removed.
+ * Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm: Removed.
+ * Shared/PlatformPopupMenuData.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ (WebKit::PlatformPopupMenuData::encode):
+ (WebKit::PlatformPopupMenuData::decode):
+ * Shared/PlatformPopupMenuData.h: Ditto.
+ * Shared/Plugins/Netscape/PluginInformation.cpp: Ditto.
+ * Shared/Plugins/PluginModuleInfo.h: Ditto.
+ * Shared/Plugins/PluginProcessCreationParameters.cpp: Ditto.
+ (WebKit::PluginProcessCreationParameters::encode):
+ (WebKit::PluginProcessCreationParameters::decode):
+ * Shared/Plugins/PluginProcessCreationParameters.h: Ditto.
+ * Shared/PrintInfo.h: Changed PLATFORM(MAC) to USE(APPKIT) around forward declaration of
+ NSPrintInfo.
+ * Shared/SandboxInitializationParameters.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * Shared/TextCheckerState.h: Changed PLATFORM(MAC) to USE(APPKIT).
+ * Shared/WebArchive.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * Shared/WebArchive.h: Ditto.
+ * Shared/WebArchiveResource.cpp: Ditto.
+ * Shared/WebArchiveResource.h: Ditto.
+ * Shared/WebCoreArgumentCoders.cpp: Ditto.
+ (IPC::ArgumentCoder<ResourceResponse>::encode):
+ (IPC::ArgumentCoder<ResourceResponse>::decode):
+ * Shared/WebCoreArgumentCoders.h: Ditto.
+ * Shared/WebEvent.h: Ditto.
+ * Shared/WebEventConversion.cpp: Ditto.
+ (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):
+ * Shared/WebKit2Initialize.cpp: Ditto.
+ (WebKit::InitializeWebKit2):
+ * Shared/WebPageCreationParameters.cpp: Ditto.
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h: Ditto.
+ * Shared/WebPreferencesStore.h: Ditto.
+ * Shared/WebProcessCreationParameters.cpp: Ditto.
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h: Ditto.
+ * Shared/WebWheelEvent.cpp: Ditto.
+ (WebKit::WebWheelEvent::WebWheelEvent):
+ (WebKit::WebWheelEvent::encode):
+ (WebKit::WebWheelEvent::decode):
+ * Shared/cf/ArgumentCodersCF.cpp: Changed PLATFORM(MAC) to USE(FOUNDATION).
+ (IPC::decode):
+ * Shared/mac/CommandLineMac.cpp: Removed.
+ * Shared/mac/PDFKitImports.h: Removed PLATFORM(MAC)
+ * Shared/posix: Added.
+ * Shared/posix/CommandLinePOSIX.cpp: Renamed from mac/CommandLineMac.cpp and removed
+ comment.
+ * WebKit2.xcodeproj/project.pbxproj: Updated for moves and renames.
+
</ins><span class="cx"> 2014-02-11 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: storage/indexeddb/mozilla/cursor-update-updates-indexes.html ASSERTs
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKContextMenuItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -32,10 +32,6 @@
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKContextMenuItemTypes.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-#import <mach-o/dyld.h>
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -94,38 +90,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CONTEXT_MENUS)
-#if PLATFORM(MAC)
-static WKContextMenuItemTag compatibleContextMenuItemTag(WKContextMenuItemTag tag)
-{
- static bool needsWorkaround = ^bool {
- const int32_t safariFrameworkVersionWithIncompatibleContextMenuItemTags = 0x02181900; // 536.25.0 (Safari 6.0)
- return NSVersionOfRunTimeLibrary("Safari") == safariFrameworkVersionWithIncompatibleContextMenuItemTags;
- }();
-
- if (!needsWorkaround)
- return tag;
-
- // kWKContextMenuItemTagDictationAlternative was inserted before kWKContextMenuItemTagInspectElement.
- // DictationAlternative is now at the end like it should have been. To be compatible we need to return
- // InspectElement for DictationAlternative and shift InspectElement and after by one.
- if (tag == kWKContextMenuItemTagDictationAlternative)
- return kWKContextMenuItemTagInspectElement;
- if (tag >= kWKContextMenuItemTagInspectElement && tag < kWKContextMenuItemBaseApplicationTag)
- return tag + 1;
- return tag;
-}
-#endif
-#endif // ENABLE(CONTEXT_MENUS)
-
</del><span class="cx"> WKContextMenuItemTag WKContextMenuItemGetTag(WKContextMenuItemRef itemRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>-#if PLATFORM(MAC)
- return compatibleContextMenuItemTag(toAPI(toImpl(itemRef)->data()->action()));
-#else
</del><span class="cx"> return toAPI(toImpl(itemRef)->data()->action());
</span><del>-#endif
</del><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(itemRef);
</span><span class="cx"> return toAPI(ContextMenuItemTagNoAction);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "WKMutableDictionary.h"
</span><span class="cx"> #include "WKSharedAPICast.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> #include "WKContextPrivateMac.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> WK_EXPORT bool WKDictionaryIsMutable(WKDictionaryRef dictionary);
</span><span class="cx"> WK_EXPORT void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionary, WKStringRef key);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> toImpl(dictionaryRef)->remove(toImpl(keyRef)->string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> template<> struct APITypeInfo<WKMutableArrayRef> { typedef API::Array* ImplType; };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKWebArchiveRef, WebArchive)
</span><span class="cx"> WK_ADD_API_MAPPING(WKWebArchiveResourceRef, WebArchiveResource)
</span><span class="cx"> WK_ADD_API_MAPPING(WKObjCTypeWrapperRef, ObjCObjectGraph)
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> return kWKContextMenuItemTagMediaPlayPause;
</span><span class="cx"> case WebCore::ContextMenuItemTagMediaMute:
</span><span class="cx"> return kWKContextMenuItemTagMediaMute;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case WebCore::ContextMenuItemTagCorrectSpellingAutomatically:
</span><span class="cx"> return kWKContextMenuItemTagCorrectSpellingAutomatically;
</span><span class="cx"> case WebCore::ContextMenuItemTagSubstitutionsMenu:
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx"> return WebCore::ContextMenuItemTagMediaPlayPause;
</span><span class="cx"> case kWKContextMenuItemTagMediaMute:
</span><span class="cx"> return WebCore::ContextMenuItemTagMediaMute;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> case kWKContextMenuItemTagCorrectSpellingAutomatically:
</span><span class="cx"> return WebCore::ContextMenuItemTagCorrectSpellingAutomatically;
</span><span class="cx"> case kWKContextMenuItemTagSubstitutionsMenu:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIObject.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIObject.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/APIObject.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -31,14 +31,14 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WKFoundation.h"
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #include "WKObject.h"
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(MAC) && WK_API_ENABLED)
</del><ins>+#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(COCOA) && WK_API_ENABLED)
</ins><span class="cx">
</span><span class="cx"> #if DELEGATE_REF_COUNTING_TO_COCOA
</span><span class="cx"> OBJC_CLASS NSObject;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcess.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcess.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/ChildProcess.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> stopRunLoop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void ChildProcess::platformInitialize()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcess.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcess.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/ChildProcess.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="cx"> bool processSuppressionEnabled() const { return !m_processSuppressionDisabled.isActive(); }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void setApplicationIsDaemon();
</span><span class="cx"> void setQOS(int latencyQOS, int throughputQOS);
</span><span class="cx"> #endif
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void stopRunLoop();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> static void stopNSAppRunLoop();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCommandLineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CommandLine.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CommandLine.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/CommandLine.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class CommandLine {
</span><span class="cx"> public:
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(UNIX)
</ins><span class="cx"> bool parse(int argc, char** argv);
</span><span class="cx"> #endif
</span><span class="cx"> String operator[](const String& key) const
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDictionaryPopupInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "ArgumentCodersCF.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> {
</span><span class="cx"> encoder << origin;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool hadOptions = options;
</span><span class="cx"> encoder << hadOptions;
</span><span class="cx"> if (hadOptions)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!decoder.decode(result.origin))
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool hadOptions;
</span><span class="cx"> if (!decoder.decode(hadOptions))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDictionaryPopupInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/DictionaryPopupInfo.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/DictionaryPopupInfo.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/DictionaryPopupInfo.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/FloatPoint.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"> #endif
</span><span class="cx">
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, DictionaryPopupInfo&);
</span><span class="cx">
</span><span class="cx"> WebCore::FloatPoint origin;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFDictionaryRef> options;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/Download.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/Download.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/Downloads/Download.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <wtf/Noncopyable.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">
</span><span class="cx"> OBJC_CLASS NSURLDownload;
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<SandboxExtension> m_sandboxExtension;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<NSURLDownload> m_nsURLDownload;
</span><span class="cx"> RetainPtr<WKDownloadAsDelegate> m_delegate;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDrawingAreaInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/DrawingAreaInfo.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/DrawingAreaInfo.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/DrawingAreaInfo.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> enum DrawingAreaType {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> DrawingAreaTypeTiledCoreAnimation,
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedFontInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/FontInfo.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/FontInfo.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/FontInfo.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "ArgumentCodersCF.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> void FontInfo::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> encoder << static_cast<bool>(fontAttributeDictionary);
</span><span class="cx"> if (fontAttributeDictionary)
</span><span class="cx"> IPC::encode(encoder, fontAttributeDictionary.get());
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> bool FontInfo::decode(IPC::ArgumentDecoder& decoder, FontInfo& fontInfo)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool hasFontAttributeDictionary;
</span><span class="cx"> if (!decoder.decode(hasFontAttributeDictionary))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedFontInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/FontInfo.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/FontInfo.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/FontInfo.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef FontInfo_h
</span><span class="cx"> #define FontInfo_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"> #endif
</span><span class="cx">
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, FontInfo&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFDictionaryRef> fontAttributeDictionary;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedLayerTreeContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/LayerTreeContext.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/LayerTreeContext.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/LayerTreeContext.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> uint32_t contextID;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> uint64_t windowHandle;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -30,19 +30,24 @@
</span><span class="cx">
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSView;
</span><del>-#elif PLATFORM(GTK)
</del><ins>+#endif
+
+#if PLATFORM(EFL)
+#include <Evas.h>
+#endif
+
+#if PLATFORM(GTK)
</ins><span class="cx"> #include <WebCore/CompositionResults.h>
</span><span class="cx"> #include <WebCore/GUniquePtrGtk.h>
</span><span class="cx"> #include <WebCore/GtkInputMethodFilter.h>
</span><span class="cx"> typedef union _GdkEvent GdkEvent;
</span><del>-#elif PLATFORM(EFL)
-#include <Evas.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#include <wtf/RetainPtr.h>
</ins><span class="cx"> OBJC_CLASS WebIOSEvent;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebMouseEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -28,17 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSView;
</span><del>-#elif PLATFORM(GTK)
-#include <WebCore/GUniquePtrGtk.h>
-typedef union _GdkEvent GdkEvent;
-#elif PLATFORM(EFL)
</del><ins>+#endif
+
+#if PLATFORM(EFL)
</ins><span class="cx"> #include <Evas.h>
</span><span class="cx"> #include <WebCore/AffineTransform.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK)
+#include <WebCore/GUniquePtrGtk.h>
+typedef union _GdkEvent GdkEvent;
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class NativeWebMouseEvent : public WebMouseEvent {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebWheelEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -28,17 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSView;
</span><del>-#elif PLATFORM(GTK)
-#include <WebCore/GUniquePtrGtk.h>
-typedef union _GdkEvent GdkEvent;
-#elif PLATFORM(EFL)
</del><ins>+#endif
+
+#if PLATFORM(EFL)
</ins><span class="cx"> #include <Evas.h>
</span><span class="cx"> #include <WebCore/AffineTransform.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK)
+#include <WebCore/GUniquePtrGtk.h>
+typedef union _GdkEvent GdkEvent;
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class NativeWebWheelEvent : public WebWheelEvent {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsCocoaCustomProtocolManagerCocoammfromrev163885trunkSourceWebKit2SharedNetworkCustomProtocolsmacCustomProtocolManagerMacmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm (from rev 163885, trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm) (0 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -0,0 +1,278 @@
</span><ins>+/*
+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "CustomProtocolManager.h"
+
+#if ENABLE(CUSTOM_PROTOCOLS)
+
+#import "ChildProcess.h"
+#import "CustomProtocolManagerMessages.h"
+#import "CustomProtocolManagerProxyMessages.h"
+#import "DataReference.h"
+#import "WebCoreArgumentCoders.h"
+#import "WebProcessCreationParameters.h"
+#import <WebCore/URL.h>
+#import <WebCore/ResourceError.h>
+#import <WebCore/ResourceRequest.h>
+#import <WebCore/ResourceResponse.h>
+
+#if ENABLE(NETWORK_PROCESS)
+#import "NetworkProcessCreationParameters.h"
+#endif
+
+#ifdef __has_include
+#if __has_include(<Foundation/NSURLConnectionPrivate.h>)
+#import <Foundation/NSURLConnectionPrivate.h>
+#endif
+#endif
+
+@interface NSURLConnection (Details)
++ (CFRunLoopRef)resourceLoaderRunLoop;
+@end
+
+using namespace WebKit;
+
+namespace WebKit {
+
+static CustomProtocolManager* sharedCustomProtocolManager;
+
+static uint64_t generateCustomProtocolID()
+{
+ static uint64_t uniqueCustomProtocolID = 0;
+ return ++uniqueCustomProtocolID;
+}
+
+} // namespace WebKit
+
+@interface WKCustomProtocol : NSURLProtocol {
+@private
+ uint64_t _customProtocolID;
+}
+@property (nonatomic, readonly) uint64_t customProtocolID;
+@end
+
+@implementation WKCustomProtocol
+
+@synthesize customProtocolID = _customProtocolID;
+
++ (BOOL)canInitWithRequest:(NSURLRequest *)request
+{
+ return sharedCustomProtocolManager->supportsScheme([[[request URL] scheme] lowercaseString]);
+}
+
++ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
+{
+ return request;
+}
+
++ (BOOL)requestIsCacheEquivalent:(NSURLRequest *)a toRequest:(NSURLRequest *)b
+{
+ return NO;
+}
+
+- (id)initWithRequest:(NSURLRequest *)request cachedResponse:(NSCachedURLResponse *)cachedResponse client:(id<NSURLProtocolClient>)client
+{
+ self = [super initWithRequest:request cachedResponse:cachedResponse client:client];
+ if (!self)
+ return nil;
+
+ _customProtocolID = generateCustomProtocolID();
+ sharedCustomProtocolManager->addCustomProtocol(self);
+ return self;
+}
+
+- (void)startLoading
+{
+ sharedCustomProtocolManager->childProcess()->send(Messages::CustomProtocolManagerProxy::StartLoading(self.customProtocolID, [self request]), 0);
+}
+
+- (void)stopLoading
+{
+ sharedCustomProtocolManager->childProcess()->send(Messages::CustomProtocolManagerProxy::StopLoading(self.customProtocolID), 0);
+ sharedCustomProtocolManager->removeCustomProtocol(self);
+}
+
+@end
+
+namespace WebKit {
+
+const char* CustomProtocolManager::supplementName()
+{
+ return "CustomProtocolManager";
+}
+
+CustomProtocolManager::CustomProtocolManager(ChildProcess* childProcess)
+ : m_childProcess(childProcess)
+ , m_messageQueue(WorkQueue::create("com.apple.WebKit.CustomProtocolManager"))
+{
+ ASSERT(!sharedCustomProtocolManager);
+ sharedCustomProtocolManager = this;
+}
+
+void CustomProtocolManager::initializeConnection(IPC::Connection* connection)
+{
+ connection->addWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName(), m_messageQueue.get(), this);
+}
+
+void CustomProtocolManager::initialize(const WebProcessCreationParameters& parameters)
+{
+#if ENABLE(NETWORK_PROCESS)
+ ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty() || !parameters.usesNetworkProcess);
+ if (parameters.usesNetworkProcess) {
+ m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
+ m_messageQueue = nullptr;
+ return;
+ }
+#endif
+
+ [NSURLProtocol registerClass:[WKCustomProtocol class]];
+
+ for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
+ registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
+}
+
+#if ENABLE(NETWORK_PROCESS)
+void CustomProtocolManager::initialize(const NetworkProcessCreationParameters& parameters)
+{
+ [NSURLProtocol registerClass:[WKCustomProtocol class]];
+
+ for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
+ registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
+}
+#endif
+
+void CustomProtocolManager::addCustomProtocol(WKCustomProtocol *customProtocol)
+{
+ ASSERT(customProtocol);
+ MutexLocker locker(m_customProtocolMapMutex);
+ m_customProtocolMap.add(customProtocol.customProtocolID, customProtocol);
+}
+
+void CustomProtocolManager::removeCustomProtocol(WKCustomProtocol *customProtocol)
+{
+ ASSERT(customProtocol);
+ MutexLocker locker(m_customProtocolMapMutex);
+ m_customProtocolMap.remove(customProtocol.customProtocolID);
+}
+
+void CustomProtocolManager::registerScheme(const String& scheme)
+{
+ ASSERT(!scheme.isNull());
+ MutexLocker locker(m_registeredSchemesMutex);
+ m_registeredSchemes.add(scheme);
+}
+
+void CustomProtocolManager::unregisterScheme(const String& scheme)
+{
+ ASSERT(!scheme.isNull());
+ MutexLocker locker(m_registeredSchemesMutex);
+ m_registeredSchemes.remove(scheme);
+}
+
+bool CustomProtocolManager::supportsScheme(const String& scheme)
+{
+ if (scheme.isNull())
+ return false;
+
+ MutexLocker locker(m_registeredSchemesMutex);
+ return m_registeredSchemes.contains(scheme);
+}
+
+static inline void dispatchOnResourceLoaderRunLoop(void (^block)())
+{
+ CFRunLoopPerformBlock([NSURLConnection resourceLoaderRunLoop], kCFRunLoopDefaultMode, block);
+ CFRunLoopWakeUp([NSURLConnection resourceLoaderRunLoop]);
+}
+
+void CustomProtocolManager::didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError& error)
+{
+ RetainPtr<WKCustomProtocol> protocol = protocolForID(customProtocolID);
+ if (!protocol)
+ return;
+
+ RetainPtr<NSError> nsError = error.nsError();
+
+ dispatchOnResourceLoaderRunLoop(^ {
+ [[protocol client] URLProtocol:protocol.get() didFailWithError:nsError.get()];
+ });
+
+ removeCustomProtocol(protocol.get());
+}
+
+void CustomProtocolManager::didLoadData(uint64_t customProtocolID, const IPC::DataReference& data)
+{
+ RetainPtr<WKCustomProtocol> protocol = protocolForID(customProtocolID);
+ if (!protocol)
+ return;
+
+ RetainPtr<NSData> nsData = adoptNS([[NSData alloc] initWithBytes:data.data() length:data.size()]);
+
+ dispatchOnResourceLoaderRunLoop(^ {
+ [[protocol client] URLProtocol:protocol.get() didLoadData:nsData.get()];
+ });
+}
+
+void CustomProtocolManager::didReceiveResponse(uint64_t customProtocolID, const WebCore::ResourceResponse& response, uint32_t cacheStoragePolicy)
+{
+ RetainPtr<WKCustomProtocol> protocol = protocolForID(customProtocolID);
+ if (!protocol)
+ return;
+
+ RetainPtr<NSURLResponse> nsResponse = response.nsURLResponse();
+
+ dispatchOnResourceLoaderRunLoop(^ {
+ [[protocol client] URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:static_cast<NSURLCacheStoragePolicy>(cacheStoragePolicy)];
+ });
+}
+
+void CustomProtocolManager::didFinishLoading(uint64_t customProtocolID)
+{
+ RetainPtr<WKCustomProtocol> protocol = protocolForID(customProtocolID);
+ if (!protocol)
+ return;
+
+ dispatchOnResourceLoaderRunLoop(^ {
+ [[protocol client] URLProtocolDidFinishLoading:protocol.get()];
+ });
+
+ removeCustomProtocol(protocol.get());
+}
+
+RetainPtr<WKCustomProtocol> CustomProtocolManager::protocolForID(uint64_t customProtocolID)
+{
+ MutexLocker locker(m_customProtocolMapMutex);
+
+ CustomProtocolMap::const_iterator it = m_customProtocolMap.find(customProtocolID);
+ if (it == m_customProtocolMap.end())
+ return nil;
+
+ ASSERT(it->value);
+ return it->value;
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(CUSTOM_PROTOCOLS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "WorkQueue.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> void unregisterScheme(const String&);
</span><span class="cx"> bool supportsScheme(const String&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void addCustomProtocol(WKCustomProtocol *);
</span><span class="cx"> void removeCustomProtocol(WKCustomProtocol *);
</span><span class="cx"> #endif
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> ChildProcess* m_childProcess;
</span><span class="cx"> RefPtr<WorkQueue> m_messageQueue;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> HashSet<String> m_registeredSchemes;
</span><span class="cx"> Mutex m_registeredSchemesMutex;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPlatformPopupMenuDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/PlatformPopupMenuData.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/PlatformPopupMenuData.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/PlatformPopupMenuData.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> void PlatformPopupMenuData::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> encoder << fontInfo;
</span><span class="cx"> encoder << shouldPopOver;
</span><span class="cx"> #else
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> bool PlatformPopupMenuData::decode(IPC::ArgumentDecoder& decoder, PlatformPopupMenuData& data)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!decoder.decode(data.fontInfo))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(data.shouldPopOver))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPlatformPopupMenuDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/PlatformPopupMenuData.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/PlatformPopupMenuData.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/PlatformPopupMenuData.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, PlatformPopupMenuData&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> FontInfo fontInfo;
</span><span class="cx"> bool shouldPopOver;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> return ImmutableDictionary::create(std::move(map));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void getPlatformPluginModuleInformation(const PluginModuleInfo&, ImmutableDictionary::MapType&)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginModuleInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/PluginData.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <mach/machine.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> String path;
</span><span class="cx"> WebCore::PluginInfo info;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> cpu_type_t pluginArchitecture;
</span><span class="cx"> String bundleIdentifier;
</span><span class="cx"> String versionString;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> encoder << supportsAsynchronousPluginInitialization;
</span><span class="cx"> encoder << minimumLifetime;
</span><span class="cx"> encoder << terminationTimeout;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> encoder << acceleratedCompositingPort;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.terminationTimeout))
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!decoder.decode(result.acceleratedCompositingPort))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "PluginProcessAttributes.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "MachPort.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> double minimumLifetime;
</span><span class="cx"> double terminationTimeout;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> IPC::MachPort acceleratedCompositingPort;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPrintInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/PrintInfo.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/PrintInfo.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/PrintInfo.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef PrintInfo_h
</span><span class="cx"> #define PrintInfo_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> OBJC_CLASS NSPrintInfo;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef struct _GtkPrintSettings GtkPrintSettings;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSandboxInitializationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SandboxInitializationParameters.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SandboxInitializationParameters.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/SandboxInitializationParameters.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSString;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> SandboxInitializationParameters();
</span><span class="cx"> ~SandboxInitializationParameters();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Name must be a literal.
</span><span class="cx"> void addConfDirectoryParameter(const char* name, int confID);
</span><span class="cx"> void addPathParameter(const char* name, NSString *path);
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void appendPathInternal(const char* name, const char* path);
</span><span class="cx">
</span><span class="cx"> mutable Vector<const char*> m_namedParameters;
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> SandboxInitializationParameters::SandboxInitializationParameters()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedTextCheckerStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/TextCheckerState.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/TextCheckerState.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/TextCheckerState.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> bool isContinuousSpellCheckingEnabled;
</span><span class="cx"> bool isGrammarCheckingEnabled;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> bool isAutomaticSpellingCorrectionEnabled;
</span><span class="cx"> bool isAutomaticQuoteSubstitutionEnabled;
</span><span class="cx"> bool isAutomaticDashSubstitutionEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchive.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchive.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebArchive.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebArchive.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIData.h"
</span><span class="lines">@@ -157,4 +157,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchive.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchive.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebArchive.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WebArchive_h
</span><span class="cx"> #define WebArchive_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -76,6 +76,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #endif // WebArchive_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchiveResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchiveResource.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchiveResource.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebArchiveResource.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebArchiveResource.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #include "APIData.h"
</span><span class="cx"> #include <WebCore/ArchiveResource.h>
</span><span class="lines">@@ -99,4 +99,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchiveResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchiveResource.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchiveResource.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebArchiveResource.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WebArchiveResource_h
</span><span class="cx"> #define WebArchiveResource_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -67,6 +67,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #endif // WebArchiveResource_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -574,7 +574,7 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<ResourceResponse>::encode(ArgumentEncoder& encoder, const ResourceResponse& resourceResponse)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool shouldSerializeWebCoreData = !resourceResponse.platformResponseIsUpToDate();
</span><span class="cx"> encoder << shouldSerializeWebCoreData;
</span><span class="cx"> #else
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<ResourceResponse>::decode(ArgumentDecoder& decoder, ResourceResponse& resourceResponse)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool hasSerializedWebCoreData;
</span><span class="cx"> if (!decoder.decode(hasSerializedWebCoreData))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> struct WindowFeatures;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> struct KeypressCommand;
</span><span class="cx"> }
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::ResourceRequest> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static const bool kShouldSerializeWebCoreData = false;
</span><span class="cx"> #else
</span><span class="cx"> static const bool kShouldSerializeWebCoreData = true;
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::ResourceError> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static const bool kShouldSerializeWebCoreData = false;
</span><span class="cx"> #else
</span><span class="cx"> static const bool kShouldSerializeWebCoreData = true;
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::Color&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> template<> struct ArgumentCoder<WebCore::KeypressCommand> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::KeypressCommand&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::KeypressCommand&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEvent.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEvent.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebEvent.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> ScrollByPixelWheelEvent
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> enum Phase {
</span><span class="cx"> PhaseNone = 0,
</span><span class="cx"> PhaseBegan = 1 << 0,
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> WebWheelEvent() { }
</span><span class="cx">
</span><span class="cx"> WebWheelEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, const WebCore::FloatSize& delta, const WebCore::FloatSize& wheelTicks, Granularity, Modifiers, double timestamp);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> WebWheelEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, const WebCore::FloatSize& delta, const WebCore::FloatSize& wheelTicks, Granularity, bool directionInvertedFromDevice, Phase, Phase momentumPhase, bool hasPreciseScrollingDeltas, uint32_t scrollCount, const WebCore::FloatSize& unacceleratedScrollingDelta, Modifiers, double timestamp);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> const WebCore::FloatSize wheelTicks() const { return m_wheelTicks; }
</span><span class="cx"> Granularity granularity() const { return static_cast<Granularity>(m_granularity); }
</span><span class="cx"> bool directionInvertedFromDevice() const { return m_directionInvertedFromDevice; }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> Phase phase() const { return static_cast<Phase>(m_phase); }
</span><span class="cx"> Phase momentumPhase() const { return static_cast<Phase>(m_momentumPhase); }
</span><span class="cx"> bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> WebCore::FloatSize m_wheelTicks;
</span><span class="cx"> uint32_t m_granularity; // Granularity
</span><span class="cx"> bool m_directionInvertedFromDevice;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> uint32_t m_phase; // Phase
</span><span class="cx"> uint32_t m_momentumPhase; // Phase
</span><span class="cx"> bool m_hasPreciseScrollingDeltas;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEventConversion.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> m_wheelTicksY = webEvent.wheelTicks().height();
</span><span class="cx"> m_granularity = (webEvent.granularity() == WebWheelEvent::ScrollByPageWheelEvent) ? WebCore::ScrollByPageWheelEvent : WebCore::ScrollByPixelWheelEvent;
</span><span class="cx"> m_directionInvertedFromDevice = webEvent.directionInvertedFromDevice();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_phase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.phase());
</span><span class="cx"> m_momentumPhase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.momentumPhase());
</span><span class="cx"> m_hasPreciseScrollingDeltas = webEvent.hasPreciseScrollingDeltas();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebKit2Initializecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> void InitializeWebKit2()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> InitWebCoreSystemInterface();
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> encoder << backgroundExtendsBeyondPage;
</span><span class="cx"> encoder.encodeEnum(layerHostingMode);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> encoder << colorSpace;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if (!decoder.decodeEnum(parameters.layerHostingMode))
</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 (!decoder.decode(parameters.colorSpace))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <WebCore/ViewState.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "ColorSpaceData.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> LayerHostingMode layerHostingMode;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ColorSpaceData colorSpace;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED true
</span><span class="cx"> #define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED true
</span><span class="cx"> #define DEFAULT_PDFPLUGIN_ENABLED true
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> macro(InspectorAttachmentSide, inspectorAttachmentSide, UInt32, uint32_t, 0) \
</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"> #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
</span><span class="cx"> macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> , shouldAlwaysUseComplexTextCodePath(false)
</span><span class="cx"> , shouldUseFontSmoothing(true)
</span><span class="cx"> , defaultRequestTimeoutInterval(INT_MAX)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , nsURLCacheMemoryCapacity(0)
</span><span class="cx"> , nsURLCacheDiskCapacity(0)
</span><span class="cx"> , shouldForceScreenFontSubstitution(false)
</span><span class="lines">@@ -96,10 +96,10 @@
</span><span class="cx"> encoder << textCheckerState;
</span><span class="cx"> encoder << fullKeyboardAccessEnabled;
</span><span class="cx"> encoder << defaultRequestTimeoutInterval;
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> encoder << uiProcessBundleIdentifier;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> encoder << presenterApplicationPid;
</span><span class="cx"> encoder << accessibilityEnhancedUserInterfaceEnabled;
</span><span class="cx"> encoder << nsURLCacheMemoryCapacity;
</span><span class="lines">@@ -209,12 +209,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.defaultRequestTimeoutInterval))
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> if (!decoder.decode(parameters.uiProcessBundleIdentifier))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!decoder.decode(parameters.presenterApplicationPid))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.accessibilityEnhancedUserInterfaceEnabled))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "MachPort.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx">
</span><span class="cx"> double defaultRequestTimeoutInterval;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> String uiProcessBundleIdentifier;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> pid_t presenterApplicationPid;
</span><span class="cx">
</span><span class="cx"> bool accessibilityEnhancedUserInterfaceEnabled;
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> bool shouldForceScreenFontSubstitution;
</span><span class="cx"> bool shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> bool shouldEnableFTL;
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> HashMap<String, bool> notificationPermissions;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebWheelEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebWheelEvent.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebWheelEvent.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/WebWheelEvent.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> , m_wheelTicks(wheelTicks)
</span><span class="cx"> , m_granularity(granularity)
</span><span class="cx"> , m_directionInvertedFromDevice(false)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_phase(PhaseNone)
</span><span class="cx"> , m_hasPreciseScrollingDeltas(false)
</span><span class="cx"> , m_scrollCount(0)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> ASSERT(isWheelEventType(type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, bool directionInvertedFromDevice, Phase phase, Phase momentumPhase, bool hasPreciseScrollingDeltas, uint32_t scrollCount, const WebCore::FloatSize& unacceleratedScrollingDelta, Modifiers modifiers, double timestamp)
</span><span class="cx"> : WebEvent(type, modifiers, timestamp)
</span><span class="cx"> , m_position(position)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> encoder << m_wheelTicks;
</span><span class="cx"> encoder << m_granularity;
</span><span class="cx"> encoder << m_directionInvertedFromDevice;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> encoder << m_phase;
</span><span class="cx"> encoder << m_momentumPhase;
</span><span class="cx"> encoder << m_hasPreciseScrollingDeltas;
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(t.m_directionInvertedFromDevice))
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!decoder.decode(t.m_phase))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(t.m_momentumPhase))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfArgumentCodersCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <WebCore/CFURLExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -524,7 +524,7 @@
</span><span class="cx"> if (!decoder.decode(urlBytes))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> // FIXME: Move this to ArgumentCodersCFMac.mm and change this file back to be C++
</span><span class="cx"> // instead of Objective-C++.
</span><span class="cx"> if (urlBytes.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCommandLineMaccpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/mac/CommandLineMac.cpp (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CommandLineMac.cpp 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/mac/CommandLineMac.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CommandLine.h"
-
-namespace WebKit {
-
-// FIXME: There's nothing Mac specific about this command line parser.
-// Maybe we should move it to CommandLinePosix.cpp instead.
-
-bool CommandLine::parse(int argc, char** argv)
-{
- if ((argc % 2))
- return false;
-
- for (int i = 2; i < argc; i += 2) {
- if (!argv[i] || *argv[i] != '-')
- return false;
-
- String key = String::fromUTF8(argv[i] + 1);
- if (key.isEmpty())
- return false;
-
- String value = String::fromUTF8(argv[i + 1]);
- if (value.isEmpty())
- return false;
-
- if (!m_args.add(key, value).isNewEntry)
- return false;
- }
-
- return true;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacPDFKitImportsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/PDFKitImports.h (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/PDFKitImports.h 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/Shared/mac/PDFKitImports.h 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef PDFKitImports_h
</span><span class="cx"> #define PDFKitImports_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> NSString *pdfKitFrameworkPath();
</span><span class="lines">@@ -43,6 +41,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC)
-
</del><span class="cx"> #endif // PDFKitImports_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedposixCommandLinePOSIXcppfromrev163885trunkSourceWebKit2SharedmacCommandLineMaccpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/posix/CommandLinePOSIX.cpp (from rev 163885, trunk/Source/WebKit2/Shared/mac/CommandLineMac.cpp) (0 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/posix/CommandLinePOSIX.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/posix/CommandLinePOSIX.cpp 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CommandLine.h"
+
+namespace WebKit {
+
+bool CommandLine::parse(int argc, char** argv)
+{
+ if ((argc % 2))
+ return false;
+
+ for (int i = 2; i < argc; i += 2) {
+ if (!argv[i] || *argv[i] != '-')
+ return false;
+
+ String key = String::fromUTF8(argv[i] + 1);
+ if (key.isEmpty())
+ return false;
+
+ String value = String::fromUTF8(argv[i + 1]);
+ if (value.isEmpty())
+ return false;
+
+ if (!m_args.add(key, value).isNewEntry)
+ return false;
+ }
+
+ return true;
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163885 => 163886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-11 17:50:52 UTC (rev 163885)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-11 18:00:45 UTC (rev 163886)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> 1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */; };
</span><span class="cx"> 1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */; };
</span><span class="cx"> 1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
</span><del>- 1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */; };
</del><ins>+ 1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */; };
</ins><span class="cx"> 1A6FB7AE11E64B6800DB1371 /* PluginView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */; };
</span><span class="cx"> 1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7AD11E64B6800DB1371 /* PluginView.h */; };
</span><span class="cx"> 1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7D011E651E200DB1371 /* Plugin.cpp */; };
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> 2984F57D164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2984F57B164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h */; };
</span><span class="cx"> 2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */; };
</span><span class="cx"> 2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2984F587164BA095004BC0C6 /* CustomProtocolManagerMessages.h */; };
</span><del>- 2989A411167D1834004F96D2 /* CustomProtocolManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2989A410167D1834004F96D2 /* CustomProtocolManagerMac.mm */; };
</del><ins>+ 2989A411167D1834004F96D2 /* CustomProtocolManagerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */; };
</ins><span class="cx"> 2989A414167D184B004F96D2 /* CustomProtocolManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2989A412167D184B004F96D2 /* CustomProtocolManager.h */; };
</span><span class="cx"> 29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 29AD3092164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h */; };
</span><span class="cx"> 29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29AD3095164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm */; };
</span><span class="lines">@@ -1870,7 +1870,7 @@
</span><span class="cx"> 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UpdateInfo.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
</span><del>- 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineMac.cpp; sourceTree = "<group>"; };
</del><ins>+ 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLinePOSIX.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginView.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A6FB7AD11E64B6800DB1371 /* PluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginView.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A6FB7D011E651E200DB1371 /* Plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Plugin.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2103,7 +2103,7 @@
</span><span class="cx"> 2984F57B164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomProtocolManagerProxyMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomProtocolManagerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2984F587164BA095004BC0C6 /* CustomProtocolManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomProtocolManagerMessages.h; sourceTree = "<group>"; };
</span><del>- 2989A410167D1834004F96D2 /* CustomProtocolManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolManagerMac.mm; path = Network/CustomProtocols/mac/CustomProtocolManagerMac.mm; sourceTree = "<group>"; };
</del><ins>+ 2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomProtocolManagerCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 2989A412167D184B004F96D2 /* CustomProtocolManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomProtocolManager.h; path = Network/CustomProtocols/CustomProtocolManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 2989A413167D184B004F96D2 /* CustomProtocolManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CustomProtocolManager.messages.in; path = Network/CustomProtocols/CustomProtocolManager.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 29AD3092164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomProtocolManagerProxy.h; path = CustomProtocols/CustomProtocolManagerProxy.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3816,6 +3816,7 @@
</span><span class="cx"> BC111B5A112F628200337BAB /* mac */,
</span><span class="cx"> 51A8A60D1627F2AC000D90E9 /* Network */,
</span><span class="cx"> 1AAE058C1279DCD400852418 /* Plugins */,
</span><ins>+ 3709504918A9FAD20087AE5D /* posix */,
</ins><span class="cx"> 0F5947A0187B3B7100437857 /* Scrolling */,
</span><span class="cx"> BC64696D11DBE603006455B0 /* APIArray.cpp */,
</span><span class="cx"> BC64696E11DBE603006455B0 /* APIArray.h */,
</span><span class="lines">@@ -4127,19 +4128,20 @@
</span><span class="cx"> 2989A40E167D1813004F96D2 /* CustomProtocols */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 2989A40F167D181B004F96D2 /* mac */,
</del><ins>+ 2989A40F167D181B004F96D2 /* Cocoa */,
</ins><span class="cx"> 2989A412167D184B004F96D2 /* CustomProtocolManager.h */,
</span><span class="cx"> 2989A413167D184B004F96D2 /* CustomProtocolManager.messages.in */,
</span><span class="cx"> );
</span><span class="cx"> name = CustomProtocols;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 2989A40F167D181B004F96D2 /* mac */ = {
</del><ins>+ 2989A40F167D181B004F96D2 /* Cocoa */ = {
</ins><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 2989A410167D1834004F96D2 /* CustomProtocolManagerMac.mm */,
</del><ins>+ 2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */,
</ins><span class="cx"> );
</span><del>- name = mac;
</del><ins>+ name = Cocoa;
+ path = Network/CustomProtocols/Cocoa;
</ins><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><span class="cx"> 29AD3091164B4C100072DEA9 /* CustomProtocols */ = {
</span><span class="lines">@@ -4348,6 +4350,14 @@
</span><span class="cx"> path = foundation;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 3709504918A9FAD20087AE5D /* posix */ = {
+ isa = PBXGroup;
+ children = (
+ 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */,
+ );
+ path = posix;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -5341,7 +5351,6 @@
</span><span class="cx"> 9F54F88E16488E87007DF81A /* ChildProcessMac.mm */,
</span><span class="cx"> 1A2A4AFE158693920090C9E9 /* ColorSpaceData.h */,
</span><span class="cx"> 1A2A4AFD158693920090C9E9 /* ColorSpaceData.mm */,
</span><del>- 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */,
</del><span class="cx"> CDC3830D1721242D008A2FC3 /* CookieStorageShim.mm */,
</span><span class="cx"> CDC3830E1721242D008A2FC3 /* CookieStorageShim.h */,
</span><span class="cx"> CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */,
</span><span class="lines">@@ -7662,7 +7671,7 @@
</span><span class="cx"> 9F54F88F16488E87007DF81A /* ChildProcessMac.mm in Sources */,
</span><span class="cx"> E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */,
</span><span class="cx"> 1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */,
</span><del>- 1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */,
</del><ins>+ 1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */,
</ins><span class="cx"> BC032DAA10F437D10058C15A /* Connection.cpp in Sources */,
</span><span class="cx"> 2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,
</span><span class="cx"> 1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */,
</span><span class="lines">@@ -7675,7 +7684,7 @@
</span><span class="cx"> 2DA049B3180CCCD300AAFA9E /* PlatformCALayerRemote.cpp in Sources */,
</span><span class="cx"> CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */,
</span><span class="cx"> B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
</span><del>- 2989A411167D1834004F96D2 /* CustomProtocolManagerMac.mm in Sources */,
</del><ins>+ 2989A411167D1834004F96D2 /* CustomProtocolManagerCocoa.mm in Sources */,
</ins><span class="cx"> 2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> 29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */,
</span><span class="cx"> 0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>