Changeset 164172 in webkit

Timestamp:

Feb 15, 2014 9:06:17 AM (10 years ago)

Author:

mitz@apple.com

Message:

Stop using PLATFORM(MAC) in WebKit2/UIProcess except where it means “OS X but not iOS”
​https://bugs.webkit.org/show_bug.cgi?id=128868

Reviewed by Anders Carlsoon.

• UIProcess/API/C/WKPage.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
• UIProcess/Databases/DatabaseProcessProxy.cpp:

(WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection): Changed
PLATFORM(MAC) to OS(DARWIN) around use of Mach-based IPC.

• UIProcess/DrawingAreaProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA)

(WebKit::DrawingAreaProxy::DrawingAreaProxy):

• UIProcess/DrawingAreaProxy.h: Ditto.
• UIProcess/DrawingAreaProxy.messages.in: Ditto.
• UIProcess/Launcher/ProcessLauncher.cpp:

(WebKit::ProcessLauncher::didFinishLaunchingProcess): Changed PLATFORM(MAC) to OS(DARWIN)
around use of Mach API.

• UIProcess/Launcher/ProcessLauncher.h: Ditto.
• UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h: Changed PLATFORM(MAC) to

PLATFORM(COCOA)

• UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch): Changed PLATFORM(MAC)
to OS(DARWIN).
(WebKit::NetworkProcessProxy::didCreateNetworkConnectionToWebProcess): Ditto.
(WebKit::NetworkProcessProxy::didFinishLaunching): Changed PLATFORM(MAC) to PLATFORM(COCOA)
around process suppression call.

• UIProcess/Network/NetworkProcessProxy.h: Ditto.
• UIProcess/PageClient.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
• UIProcess/Plugins/PluginInfoStore.cpp: Ditto.
• UIProcess/Plugins/PluginProcessManager.h: Ditto.
• UIProcess/Plugins/PluginProcessProxy.cpp:

(WebKit::PluginProcessProxy::PluginProcessProxy): Ditto.
(WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch): Changed PLATFORM(MAC)
to OS(DARWIN).
(WebKit::PluginProcessProxy::didClose): Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::PluginProcessProxy::didFinishLaunching): Changed PLATFORM(MAC) to OS(DARWIN) around
use of Mach-based IPC, and to PLATFORM(COCOA) around SetQOS.
(WebKit::PluginProcessProxy::didCreateWebProcessConnection): Changed PLATFORM(MAC) to
OS(DARWIN).

• UIProcess/Plugins/PluginProcessProxy.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
• UIProcess/Plugins/PluginProcessProxy.messages.in: Ditto.
• UIProcess/TextChecker.h: Ditto.
• UIProcess/WebContext.cpp: Ditto.

(WebKit::WebContext::ensureNetworkProcess):
(WebKit::WebContext::createNewWebProcess):
(WebKit::WebContext::setHTTPPipeliningEnabled):
(WebKit::WebContext::httpPipeliningEnabled):
(WebKit::WebContext::pluginInfoStoreDidLoadPlugins):

• UIProcess/WebContext.h: Ditto.
• UIProcess/WebContext.messages.in: Ditto.
• UIProcess/WebContextUserMessageCoders.h: Ditto.

(WebKit::WebContextUserMessageEncoder::encode):
(WebKit::WebContextUserMessageDecoder::decode):

• UIProcess/WebCookieManagerProxy.cpp: Ditto.

(WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):

• UIProcess/WebCookieManagerProxy.h: Ditto.
• UIProcess/WebFormSubmissionListenerProxy.h: Ditto.
• UIProcess/WebFramePolicyListenerProxy.h: Ditto.
• UIProcess/WebInspectorProxy.h: Added !PLATFORM(IOS) around members reltated to managing

the inspector window and its view.

• UIProcess/WebPageProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::recordNavigationSnapshot):
(WebKit::WebPageProxy::canShowMIMEType):
(WebKit::canCoalesce):
(WebKit::coalesce):
(WebKit::WebPageProxy::findPlugin):
(WebKit::WebPageProxy::editorStateChanged):
(WebKit::WebPageProxy::contextMenuItemSelected):
(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::didBlockInsecurePluginVersion):

• UIProcess/WebPageProxy.h: Ditto.
• UIProcess/WebPageProxy.messages.in: Ditto.
• UIProcess/WebProcessProxy.cpp: Ditto.

(WebKit::WebProcessProxy::WebProcessProxy):
(WebKit::WebProcessProxy::createWebPage):
(WebKit::WebProcessProxy::addExistingWebPage):
(WebKit::WebProcessProxy::removeWebPage):
(WebKit::WebProcessProxy::didFinishLaunching):
(WebKit::WebProcessProxy::pageSuppressibilityChanged):
(WebKit::WebProcessProxy::pagePreferencesChanged):

• UIProcess/WebProcessProxy.h: Ditto.
• UIProcess/cf/WebPreferencesCF.cpp: Removed this file which was not used in any

configuration.

• UIProcess/ios/WebInspectorProxyIOS.mm: Removed functions that no longer need to be

implemented for iOS.

• WebKit2.xcodeproj/project.pbxproj: Removed reference to WebPreferencesCF.cpp.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• UIProcess/Databases/DatabaseProcessProxy.cpp (modified) (1 diff)
• UIProcess/DrawingAreaProxy.cpp (modified) (2 diffs)
• UIProcess/DrawingAreaProxy.h (modified) (2 diffs)
• UIProcess/DrawingAreaProxy.messages.in (modified) (1 diff)
• UIProcess/Launcher/ProcessLauncher.cpp (modified) (1 diff)
• UIProcess/Launcher/ProcessLauncher.h (modified) (1 diff)
• UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h (modified) (2 diffs)
• UIProcess/Network/NetworkProcessProxy.cpp (modified) (3 diffs)
• UIProcess/Network/NetworkProcessProxy.h (modified) (1 diff)
• UIProcess/PageClient.h (modified) (4 diffs)
• UIProcess/Plugins/PluginInfoStore.cpp (modified) (1 diff)
• UIProcess/Plugins/PluginProcessManager.h (modified) (1 diff)
• UIProcess/Plugins/PluginProcessProxy.cpp (modified) (8 diffs)
• UIProcess/Plugins/PluginProcessProxy.h (modified) (5 diffs)
• UIProcess/Plugins/PluginProcessProxy.messages.in (modified) (1 diff)
• UIProcess/TextChecker.h (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (7 diffs)
• UIProcess/WebContext.h (modified) (10 diffs)
• UIProcess/WebContext.messages.in (modified) (2 diffs)
• UIProcess/WebContextUserMessageCoders.h (modified) (3 diffs)
• UIProcess/WebCookieManagerProxy.cpp (modified) (1 diff)
• UIProcess/WebCookieManagerProxy.h (modified) (1 diff)
• UIProcess/WebFormSubmissionListenerProxy.h (modified) (1 diff)
• UIProcess/WebFramePolicyListenerProxy.h (modified) (1 diff)
• UIProcess/WebInspectorProxy.h (modified) (3 diffs)
• UIProcess/WebPageProxy.cpp (modified) (15 diffs)
• UIProcess/WebPageProxy.h (modified) (18 diffs)
• UIProcess/WebPageProxy.messages.in (modified) (3 diffs)
• UIProcess/WebProcessProxy.cpp (modified) (9 diffs)
• UIProcess/WebProcessProxy.h (modified) (2 diffs)
• UIProcess/cf/WebPreferencesCF.cpp (deleted)
• UIProcess/ios/WebInspectorProxyIOS.mm (modified) (2 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-15  Dan Bernstein  <mitz@apple.com>
+
+        Stop using PLATFORM(MAC) in WebKit2/UIProcess except where it means “OS X but not iOS”
+        https://bugs.webkit.org/show_bug.cgi?id=128868
+
+        Reviewed by Anders Carlsoon.
+
+        * UIProcess/API/C/WKPage.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+        * UIProcess/Databases/DatabaseProcessProxy.cpp:
+        (WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection): Changed
+        PLATFORM(MAC) to OS(DARWIN) around use of Mach-based IPC.
+        * UIProcess/DrawingAreaProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA)
+        (WebKit::DrawingAreaProxy::DrawingAreaProxy):
+        * UIProcess/DrawingAreaProxy.h: Ditto.
+        * UIProcess/DrawingAreaProxy.messages.in: Ditto.
+        * UIProcess/Launcher/ProcessLauncher.cpp:
+        (WebKit::ProcessLauncher::didFinishLaunchingProcess): Changed PLATFORM(MAC) to OS(DARWIN)
+        around use of Mach API.
+        * UIProcess/Launcher/ProcessLauncher.h: Ditto.
+        * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h: Changed PLATFORM(MAC) to
+        PLATFORM(COCOA)
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch): Changed PLATFORM(MAC)
+        to OS(DARWIN).
+        (WebKit::NetworkProcessProxy::didCreateNetworkConnectionToWebProcess): Ditto.
+        (WebKit::NetworkProcessProxy::didFinishLaunching): Changed PLATFORM(MAC) to PLATFORM(COCOA)
+        around process suppression call.
+        * UIProcess/Network/NetworkProcessProxy.h: Ditto.
+        * UIProcess/PageClient.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+        * UIProcess/Plugins/PluginInfoStore.cpp: Ditto.
+        * UIProcess/Plugins/PluginProcessManager.h: Ditto.
+        * UIProcess/Plugins/PluginProcessProxy.cpp:
+        (WebKit::PluginProcessProxy::PluginProcessProxy): Ditto.
+        (WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch): Changed PLATFORM(MAC)
+        to OS(DARWIN).
+        (WebKit::PluginProcessProxy::didClose): Changed PLATFORM(MAC) to PLATFORM(COCOA).
+        (WebKit::PluginProcessProxy::didFinishLaunching): Changed PLATFORM(MAC) to OS(DARWIN) around
+        use of Mach-based IPC, and to PLATFORM(COCOA) around SetQOS.
+        (WebKit::PluginProcessProxy::didCreateWebProcessConnection): Changed PLATFORM(MAC) to
+        OS(DARWIN).
+        * UIProcess/Plugins/PluginProcessProxy.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+        * UIProcess/Plugins/PluginProcessProxy.messages.in: Ditto.
+        * UIProcess/TextChecker.h: Ditto.
+        * UIProcess/WebContext.cpp: Ditto.
+        (WebKit::WebContext::ensureNetworkProcess):
+        (WebKit::WebContext::createNewWebProcess):
+        (WebKit::WebContext::setHTTPPipeliningEnabled):
+        (WebKit::WebContext::httpPipeliningEnabled):
+        (WebKit::WebContext::pluginInfoStoreDidLoadPlugins):
+        * UIProcess/WebContext.h: Ditto.
+        * UIProcess/WebContext.messages.in: Ditto.
+        * UIProcess/WebContextUserMessageCoders.h: Ditto.
+        (WebKit::WebContextUserMessageEncoder::encode):
+        (WebKit::WebContextUserMessageDecoder::decode):
+        * UIProcess/WebCookieManagerProxy.cpp: Ditto.
+        (WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
+        * UIProcess/WebCookieManagerProxy.h: Ditto.
+        * UIProcess/WebFormSubmissionListenerProxy.h: Ditto.
+        * UIProcess/WebFramePolicyListenerProxy.h: Ditto.
+        * UIProcess/WebInspectorProxy.h: Added !PLATFORM(IOS) around members reltated to managing
+        the inspector window and its view.
+        * UIProcess/WebPageProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::initializeWebPage):
+        (WebKit::WebPageProxy::recordNavigationSnapshot):
+        (WebKit::WebPageProxy::canShowMIMEType):
+        (WebKit::canCoalesce):
+        (WebKit::coalesce):
+        (WebKit::WebPageProxy::findPlugin):
+        (WebKit::WebPageProxy::editorStateChanged):
+        (WebKit::WebPageProxy::contextMenuItemSelected):
+        (WebKit::WebPageProxy::didReceiveEvent):
+        (WebKit::WebPageProxy::didBlockInsecurePluginVersion):
+        * UIProcess/WebPageProxy.h: Ditto.
+        * UIProcess/WebPageProxy.messages.in: Ditto.
+        * UIProcess/WebProcessProxy.cpp: Ditto.
+        (WebKit::WebProcessProxy::WebProcessProxy):
+        (WebKit::WebProcessProxy::createWebPage):
+        (WebKit::WebProcessProxy::addExistingWebPage):
+        (WebKit::WebProcessProxy::removeWebPage):
+        (WebKit::WebProcessProxy::didFinishLaunching):
+        (WebKit::WebProcessProxy::pageSuppressibilityChanged):
+        (WebKit::WebProcessProxy::pagePreferencesChanged):
+        * UIProcess/WebProcessProxy.h: Ditto.
+        * UIProcess/cf/WebPreferencesCF.cpp: Removed this file which was not used in any
+        configuration.
+        * UIProcess/ios/WebInspectorProxyIOS.mm: Removed functions that no longer need to be
+        implemented for iOS.
+        * WebKit2.xcodeproj/project.pbxproj: Removed reference to WebPreferencesCF.cpp.
+
 2014-02-15  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -1587 +1587 @@
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 struct ComputedPagesContext {
     ComputedPagesContext(WKPageComputePagesForPrintingFunction callback, void* context)

trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp

@@ -93 +93 @@
     RefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
     reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
 #else

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp

@@ -40 +40 @@
     , m_webPageProxy(webPageProxy)
     , m_size(webPageProxy->viewSize())
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     , m_exposedRectChangedTimer(this, &DrawingAreaProxy::exposedRectChangedTimerFired)
 #endif
@@ -63 +63 @@
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 void DrawingAreaProxy::setExposedRect(const FloatRect& exposedRect)
 {

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

@@ -74 +74 @@
     virtual void commitTransientZoom(double, WebCore::FloatPoint) { }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual void setExposedRect(const WebCore::FloatRect&);
     WebCore::FloatRect exposedRect() const { return m_exposedRect; }
@@ -108 +108 @@
     virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const UpdateInfo&) { }
     virtual void updateAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const LayerTreeContext&) { }
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual void didUpdateGeometry() { }
     virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& newIntrinsicContentSize) { }

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in

@@ -28 +28 @@
     UpdateAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::LayerTreeContext context)
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // Used by TiledCoreAnimationDrawingAreaProxy.
     DidUpdateGeometry()

trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp

@@ -55 +55 @@
     if (!m_client) {
         // FIXME: Make Identifier a move-only object and release port rights/connections in the destructor.
-#if PLATFORM(MAC)
+#if OS(DARWIN)
         if (identifier.port)
             mach_port_mod_refs(mach_task_self(), identifier.port, MACH_PORT_RIGHT_RECEIVE, -1);

trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h

@@ -62 +62 @@
         ProcessType processType;
         HashMap<String, String> extraInitializationData;
-#if PLATFORM(MAC)
+#if OS(DARWIN)
         static const cpu_type_t MatchCurrentArchitecture = 0;
         cpu_type_t architecture;

trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h

@@ -31 +31 @@
 #include "MessageReceiver.h"
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/HashMap.h>
 #include <wtf/RetainPtr.h>
@@ -60 +60 @@
     WebContext& m_webContext;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     typedef HashMap<uint64_t, RetainPtr<WKCustomProtocolLoader>> LoaderMap;
     LoaderMap m_loaderMap;

trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp

@@ -110 +110 @@
         RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
         reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
 #elif USE(UNIX_DOMAIN_SOCKETS)
@@ -162 +162 @@
     RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
     reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
 #elif USE(UNIX_DOMAIN_SOCKETS)
@@ -194 +194 @@
     m_numPendingConnectionRequests = 0;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (m_webContext.processSuppressionEnabled())
         setProcessSuppressionEnabled(true);

trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h

@@ -58 +58 @@
     DownloadProxy* createDownloadProxy();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void setProcessSuppressionEnabled(bool);
 #endif

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -35 +35 @@
 #include <wtf/Forward.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "PluginComplexTextInputState.h"
 
@@ -73 +73 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 struct ColorSpaceData;
 #endif
@@ -167 +167 @@
     virtual bool canUndoRedo(WebPageProxy::UndoOrRedo) = 0;
     virtual void executeUndoRedo(WebPageProxy::UndoOrRedo) = 0;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) = 0;
     virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, Vector<WebCore::KeypressCommand>&) = 0;
@@ -237 +237 @@
 #endif // USE(DICTATION_ALTERNATIVES)
 #endif // USE(APPKIT)
-#endif // PLATFORM(MAC)
+#endif // !PLATFORM(IOS) && PLATFORM(MAC)
 
 #if PLATFORM(IOS)

trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

@@ -172 +172 @@
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 PluginModuleLoadPolicy PluginInfoStore::defaultLoadPolicyForPlugin(const PluginModuleInfo&)
 {

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h

@@ -64 +64 @@
     void clearSiteData(const PluginModuleInfo&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void setProcessSuppressionEnabled(bool);
 #endif

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp

@@ -40 +40 @@
 #include <wtf/RunLoop.h>
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
 #include "MachPort.h"
 #endif
@@ -64 +64 @@
     , m_pluginProcessToken(pluginProcessToken)
     , m_numPendingConnectionRequests(0)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     , m_modalWindowIsShowing(false)
     , m_fullscreenWindowIsShowing(false)
@@ -138 +138 @@
         RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
         reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND), false);
 #elif USE(UNIX_DOMAIN_SOCKETS)
@@ -159 +159 @@
 void PluginProcessProxy::didClose(IPC::Connection*)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (m_modalWindowIsShowing)
         endModal();
@@ -189 +189 @@
 
     m_connection = IPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
-#if PLATFORM(MAC)
+#if OS(DARWIN)
     m_connection->setShouldCloseConnectionOnMachExceptions();
 #endif
@@ -209 +209 @@
     m_connection->send(Messages::PluginProcess::InitializePluginProcess(parameters), 0);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     m_connection->send(Messages::PluginProcess::SetQOS(pluginProcessLatencyQOS(), pluginProcessThroughputQOS()), 0);
 #endif
@@ -229 +229 @@
     m_numPendingConnectionRequests = 0;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (WebContext::processSuppressionIsEnabledForAllContexts())
         setProcessSuppressionEnabled(true);
@@ -242 +242 @@
     RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
     reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND), supportsAsynchronousPluginInitialization);
 #elif USE(UNIX_DOMAIN_SOCKETS)

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

@@ -38 +38 @@
 #include <wtf/Deque.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS NSObject;
@@ -64 +64 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 int pluginProcessLatencyQOS();
 int pluginProcessThroughputQOS();
@@ -89 +89 @@
     bool isValid() const { return m_connection; }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void setProcessSuppressionEnabled(bool);
 
@@ -126 +126 @@
     void didClearSiteData(uint64_t callbackID);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     bool getPluginProcessSerialNumber(ProcessSerialNumber&);
     void makePluginProcessTheFrontProcess();
@@ -176 +176 @@
     unsigned m_numPendingConnectionRequests;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<NSObject> m_activationObserver;
     RetainPtr<WKPlaceholderModalWindow *> m_placeholderWindow;

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in

@@ -29 +29 @@
     DidClearSiteData(uint64_t callbackID)
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     SetModalWindowIsShowing(bool modalWindowIsShowing)
     SetFullscreenWindowIsShowing(bool fullscreenWindowIsShowing)

trunk/Source/WebKit2/UIProcess/TextChecker.h

@@ -44 +44 @@
     static void setGrammarCheckingEnabled(bool);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     static void setAutomaticSpellingCorrectionEnabled(bool);
     static void setAutomaticQuoteSubstitutionEnabled(bool);

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -212 +212 @@
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 void WebContext::platformInitialize()
 {
@@ -394 +394 @@
     m_networkProcess->send(Messages::NetworkProcess::InitializeNetworkProcess(parameters), 0);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     m_networkProcess->send(Messages::NetworkProcess::SetQOS(networkProcessLatencyQOS(), networkProcessThroughputQOS()), 0);
 #endif
@@ -616 +616 @@
     process->send(Messages::WebProcess::InitializeWebProcess(parameters, WebContextUserMessageEncoder(injectedBundleInitializationUserData.get(), *process)), 0);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     process->send(Messages::WebProcess::SetQOS(webProcessLatencyQOS(), webProcessThroughputQOS()), 0);
 #endif
@@ -1208 +1208 @@
 void WebContext::setHTTPPipeliningEnabled(bool enabled)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     ResourceRequest::setHTTPPipeliningEnabled(enabled);
 #else
@@ -1217 +1217 @@
 bool WebContext::httpPipeliningEnabled() const
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     return ResourceRequest::httpPipeliningEnabled();
 #else
@@ -1278 +1278 @@
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 void WebContext::dummy(bool&)
 {
@@ -1373 +1373 @@
         map.set(ASCIILiteral("mimes"), API::Array::create(std::move(mimeTypes)));
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         map.set(ASCIILiteral("bundleId"), API::String::create(pluginModule.bundleIdentifier));
         map.set(ASCIILiteral("version"), API::String::create(pluginModule.versionString));

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -62 +62 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSObject;
 OBJC_CLASS NSString;
@@ -87 +87 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 int networkProcessLatencyQOS();
 int networkProcessThroughputQOS();
@@ -263 +263 @@
     void setJavaScriptGarbageCollectorTimerEnabled(bool flag);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     static bool omitPDFSupport();
 #endif
@@ -294 +294 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     bool processSuppressionEnabled() const;
     static bool processSuppressionIsEnabledForAllContexts();
@@ -328 +328 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void updateProcessSuppressionState() const;
 #endif
@@ -349 +349 @@
 #endif
 
-#if PLATFORM(MAC)
 #if PLATFORM(IOS)
     void writeWebContentToPasteboard(const WebCore::PasteboardWebContent&);
@@ -359 +358 @@
     void getPasteboardItemsCount(uint64_t& itemsCount);
 #endif
+#if PLATFORM(COCOA)
     void getPasteboardTypes(const String& pasteboardName, Vector<String>& pasteboardTypes);
     void getPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, Vector<String>& pathnames);
@@ -375 +375 @@
 #endif
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
     // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
     // any synchronous messages, and should be removed when <rdar://problem/8775115> is fixed.
@@ -407 +407 @@
     String platformDefaultCookieStorageDirectory() const;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void registerNotificationObservers();
     void unregisterNotificationObservers();
@@ -486 +486 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
     RetainPtr<NSObject> m_enhancedAccessibilityObserver;
     RetainPtr<NSObject> m_automaticTextReplacementNotificationObserver;
     RetainPtr<NSObject> m_automaticSpellingCorrectionNotificationObserver;
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     RetainPtr<NSObject> m_automaticQuoteSubstitutionNotificationObserver;
     RetainPtr<NSObject> m_automaticDashSubstitutionNotificationObserver;

trunk/Source/WebKit2/UIProcess/WebContext.messages.in

@@ -38 +38 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     # Pasteboard messages.
     GetPasteboardTypes(String pasteboardName) -> (Vector<String> types)
@@ -56 +56 @@
 #endif
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
     // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
     // any synchronous messages, and should be removed when <rdar://problem/8775115> is fixed.

trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h

@@ -31 +31 @@
 #include "WebPageProxy.h"
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "ObjCObjectGraphCoders.h"
 #endif
@@ -80 +80 @@
             break;
         }
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         case API::Object::Type::ObjCObjectGraph: {
             ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
@@ -149 +149 @@
             break;
         }
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         case API::Object::Type::ObjCObjectGraph: {
             RefPtr<ObjCObjectGraph> objectGraph;

trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp

@@ -147 +147 @@
 void WebCookieManagerProxy::setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     persistHTTPCookieAcceptPolicy(policy);
 #endif

trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h

@@ -98 +98 @@
     virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void persistHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
 #endif

trunk/Source/WebKit2/UIProcess/WebFormSubmissionListenerProxy.h

@@ -29 +29 @@
 #include "WebFrameListenerProxy.h"
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WKFoundation.h"
 #endif
 
-#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(MAC) && WK_API_ENABLED)
+#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(COCOA) && WK_API_ENABLED)
 
 namespace WebKit {

trunk/Source/WebKit2/UIProcess/WebFramePolicyListenerProxy.h

@@ -29 +29 @@
 #include "WebFrameListenerProxy.h"
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WKFoundation.h"
 #endif
 
-#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(MAC) && WK_API_ENABLED)
+#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(COCOA) && WK_API_ENABLED)
 
 namespace WebKit {

trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h

@@ -37 +37 @@
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
 #include "WKGeometry.h"
 #include <wtf/HashMap.h>
@@ -94 +94 @@
     void close();
     
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
     void createInspectorWindow();
     void updateInspectorWindowTitle() const;
@@ -225 +225 @@
     AttachmentSide m_attachmentSide;
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
     RetainPtr<WKWebInspectorWKView> m_inspectorView;
     RetainPtr<NSWindow> m_inspectorWindow;

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -129 +129 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "ViewSnapshotStore.h"
 #endif
@@ -305 +305 @@
     , m_session(*configuration.session)
     , m_isPageSuspended(false)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     , m_isSmartInsertDeleteEnabled(TextChecker::isSmartInsertDeleteEnabled())
 #endif
@@ -574 +574 @@
     process().send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled));
 #endif
@@ -784 +784 @@
         return;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     ViewSnapshotStore::shared().recordSnapshot(*this);
 #endif
@@ -888 +888 @@
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // On Mac, we can show PDFs.
     if (MIMETypeRegistry::isPDFOrPostScriptMIMEType(mimeType) && !WebContext::omitPDFSupport())
         return true;
-#endif // PLATFORM(MAC)
+#endif // PLATFORM(COCOA)
 
     return false;
@@ -1222 +1222 @@
     if (a.granularity() != b.granularity())
         return false;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (a.phase() != b.phase())
         return false;
@@ -1241 +1241 @@
     FloatSize mergedWheelTicks = a.wheelTicks() + b.wheelTicks();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     FloatSize mergedUnacceleratedScrollingDelta = a.unacceleratedScrollingDelta() + b.unacceleratedScrollingDelta();
 
@@ -1373 +1373 @@
     pluginLoadPolicy = PluginInfoStore::defaultLoadPolicyForPlugin(plugin);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RefPtr<ImmutableDictionary> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, String(), pageURLString, String(), String());
     pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription);
@@ -3041 +3041 @@
 void WebPageProxy::editorStateChanged(const EditorState& editorState)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     bool couldChangeSecureInputState = m_editorState.isInPasswordField != editorState.isInPasswordField || m_editorState.selectionIsNone;
     bool closedComposition = !editorState.shouldIgnoreCompositionSelectionChange && !editorState.hasComposition && (m_editorState.hasComposition || m_temporarilyClosedComposition);
@@ -3049 +3049 @@
     m_editorState = editorState;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // Selection being none is a temporary state when editing. Flipping secure input state too quickly was causing trouble (not fully understood).
     if (couldChangeSecureInputState && !editorState.selectionIsNone)
@@ -3283 +3283 @@
     }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (item.action() == ContextMenuItemTagSmartCopyPaste) {
         setSmartInsertDeleteEnabled(!isSmartInsertDeleteEnabled());
@@ -3585 +3585 @@
             if (m_uiClient->implementsDidNotHandleWheelEvent())
                 m_uiClient->didNotHandleWheelEvent(this, oldestCoalescedEvent->last());
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
             m_pageClient.wheelEventWasNotHandledByWebCore(oldestCoalescedEvent->last());
 #endif
@@ -4183 +4183 @@
     RefPtr<ImmutableDictionary> pluginInformation;
 
-#if PLATFORM(MAC) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLATFORM(COCOA) && ENABLE(NETSCAPE_PLUGIN_API)
     String newMimeType = mimeType;
     PluginModuleInfo plugin = m_process->context().pluginInfoStore().findPlugin(newMimeType, URL(URL(), pluginURLString));
@@ -4258 +4258 @@
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 void WebPageProxy::drawRectToImage(WebFrameProxy* frame, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, PassRefPtr<ImageCallback> prpCallback)
 {
@@ -4413 +4413 @@
 #endif // !PLATFORM(IOS) && PLATFORM(MAC)
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 RetainPtr<CGImageRef> WebPageProxy::takeViewSnapshot()
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -94 +94 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <WebCore/PlatformLayer.h>
 #endif
@@ -497 +497 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void windowAndViewFramesChanged(const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates);
     void setMainFrameIsScrollable(bool);
@@ -524 +524 @@
     void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize);
 #endif
-#endif // PLATFORM(MAC)
+#endif // PLATFORM(COCOA)
 #if PLATFORM(EFL)
     void handleInputMethodKeydown(bool& handled);
@@ -633 +633 @@
     unsigned pageCount() const { return m_pageCount; }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // Called by the web process through a message.
     void registerWebProcessAccessibilityToken(const IPC::DataReference&);
@@ -684 +684 @@
     void drawFooter(WebFrameProxy*, const WebCore::FloatRect&);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // Dictionary.
     void performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
@@ -702 +702 @@
     void didPerformDragControllerAction(WebCore::DragSession);
     void dragEnded(const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t operation);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void setDragImage(const WebCore::IntPoint& clientPosition, const ShareableBitmap::Handle& dragImageHandle, bool isLinkDrag);
     void setPromisedData(const String& pasteboardName, const SharedMemory::Handle& imageHandle, uint64_t imageSize, const String& filename, const String& extension,
@@ -729 +729 @@
     void registerEditCommand(PassRefPtr<WebEditCommandProxy>, UndoOrRedo);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void registerKeypressCommandName(const String& name) { m_knownKeypressCommandNames.add(name); }
     bool isValidKeypressCommandName(const String& name) const { return m_knownKeypressCommandNames.contains(name); }
@@ -783 +783 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     bool isSmartInsertDeleteEnabled() const { return m_isSmartInsertDeleteEnabled; }
     void setSmartInsertDeleteEnabled(bool);
@@ -798 +798 @@
     void endPrinting();
     void computePagesForPrinting(WebFrameProxy*, const PrintInfo&, PassRefPtr<ComputedPagesCallback>);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void drawRectToImage(WebFrameProxy*, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, PassRefPtr<ImageCallback>);
     void drawPagesToPDF(WebFrameProxy*, const PrintInfo&, uint32_t first, uint32_t count, PassRefPtr<DataCallback>);
@@ -807 +807 @@
     PageLoadState& pageLoadState() { return m_pageLoadState; }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void handleAlternativeTextUIResult(const String& result);
 #endif
@@ -813 +813 @@
     void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data*);
     void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const IPC::DataReference&);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void savePDFToTemporaryFolderAndOpenWithNativeApplicationRaw(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID);
     void savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const IPC::DataReference&, const String& pdfUUID);
@@ -884 +884 @@
     void recordNavigationSnapshot();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<CGImageRef> takeViewSnapshot();
 #endif
@@ -1046 +1046 @@
 
     // Keyboard handling
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void interpretQueuedKeyEvent(const EditorState&, bool& handled, Vector<WebCore::KeypressCommand>&);
     void executeSavedCommandBySelector(const String& selector, bool& handled);
@@ -1073 +1073 @@
     void loadRecentSearches(const String&, Vector<String>&);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // Speech.
     void getIsSpeaking(bool&);
@@ -1135 +1135 @@
     void didReceiveAuthenticationChallenge(uint64_t frameID, const WebCore::AuthenticationChallenge&, uint64_t challengeID);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus);
     void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, uint64_t complexTextInputState);
@@ -1261 +1261 @@
     HashSet<WebEditCommandProxy*> m_editCommandSet;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     HashSet<String> m_knownKeypressCommandNames;
 #endif
@@ -1358 +1358 @@
     bool m_isPageSuspended;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     bool m_isSmartInsertDeleteEnabled;
 #endif
@@ -1418 +1418 @@
     bool m_waitingForDidUpdateViewState;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     HashMap<String, String> m_temporaryPDFFiles;
 #endif

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -243 +243 @@
     DidPerformDragControllerAction(WebCore::DragSession dragSession)
 #endif
-#if PLATFORM(MAC) && ENABLE(DRAG_SUPPORT)
+#if PLATFORM(COCOA) && ENABLE(DRAG_SUPPORT)
     SetDragImage(WebCore::IntPoint clientPosition, WebKit::ShareableBitmap::Handle dragImage, bool linkDrag)
     SetPromisedData(String pasteboardName, WebKit::SharedMemory::Handle imageHandle, uint64_t imageSize, String filename, String extension, String title, String url, String visibleURL, WebKit::SharedMemory::Handle archiveHandle, uint64_t archiveSize)
@@ -251 +251 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     # Dictionary support.
     DidPerformDictionaryLookup(WebKit::AttributedString text, WebKit::DictionaryPopupInfo dictionaryPopupInfo)
@@ -323 +323 @@
     SavePDFToFileInDownloadsFolder(String suggestedFilename, String originatingURLString, IPC::DataReference data)
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     SavePDFToTemporaryFolderAndOpenWithNativeApplication(String suggestedFilename, String originatingURLString, IPC::DataReference data, String pdfUUID)
     OpenPDFFromTemporaryFolderWithNativeApplication(String pdfUUID)

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -53 +53 @@
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "PDFPlugin.h"
 #endif
@@ -93 +93 @@
     , m_customProtocolManagerProxy(this, context)
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     , m_processSuppressionEnabled(false)
 #endif
@@ -175 +175 @@
     m_pageMap.set(pageID, webPage.get());
     globalPageMap().set(pageID, webPage.get());
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (webPage->isProcessSuppressible())
         m_processSuppressiblePages.add(pageID);
@@ -187 +187 @@
     m_pageMap.set(pageID, webPage);
     globalPageMap().set(pageID, webPage);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (webPage->isProcessSuppressible())
         m_processSuppressiblePages.add(pageID);
@@ -198 +198 @@
     m_pageMap.remove(pageID);
     globalPageMap().remove(pageID);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     m_processSuppressiblePages.remove(pageID);
     updateProcessSuppressionState();
@@ -286 +286 @@
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 bool WebProcessProxy::fullKeyboardAccessEnabled()
 {
@@ -450 +450 @@
     m_context->processDidFinishLaunching(this);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     updateProcessSuppressionState();
 #endif
@@ -609 +609 @@
 void WebProcessProxy::pageSuppressibilityChanged(WebKit::WebPageProxy *page)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (page->isProcessSuppressible())
         m_processSuppressiblePages.add(page->pageID());
@@ -622 +622 @@
 void WebProcessProxy::pagePreferencesChanged(WebKit::WebPageProxy *page)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (page->isProcessSuppressible())
         m_processSuppressiblePages.add(page->pageID());

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -114 +114 @@
     void releasePageCache();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     bool allPagesAreProcessSuppressible() const;
     void updateProcessSuppressionState();
@@ -206 +206 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     HashSet<uint64_t> m_processSuppressiblePages;
     bool m_processSuppressionEnabled;

trunk/Source/WebKit2/UIProcess/ios/WebInspectorProxyIOS.mm

@@ -32 +32 @@
 
 namespace WebKit {
-
-void WebInspectorProxy::createInspectorWindow()
-{
-    notImplemented();
-}
-
-void WebInspectorProxy::updateInspectorWindowTitle() const
-{
-    notImplemented();
-}
 
 WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
@@ -81 +71 @@
 
 void WebInspectorProxy::platformAppend(const String& suggestedURL, const String& content)
-{
-    notImplemented();
-}
-
-void WebInspectorProxy::inspectedViewFrameDidChange(CGFloat)
 {
     notImplemented();

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -1031 +1031 @@
                 BC2D021712AC41CB00E732A3 /* SameDocumentNavigationType.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2D021612AC41CB00E732A3 /* SameDocumentNavigationType.h */; };
                 BC2D021912AC426C00E732A3 /* WKPageLoadTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2D021812AC426C00E732A3 /* WKPageLoadTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                BC2DFBA312A761A500E732A3 /* WebPreferencesCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2DFBA212A761A500E732A3 /* WebPreferencesCF.cpp */; };
                 BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2E6E7D1141970C00A63B1E /* WorkQueue.cpp */; };
                 BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E6E7E1141970C00A63B1E /* WorkQueue.h */; };
@@ -2791 +2790 @@
                 BC2D021612AC41CB00E732A3 /* SameDocumentNavigationType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SameDocumentNavigationType.h; sourceTree = "<group>"; };
                 BC2D021812AC426C00E732A3 /* WKPageLoadTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageLoadTypes.h; sourceTree = "<group>"; };
-                BC2DFBA212A761A500E732A3 /* WebPreferencesCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPreferencesCF.cpp; path = cf/WebPreferencesCF.cpp; sourceTree = "<group>"; };
                 BC2E6E7D1141970C00A63B1E /* WorkQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueue.cpp; sourceTree = "<group>"; };
                 BC2E6E7E1141970C00A63B1E /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
@@ -4719 +4717 @@
                                 51B3004E12529D0E000B5CA0 /* WebBackForwardListCF.cpp */,
                                 51B3004F12529D0E000B5CA0 /* WebPageProxyCF.cpp */,
-                                BC2DFBA212A761A500E732A3 /* WebPreferencesCF.cpp */,
                         );
                         name = cf;
@@ -8122 +8119 @@
                                 BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */,
                                 BCD59800112B57BE00EC8C23 /* WebPreferences.cpp in Sources */,
-                                BC2DFBA312A761A500E732A3 /* WebPreferencesCF.cpp in Sources */,
                                 BC84EB1812A7100C0083F2DA /* WebPreferencesMac.mm in Sources */,
                                 BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */,