Changeset 164192 in webkit


Ignore:
Timestamp:
Feb 16, 2014 12:38:41 PM (10 years ago)
Author:
mitz@apple.com
Message:

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

Reviewed by Anders Carlsson.

Source/WebCore:

  • loader/FrameLoaderClient.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/Cursor.h: Changed PLATFORM(MAC) to USE(APPKIT) around uses of NSCursor.
  • platform/LocalizedStrings.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/graphics/PlatformLayer.h: Ditto.
  • platform/graphics/cg/PDFDocumentImage.cpp: Ditto.
  • rendering/RenderLayerCompositor.cpp: Ditto.

(WebCore::RenderLayerCompositor::requiresContentShadowLayer):
(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):

Source/WebKit2:

  • Configurations/WebKit2.xcconfig: Removed PageBannerMac.mm and WKBundlePageBannerMac.mm

from EXCLUDED_SOURCE_FILE_NAMES_iphoneos, now that these files are guarded with
!PLATFORM(IOS).

  • WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: Changed PLATFORM(MAC) to

PLATFORM(COCOA).
(WKBundleFrameCopyWebArchiveFilteringSubframes):

  • WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm: Guarded with !PLATFORM(IOS).
  • WebProcess/InjectedBundle/InjectedBundle.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::InjectedBundle::setPrivateBrowsingEnabled):

  • WebProcess/InjectedBundle/InjectedBundle.h: Changed PLATFORM(MAC) to USE(FOUNDATION)

around use of NSBundle.

  • WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h: Changed PLATFORM(MAC) to

PLATFORM(COCOA).
(WebKit::InjectedBundleUserMessageEncoder::encode):
(WebKit::InjectedBundleUserMessageDecoder::decode):

  • WebProcess/Network/WebResourceLoader.cpp: Ditto.

(WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):

  • WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: Ditto.

(WebKit::NPN_GetValue):
(WebKit::NPN_SetValue):
(WebKit::initializeBrowserFuncs):

  • WebProcess/Plugins/Netscape/NetscapePlugin.cpp: Ditto.

(WebKit::NetscapePlugin::NetscapePlugin):
(WebKit::NetscapePlugin::supportsSnapshotting):

  • WebProcess/Plugins/Netscape/NetscapePlugin.h: Ditto.
  • WebProcess/Plugins/Plugin.cpp: Ditto.

(WebKit::Plugin::Parameters::encode):
(WebKit::Plugin::Parameters::decode):

  • WebProcess/Plugins/Plugin.h: Ditto.
  • WebProcess/Plugins/PluginController.h: Ditto.
  • WebProcess/Plugins/PluginProcessConnectionManager.cpp: Changed PLATFORM(MAC) to

USE(DARWIN) around use of Mach-based IPC.
(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):

  • WebProcess/Plugins/PluginProxy.cpp: Chanegd PLATFORM(MAC) to PLATFORM(COCOA).
  • WebProcess/Plugins/PluginProxy.h: Ditto.
  • WebProcess/Plugins/PluginProxy.messages.in: Ditto.
  • WebProcess/Plugins/PluginView.cpp: Ditto.

(WebKit::PluginView::destroyPluginAndReset):
(WebKit::PluginView::viewStateDidChange):
(WebKit::PluginView::didInitializePlugin):
(WebKit::PluginView::invalidateRect):
(WebKit::PluginView::pluginSnapshotTimerFired):

  • WebProcess/Plugins/PluginView.h: Ditto.
  • WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp: Ditto.
  • WebProcess/WebCoreSupport/WebChromeClient.cpp: Ditto.

(WebKit::WebChromeClient::windowRect):

  • WebProcess/WebCoreSupport/WebChromeClient.h: Ditto.
  • WebProcess/WebCoreSupport/WebContextMenuClient.cpp: Ditto.
  • WebProcess/WebCoreSupport/WebContextMenuClient.h: Ditto.
  • WebProcess/WebCoreSupport/WebDragClient.cpp: Ditto.
  • WebProcess/WebCoreSupport/WebDragClient.h: Ditto.
  • WebProcess/WebCoreSupport/WebEditorClient.cpp: Ditto.

(WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection):

  • WebProcess/WebCoreSupport/WebEditorClient.h: Ditto.
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: Ditto.

(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
(WebKit::WebFrameLoaderClient::createPlugin):

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.h: Ditto.
  • WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Ditto.
  • WebProcess/WebCoreSupport/WebPlatformStrategies.h: Ditto.
  • WebProcess/WebCoreSupport/mac/WebSystemInterface.mm: Removed PLATFORM(MAC).

(InitWebCoreSystemInterface):

  • WebProcess/WebPage/DrawingArea.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::DrawingArea::create):

  • WebProcess/WebPage/DrawingArea.h: Ditto.
  • WebProcess/WebPage/DrawingArea.messages.in: Ditto.
  • WebProcess/WebPage/EventDispatcher.cpp: Ditto.

(WebKit::EventDispatcher::wheelEvent):

  • WebProcess/WebPage/LayerTreeHost.h: Ditto.
  • WebProcess/WebPage/PageBanner.cpp: Added !PLATFORM(IOS)
  • WebProcess/WebPage/PageBanner.h: Ditto.
  • WebProcess/WebPage/WebFrame.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • WebProcess/WebPage/WebFrame.h: Ditto.
  • WebProcess/WebPage/WebInspector.cpp: Ditto.

(WebKit::WebInspector::WebInspector):

  • WebProcess/WebPage/WebInspector.h: Ditto.
  • WebProcess/WebPage/WebPage.cpp: Ditto.

(WebKit::WebPage::WebPage):
(WebKit::isContextClick):
(WebKit::WebPage::getSelectionAsWebArchiveData):
(WebKit::WebPage::getWebArchiveOfFrame):
(WebKit::WebPage::updatePreferences):
(WebKit::WebPage::sendSetWindowFrame):
(WebKit::WebPage::beginPrinting):
(WebKit::WebPage::computePagesForPrinting):

  • WebProcess/WebPage/WebPage.h: Ditto.
  • WebProcess/WebPage/WebPage.messages.in: Ditto.
  • WebProcess/WebPage/mac/PageBannerMac.mm: Guarded with !PLATFORM(IOS).
  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess): Changed PLATFORM(MAC) to PLATFORM(COCOA).
(WebKit::WebProcess::initializeWebProcess): Ditto.
(WebKit::WebProcess::ensureNetworkProcessConnection): Changed PLATFORM(MAC) to OS(DARWIN).
(WebKit::WebProcess::ensurePrivateBrowsingSession): Changed PLATFORM(MAC) to
PLATFORM(COCOA).
(WebKit::WebProcess::destroyPrivateBrowsingSession): Ditto.
(WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Changed PLATFORM(MAC) to
OS(DARWIN).
(WebKit::WebProcess::nonVisibleProcessCleanupTimerFired): Changed PLATFORM(MAC) to
PLATFORM(COCOA)

  • WebProcess/WebProcess.h: Ditto.
  • WebProcess/WebProcess.messages.in: Removed PLATFORM(MAC) guard around

SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.

Location:
trunk/Source
Files:
59 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r164191 r164192  
     12014-02-16  Dan Bernstein  <mitz@apple.com>
     2
     3        Stop using PLATFORM(MAC) in Source except where it means “OS X but not iOS”
     4        https://bugs.webkit.org/show_bug.cgi?id=128885
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * loader/FrameLoaderClient.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     9        * platform/Cursor.h: Changed PLATFORM(MAC) to USE(APPKIT) around uses of NSCursor.
     10        * platform/LocalizedStrings.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     11        * platform/graphics/PlatformLayer.h: Ditto.
     12        * platform/graphics/cg/PDFDocumentImage.cpp: Ditto.
     13        * rendering/RenderLayerCompositor.cpp: Ditto.
     14        (WebCore::RenderLayerCompositor::requiresContentShadowLayer):
     15        (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
     16
    1172014-02-16  Dan Bernstein  <mitz@apple.com>
    218

  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r163722 r164192  
    3939#include <wtf/Vector.h>
    4040
    41 #if PLATFORM(MAC)
     41#if PLATFORM(COCOA)
    4242#ifdef __OBJC__
    4343#import <Foundation/Foundation.h>
    … …  
    5050typedef class _jobject* jobject;
    5151
    52 #if PLATFORM(MAC) && !defined(__OBJC__)
    53 class NSCachedURLResponse;
    54 class NSView;
     52#if PLATFORM(COCOA)
     53OBJC_CLASS NSCachedURLResponse;
     54OBJC_CLASS NSView;
    5555#endif
    5656
    … …  
    283283        virtual void registerForIconNotification(bool listen = true) = 0;
    284284
    285 #if PLATFORM(MAC)
     285#if PLATFORM(COCOA)
    286286        // Allow an accessibility object to retrieve a Frame parent if there's no PlatformWidget.
    287287        virtual RemoteAXObjectRef accessibilityRemoteObject() = 0;

  • trunk/Source/WebCore/platform/Cursor.h

    r163657 r164192  
    4343#endif
    4444
    45 #if PLATFORM(MAC) && !PLATFORM(IOS)
     45#if USE(APPKIT)
    4646OBJC_CLASS NSCursor;
    4747#endif
    … …  
    6767    };
    6868    typedef RefPtr<SharedCursor> PlatformCursor;
    69 #elif PLATFORM(MAC) && !PLATFORM(IOS)
     69#elif USE(APPKIT)
    7070    typedef NSCursor *PlatformCursor;
    7171#elif PLATFORM(GTK)
    … …  
    174174#endif
    175175
    176 #if !PLATFORM(MAC)
     176#if !USE(APPKIT)
    177177        mutable PlatformCursor m_platformCursor;
    178178#else

  • trunk/Source/WebCore/platform/LocalizedStrings.cpp

    r164181 r164192  
    10751075}
    10761076   
    1077 #if PLATFORM(MAC) || PLATFORM(WIN)
     1077#if PLATFORM(COCOA) || PLATFORM(WIN)
    10781078String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language)
    10791079{

  • trunk/Source/WebCore/platform/graphics/PlatformLayer.h

    r163079 r164192  
    2727#define PlatformLayer_h
    2828
    29 #if PLATFORM(MAC)
     29#if PLATFORM(COCOA)
    3030OBJC_CLASS CALayer;
    3131typedef CALayer PlatformLayer;

  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

    r162486 r164192  
    4747#include <wtf/RetainPtr.h>
    4848
    49 #if !PLATFORM(MAC)
     49#if !PLATFORM(COCOA)
    5050#include "ImageSourceCG.h"
    5151#endif

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r164110 r164192  
    27752775        return false;
    27762776
    2777 #if PLATFORM(MAC)
     2777#if PLATFORM(COCOA)
    27782778    if (viewHasTransparentBackground())
    27792779        return false;
    … …  
    30063006
    30073007#endif
    3008 #if PLATFORM(MAC) && USE(CA)
     3008#if PLATFORM(COCOA) && USE(CA)
    30093009            m_layerForHorizontalScrollbar->setAcceleratesDrawing(acceleratedDrawingEnabled());
    30103010#endif
    … …  
    30293029            m_layerForVerticalScrollbar->setName("vertical scrollbar container");
    30303030#endif
    3031 #if PLATFORM(MAC) && USE(CA)
     3031#if PLATFORM(COCOA) && USE(CA)
    30323032            m_layerForVerticalScrollbar->setAcceleratesDrawing(acceleratedDrawingEnabled());
    30333033#endif
    … …  
    30523052            m_layerForScrollCorner->setName("scroll corner");
    30533053#endif
    3054 #if PLATFORM(MAC) && USE(CA)
     3054#if PLATFORM(COCOA) && USE(CA)
    30553055            m_layerForScrollCorner->setAcceleratesDrawing(acceleratedDrawingEnabled());
    30563056#endif

  • trunk/Source/WebKit2/ChangeLog

    r164181 r164192  
     12014-02-16  Dan Bernstein  <mitz@apple.com>
     2
     3        Stop using PLATFORM(MAC) in Source except where it means “OS X but not iOS”
     4        https://bugs.webkit.org/show_bug.cgi?id=128885
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Configurations/WebKit2.xcconfig: Removed PageBannerMac.mm and WKBundlePageBannerMac.mm
     9        from EXCLUDED_SOURCE_FILE_NAMES_iphoneos, now that these files are guarded with
     10        !PLATFORM(IOS).
     11        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: Changed PLATFORM(MAC) to
     12        PLATFORM(COCOA).
     13        (WKBundleFrameCopyWebArchiveFilteringSubframes):
     14        * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm: Guarded with !PLATFORM(IOS).
     15        * WebProcess/InjectedBundle/InjectedBundle.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     16        (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
     17        * WebProcess/InjectedBundle/InjectedBundle.h: Changed PLATFORM(MAC) to USE(FOUNDATION)
     18        around use of NSBundle.
     19        * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h: Changed PLATFORM(MAC) to
     20        PLATFORM(COCOA).
     21        (WebKit::InjectedBundleUserMessageEncoder::encode):
     22        (WebKit::InjectedBundleUserMessageDecoder::decode):
     23        * WebProcess/Network/WebResourceLoader.cpp: Ditto.
     24        (WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
     25        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: Ditto.
     26        (WebKit::NPN_GetValue):
     27        (WebKit::NPN_SetValue):
     28        (WebKit::initializeBrowserFuncs):
     29        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp: Ditto.
     30        (WebKit::NetscapePlugin::NetscapePlugin):
     31        (WebKit::NetscapePlugin::supportsSnapshotting):
     32        * WebProcess/Plugins/Netscape/NetscapePlugin.h: Ditto.
     33        * WebProcess/Plugins/Plugin.cpp: Ditto.
     34        (WebKit::Plugin::Parameters::encode):
     35        (WebKit::Plugin::Parameters::decode):
     36        * WebProcess/Plugins/Plugin.h: Ditto.
     37        * WebProcess/Plugins/PluginController.h: Ditto.
     38        * WebProcess/Plugins/PluginProcessConnectionManager.cpp: Changed PLATFORM(MAC) to
     39        USE(DARWIN) around use of Mach-based IPC.
     40        (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
     41        * WebProcess/Plugins/PluginProxy.cpp: Chanegd PLATFORM(MAC) to PLATFORM(COCOA).
     42        * WebProcess/Plugins/PluginProxy.h: Ditto.
     43        * WebProcess/Plugins/PluginProxy.messages.in: Ditto.
     44        * WebProcess/Plugins/PluginView.cpp: Ditto.
     45        (WebKit::PluginView::destroyPluginAndReset):
     46        (WebKit::PluginView::viewStateDidChange):
     47        (WebKit::PluginView::didInitializePlugin):
     48        (WebKit::PluginView::invalidateRect):
     49        (WebKit::PluginView::pluginSnapshotTimerFired):
     50        * WebProcess/Plugins/PluginView.h: Ditto.
     51        * WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp: Ditto.
     52        * WebProcess/WebCoreSupport/WebChromeClient.cpp: Ditto.
     53        (WebKit::WebChromeClient::windowRect):
     54        * WebProcess/WebCoreSupport/WebChromeClient.h: Ditto.
     55        * WebProcess/WebCoreSupport/WebContextMenuClient.cpp: Ditto.
     56        * WebProcess/WebCoreSupport/WebContextMenuClient.h: Ditto.
     57        * WebProcess/WebCoreSupport/WebDragClient.cpp: Ditto.
     58        * WebProcess/WebCoreSupport/WebDragClient.h: Ditto.
     59        * WebProcess/WebCoreSupport/WebEditorClient.cpp: Ditto.
     60        (WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection):
     61        * WebProcess/WebCoreSupport/WebEditorClient.h: Ditto.
     62        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: Ditto.
     63        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
     64        (WebKit::WebFrameLoaderClient::createPlugin):
     65        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h: Ditto.
     66        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Ditto.
     67        * WebProcess/WebCoreSupport/WebPlatformStrategies.h: Ditto.
     68        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm: Removed PLATFORM(MAC).
     69        (InitWebCoreSystemInterface):
     70        * WebProcess/WebPage/DrawingArea.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     71        (WebKit::DrawingArea::create):
     72        * WebProcess/WebPage/DrawingArea.h: Ditto.
     73        * WebProcess/WebPage/DrawingArea.messages.in: Ditto.
     74        * WebProcess/WebPage/EventDispatcher.cpp: Ditto.
     75        (WebKit::EventDispatcher::wheelEvent):
     76        * WebProcess/WebPage/LayerTreeHost.h: Ditto.
     77        * WebProcess/WebPage/PageBanner.cpp: Added !PLATFORM(IOS)
     78        * WebProcess/WebPage/PageBanner.h: Ditto.
     79        * WebProcess/WebPage/WebFrame.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     80        * WebProcess/WebPage/WebFrame.h: Ditto.
     81        * WebProcess/WebPage/WebInspector.cpp: Ditto.
     82        (WebKit::WebInspector::WebInspector):
     83        * WebProcess/WebPage/WebInspector.h: Ditto.
     84        * WebProcess/WebPage/WebPage.cpp: Ditto.
     85        (WebKit::WebPage::WebPage):
     86        (WebKit::isContextClick):
     87        (WebKit::WebPage::getSelectionAsWebArchiveData):
     88        (WebKit::WebPage::getWebArchiveOfFrame):
     89        (WebKit::WebPage::updatePreferences):
     90        (WebKit::WebPage::sendSetWindowFrame):
     91        (WebKit::WebPage::beginPrinting):
     92        (WebKit::WebPage::computePagesForPrinting):
     93        * WebProcess/WebPage/WebPage.h: Ditto.
     94        * WebProcess/WebPage/WebPage.messages.in: Ditto.
     95        * WebProcess/WebPage/mac/PageBannerMac.mm: Guarded with !PLATFORM(IOS).
     96        * WebProcess/WebProcess.cpp:
     97        (WebKit::WebProcess::WebProcess): Changed PLATFORM(MAC) to PLATFORM(COCOA).
     98        (WebKit::WebProcess::initializeWebProcess): Ditto.
     99        (WebKit::WebProcess::ensureNetworkProcessConnection): Changed PLATFORM(MAC) to OS(DARWIN).
     100        (WebKit::WebProcess::ensurePrivateBrowsingSession): Changed PLATFORM(MAC) to
     101        PLATFORM(COCOA).
     102        (WebKit::WebProcess::destroyPrivateBrowsingSession): Ditto.
     103        (WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Changed PLATFORM(MAC) to
     104        OS(DARWIN).
     105        (WebKit::WebProcess::nonVisibleProcessCleanupTimerFired): Changed PLATFORM(MAC) to
     106        PLATFORM(COCOA)
     107        * WebProcess/WebProcess.h: Ditto.
     108        * WebProcess/WebProcess.messages.in: Removed PLATFORM(MAC) guard around
     109        SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.
     110
    11112014-02-15  Alexey Proskuryakov  <ap@apple.com>
    2112

  • trunk/Source/WebKit2/Configurations/WebKit2.xcconfig

    r163256 r164192  
    4646
    4747EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
    48 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = BuiltInPDFView.mm DownloadMac.mm FindIndicatorWindow.mm NetworkProcessMac.mm PDFViewController.mm PageBannerMac.mm PageClientImpl.mm PasteboardTypes.mm PluginInfoStoreMac.mm PrintInfoMac.mm SecItemShimMethods.mm TextCheckerMac.mm WKAccessibilityWebPageObject.mm WKFullKeyboardAccessWatcher.mm WKInspector.cpp WKPrintingView.mm UIProcess/API/mac/WKView.mm WKBundlePageBannerMac.mm WebContextMenuProxyMac.mm WebEditorClientMac.mm WebInspectorProxyMac.mm WebPageMac.mm WebPageProxyMac.mm WebPlatformTouchPoint.cpp WebProcessMac.mm WebProcessProxyMac.mm WebTouchEvent.cpp *.pdf com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb;
     48EXCLUDED_SOURCE_FILE_NAMES_iphoneos = BuiltInPDFView.mm DownloadMac.mm FindIndicatorWindow.mm NetworkProcessMac.mm PDFViewController.mm PageClientImpl.mm PasteboardTypes.mm PluginInfoStoreMac.mm PrintInfoMac.mm SecItemShimMethods.mm TextCheckerMac.mm WKAccessibilityWebPageObject.mm WKFullKeyboardAccessWatcher.mm WKInspector.cpp WKPrintingView.mm UIProcess/API/mac/WKView.mm WebContextMenuProxyMac.mm WebEditorClientMac.mm WebInspectorProxyMac.mm WebPageMac.mm WebPageProxyMac.mm WebPlatformTouchPoint.cpp WebProcessMac.mm WebProcessProxyMac.mm WebTouchEvent.cpp *.pdf com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb;
    4949EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
    5050EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm WKContentView.mm WKScrollView.mm UIWKRemoteView.mm WKGeolocationProviderIOSObjCSecurityOrigin.mm WKInteractionView.mm WebIOSEventFactory.mm WKActionSheet.mm WKActionSheetAssistant.mm;

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

    r159234 r164192  
    236236WKDataRef WKBundleFrameCopyWebArchiveFilteringSubframes(WKBundleFrameRef frameRef, WKBundleFrameFrameFilterCallback frameFilterCallback, void* context)
    237237{
    238 #if PLATFORM(MAC)
     238#if PLATFORM(COCOA)
    239239    RetainPtr<CFDataRef> data = toImpl(frameRef)->webArchiveData(frameFilterCallback, context);
    240240    if (data)

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm

    r162139 r164192  
    2626#include "config.h"
    2727#include "WKBundlePageBannerMac.h"
     28
     29#if !PLATFORM(IOS)
    2830
    2931#include "APIClient.h"
    … …  
    109111    return toImpl(pageBanner)->layer();
    110112}
     113
     114#endif // !PLATFORM(IOS)

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r164131 r164192  
    298298{
    299299    // FIXME (NetworkProcess): This test-only function doesn't work with NetworkProcess, <https://bugs.webkit.org/show_bug.cgi?id=115274>.
    300 #if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
     300#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
    301301    if (enabled)
    302302        WebFrameNetworkingContext::ensurePrivateBrowsingSession(SessionTracker::legacyPrivateSessionID);

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

    r164131 r164192  
    4444#endif
    4545
    46 #if PLATFORM(MAC)
     46#if USE(FOUNDATION)
    4747OBJC_CLASS NSBundle;
    4848#endif
    … …  
    6060namespace WebKit {
    6161
    62 #if PLATFORM(MAC)
     62#if USE(FOUNDATION)
    6363typedef NSBundle *PlatformBundle;
    6464#elif PLATFORM(GTK)

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h

    r161148 r164192  
    3434#include "WebProcess.h"
    3535
    36 #if PLATFORM(MAC)
     36#if PLATFORM(COCOA)
    3737#include "ObjCObjectGraphCoders.h"
    3838#endif
    … …  
    8181            break;
    8282        }
    83 #if PLATFORM(MAC)
     83#if PLATFORM(COCOA)
    8484        case API::Object::Type::ObjCObjectGraph: {
    8585            ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
    … …  
    145145            break;
    146146        }
    147 #if PLATFORM(MAC)
     147#if PLATFORM(COCOA)
    148148        case API::Object::Type::ObjCObjectGraph: {
    149149            RefPtr<ObjCObjectGraph> objectGraph;

  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp

    r161148 r164192  
    108108    ResourceResponse responseCopy(response);
    109109    // FIXME: This should use CertificateInfo to avoid the platform ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=124724.
    110 #if PLATFORM(MAC)
     110#if PLATFORM(COCOA)
    111111    responseCopy.setCertificateChain(certificateInfo.certificateChain());
    112112#elif USE(SOUP)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

    r150133 r164192  
    401401}
    402402
    403 #if PLATFORM(MAC)
     403#if PLATFORM(COCOA)
    404404// Whether the browser supports compositing of Core Animation plug-ins.
    405405static const unsigned WKNVSupportsCompositingCoreAnimationPluginsBool = 74656;
    … …  
    442442            break;
    443443        }
    444 #if PLATFORM(MAC)
     444#if PLATFORM(COCOA)
    445445        case NPNVsupportsCoreGraphicsBool:
    446446            // Always claim to support the Core Graphics drawing model.
    … …  
    547547{
    548548    switch (variable) {
    549 #if PLATFORM(MAC)
     549#if PLATFORM(COCOA)
    550550        case NPPVpluginDrawingModel: {
    551551            RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
    … …  
    941941}
    942942
    943 #if PLATFORM(MAC)
     943#if PLATFORM(COCOA)
    944944static NPError NPN_PopUpContextMenu(NPP npp, NPMenu* menu)
    945945{
    … …  
    10231023    netscapeFuncs.scheduletimer = NPN_ScheduleTimer;
    10241024    netscapeFuncs.unscheduletimer = NPN_UnscheduleTimer;
    1025 #if PLATFORM(MAC)
     1025#if PLATFORM(COCOA)
    10261026    netscapeFuncs.popupcontextmenu = NPN_PopUpContextMenu;
    10271027    netscapeFuncs.convertpoint = NPN_ConvertPoint;

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

    r163218 r164192  
    6363    , m_npWindow()
    6464    , m_isStarted(false)
    65 #if PLATFORM(MAC)
     65#if PLATFORM(COCOA)
    6666    , m_isWindowed(false)
    6767#else
    … …  
    7373    , m_hasCalledSetWindow(false)
    7474    , m_nextTimerID(0)
    75 #if PLATFORM(MAC)
     75#if PLATFORM(COCOA)
    7676    , m_drawingModel(static_cast<NPDrawingModel>(-1))
    7777    , m_eventModel(static_cast<NPEventModel>(-1))
    … …  
    10261026bool NetscapePlugin::supportsSnapshotting() const
    10271027{
    1028 #if PLATFORM(MAC)
     1028#if PLATFORM(COCOA)
    10291029    return m_pluginModule && m_pluginModule->pluginQuirks().contains(PluginQuirks::SupportsSnapshotting);
    10301030#endif

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

    r162139 r164192  
    6161    virtual bool isBeingAsynchronouslyInitialized() const { return false; }
    6262
    63 #if PLATFORM(MAC)
     63#if PLATFORM(COCOA)
    6464    NPError setDrawingModel(NPDrawingModel);
    6565    NPError setEventModel(NPEventModel);
    … …  
    181181    virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
    182182    virtual PassRefPtr<ShareableBitmap> snapshot();
    183 #if PLATFORM(MAC)
     183#if PLATFORM(COCOA)
    184184    virtual PlatformLayer* pluginLayer();
    185185#endif
    … …  
    223223    virtual bool findString(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
    224224
    225 #if PLATFORM(MAC)
     225#if PLATFORM(COCOA)
    226226    virtual void windowFocusChanged(bool);
    227227    virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);

  • trunk/Source/WebKit2/WebProcess/Plugins/Plugin.cpp

    r161148 r164192  
    4242    encoder << isFullFramePlugin;
    4343    encoder << shouldUseManualLoader;
    44 #if PLATFORM(MAC)
     44#if PLATFORM(COCOA)
    4545    encoder.encodeEnum(layerHostingMode);
    4646#endif
    … …  
    6565    if (!decoder.decode(parameters.shouldUseManualLoader))
    6666        return false;
    67 #if PLATFORM(MAC)
     67#if PLATFORM(COCOA)
    6868    if (!decoder.decodeEnum(parameters.layerHostingMode))
    6969        return false;

  • trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h

    r161148 r164192  
    3636#include <wtf/Vector.h>
    3737
    38 #if PLATFORM(MAC)
     38#if PLATFORM(COCOA)
    3939#include "LayerHostingContext.h"
    4040
    … …  
    8080        bool isFullFramePlugin;
    8181        bool shouldUseManualLoader;
    82 #if PLATFORM(MAC)
     82#if PLATFORM(COCOA)
    8383        LayerHostingMode layerHostingMode;
    8484#endif
    … …  
    126126    virtual PassRefPtr<ShareableBitmap> snapshot() = 0;
    127127
    128 #if PLATFORM(MAC)
     128#if PLATFORM(COCOA)
    129129    // If a plug-in is using the Core Animation drawing model, this returns its plug-in layer.
    130130    virtual PlatformLayer* pluginLayer() = 0;
    … …  
    219219    virtual NPObject* pluginScriptableNPObject() = 0;
    220220
    221 #if PLATFORM(MAC)
     221#if PLATFORM(COCOA)
    222222    // Tells the plug-in about window focus changes.
    223223    virtual void windowFocusChanged(bool) = 0;
    … …  
    259259    virtual WebCore::Scrollbar* verticalScrollbar() = 0;
    260260
    261 #if PLATFORM(MAC)
     261#if PLATFORM(COCOA)
    262262    virtual RetainPtr<PDFDocument> pdfDocumentForPrinting() const { return 0; }
    263263    virtual NSObject *accessibilityObject() const { return 0; }

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h

    r163079 r164192  
    2929#include <wtf/Forward.h>
    3030
    31 #if PLATFORM(MAC)
     31#if PLATFORM(COCOA)
    3232#include "PluginComplexTextInputState.h"
    3333#endif
    … …  
    9696    virtual void willSendEventToPlugin() = 0;
    9797   
    98 #if PLATFORM(MAC)
     98#if PLATFORM(COCOA)
    9999    // Tells the controller that the plug-in focus or window focus did change.
    100100    virtual void pluginFocusOrWindowFocusChanged(bool) = 0;

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp

    r161148 r164192  
    3737#include "WebProcessProxyMessages.h"
    3838
    39 #if PLATFORM(MAC)
     39#if OS(DARWIN)
    4040#include "MachPort.h"
    4141#endif
    … …  
    7575        return 0;
    7676
    77 #if PLATFORM(MAC)
     77#if OS(DARWIN)
    7878    IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
    7979    if (IPC::Connection::identifierIsNull(connectionIdentifier))

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp

    r163079 r164192  
    486486}
    487487
    488 #if PLATFORM(MAC)
     488#if PLATFORM(COCOA)
    489489void PluginProxy::windowFocusChanged(bool hasFocus)
    490490{

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h

    r162139 r164192  
    3737#include <WebCore/SecurityOrigin.h>
    3838
    39 #if PLATFORM(MAC)
     39#if PLATFORM(COCOA)
    4040#include <wtf/RetainPtr.h>
    4141OBJC_CLASS CALayer;
    … …  
    7979    virtual bool supportsSnapshotting() const;
    8080    virtual PassRefPtr<ShareableBitmap> snapshot();
    81 #if PLATFORM(MAC)
     81#if PLATFORM(COCOA)
    8282    virtual PlatformLayer* pluginLayer();
    8383#endif
    … …  
    113113   
    114114    virtual NPObject* pluginScriptableNPObject();
    115 #if PLATFORM(MAC)
     115#if PLATFORM(COCOA)
    116116    virtual void windowFocusChanged(bool);
    117117    virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
    … …  
    160160    void cancelManualStreamLoad();
    161161    void setStatusbarText(const String& statusbarText);
    162 #if PLATFORM(MAC)
     162#if PLATFORM(COCOA)
    163163    void pluginFocusOrWindowFocusChanged(bool);
    164164    void setComplexTextInputState(uint64_t);
    … …  
    215215    bool m_waitingOnAsynchronousInitialization;
    216216
    217 #if PLATFORM(MAC)
     217#if PLATFORM(COCOA)
    218218    RetainPtr<CALayer> m_pluginLayer;
    219219#endif

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in

    r160022 r164192  
    5757    SetStatusbarText(String statusbarText)
    5858
    59 #if PLATFORM(MAC)
     59#if PLATFORM(COCOA)
    6060    # Called when the plug-in's focus or its containing window focus changes.
    6161    PluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus)

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

    r163218 r164192  
    331331        m_pendingURLRequestsTimer.stop();
    332332
    333 #if PLATFORM(MAC)
     333#if PLATFORM(COCOA)
    334334        if (m_webPage)
    335335            pluginFocusOrWindowFocusChanged(false);
    … …  
    499499void PluginView::viewStateDidChange(ViewState::Flags changed)
    500500{
    501 #if PLATFORM(MAC)
     501#if PLATFORM(COCOA)
    502502    platformViewStateDidChange(changed);
    503503#endif
    504504}
    505505
    506 #if PLATFORM(MAC)
     506#if PLATFORM(COCOA)
    507507void PluginView::platformViewStateDidChange(ViewState::Flags changed)
    508508{
    … …  
    598598    m_isInitialized = true;
    599599
    600 #if PLATFORM(MAC)
     600#if PLATFORM(COCOA)
    601601    windowAndViewFramesChanged(m_webPage->windowFrameInScreenCoordinates(), m_webPage->viewFrameInWindowCoordinates());
    602602#endif
    … …  
    609609    redeliverManualStream();
    610610
    611 #if PLATFORM(MAC)
     611#if PLATFORM(COCOA)
    612612    if (m_pluginElement->displayState() < HTMLPlugInElement::Restarting) {
    613613        if (m_plugin->pluginLayer() && frame()) {
    … …  
    641641}
    642642
    643 #if PLATFORM(MAC)
     643#if PLATFORM(COCOA)
    644644PlatformLayer* PluginView::platformLayer() const
    645645{
    … …  
    12641264        return;
    12651265
    1266 #if PLATFORM(MAC)
     1266#if PLATFORM(COCOA)
    12671267    if (m_plugin->pluginLayer())
    12681268        return;
    … …  
    14591459}
    14601460
    1461 #if PLATFORM(MAC)
     1461#if PLATFORM(COCOA)
    14621462void PluginView::pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus)
    14631463{
    … …  
    16111611#endif
    16121612
    1613 #if PLATFORM(MAC)
     1613#if PLATFORM(COCOA)
    16141614static bool isAlmostSolidColor(BitmapImage* bitmap)
    16151615{
    … …  
    16861686        m_pluginElement->updateSnapshot(snapshotImage.get());
    16871687
    1688 #if PLATFORM(MAC)
     1688#if PLATFORM(COCOA)
    16891689        unsigned maximumSnapshotRetries = frame() ? frame()->settings().maximumPlugInSnapshotAttempts() : 0;
    16901690        if (snapshotImage && isAlmostSolidColor(toBitmapImage(snapshotImage.get())) && m_countSnapshotRetries < maximumSnapshotRetries) {

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h

    r162139 r164192  
    7474    void setLayerHostingMode(LayerHostingMode);
    7575
    76 #if PLATFORM(MAC)
     76#if PLATFORM(COCOA)
    7777    void platformViewStateDidChange(WebCore::ViewState::Flags changed);
    7878    void setDeviceScaleFactor(float);
    … …  
    143143
    144144    // WebCore::PluginViewBase
    145 #if PLATFORM(MAC)
     145#if PLATFORM(COCOA)
    146146    virtual PlatformLayer* platformLayer() const;
    147147#endif
    … …  
    193193    virtual void pluginProcessCrashed();
    194194    virtual void willSendEventToPlugin();
    195 #if PLATFORM(MAC)
     195#if PLATFORM(COCOA)
    196196    virtual void pluginFocusOrWindowFocusChanged(bool pluginHasFocusAndWindowHasFocus);
    197197    virtual void setComplexTextInputState(PluginComplexTextInputState);

  • trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp

    r152578 r164192  
    3434#endif
    3535
    36 #if PLATFORM(MAC)
     36#if PLATFORM(COCOA)
    3737#include "WebKitSystemInterface.h"
    3838#endif

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r163908 r164192  
    127127FloatRect WebChromeClient::windowRect()
    128128{
    129 #if PLATFORM(MAC)
     129#if PLATFORM(COCOA)
    130130    if (m_page->hasCachedWindowFrame())
    131131        return m_page->windowFrameInUnflippedScreenCoordinates();
    … …  
    155155}
    156156
    157 #if PLATFORM(MAC)
     157#if PLATFORM(COCOA)
    158158void WebChromeClient::makeFirstResponder()
    159159{

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

    r163980 r164192  
    243243#endif
    244244
    245 #if PLATFORM(MAC)
     245#if PLATFORM(COCOA)
    246246    virtual void makeFirstResponder() override;
    247247#endif

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp

    r156550 r164192  
    7575}
    7676
    77 #if !PLATFORM(MAC)
     77#if !PLATFORM(COCOA)
    7878void WebContextMenuClient::searchWithGoogle(const Frame* frame)
    7979{

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h

    r162139 r164192  
    5959    virtual void stopSpeaking() override;
    6060   
    61 #if PLATFORM(MAC)
     61#if PLATFORM(COCOA)
    6262    virtual void searchWithSpotlight() override;
    6363#endif

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp

    r157058 r164192  
    5757}
    5858
    59 #if !PLATFORM(MAC) && !PLATFORM(GTK)
     59#if !PLATFORM(COCOA) && !PLATFORM(GTK)
    6060void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool)
    6161{

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h

    r162139 r164192  
    5050    virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard&, WebCore::Frame&, bool linkDrag = false) override;
    5151
    52 #if PLATFORM(MAC)
     52#if PLATFORM(COCOA)
    5353    virtual void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override;
    5454#endif

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

    r163712 r164192  
    280280}
    281281
    282 #if !PLATFORM(GTK) && !PLATFORM(MAC) && !PLATFORM(EFL)
     282#if !PLATFORM(GTK) && !PLATFORM(COCOA) && !PLATFORM(EFL)
    283283void WebEditorClient::handleKeyboardEvent(KeyboardEvent* event)
    284284{
    … …  
    397397{
    398398    // This prevents erasing spelling markers on OS X Lion or later to match AppKit on these Mac OS X versions.
    399 #if PLATFORM(MAC) || PLATFORM(EFL)
     399#if PLATFORM(COCOA) || PLATFORM(EFL)
    400400    return type != TextCheckingTypeSpelling;
    401401#else

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h

    r163920 r164192  
    9292    virtual void textDidChangeInTextArea(WebCore::Element*) override;
    9393
    94 #if PLATFORM(MAC)
     94#if PLATFORM(COCOA)
    9595    virtual NSString *userVisibleString(NSURL *) override;
    9696    virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource>>&) override;

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r163243 r164192  
    12031203    m_frame->coreFrame()->view()->setProhibitsScrolling(shouldDisableScrolling);
    12041204    m_frame->coreFrame()->view()->setVisualUpdatesAllowedByClient(!webPage->shouldExtendIncrementalRenderingSuppression());
    1205 #if PLATFORM(MAC)
     1205#if PLATFORM(COCOA)
    12061206    m_frame->coreFrame()->view()->setExposedRect(webPage->drawingArea()->exposedRect());
    12071207#endif
    … …  
    12891289    parameters.isFullFramePlugin = loadManually;
    12901290    parameters.shouldUseManualLoader = parameters.isFullFramePlugin && !m_frameCameFromPageCache;
    1291 #if PLATFORM(MAC)
     1291#if PLATFORM(COCOA)
    12921292    parameters.layerHostingMode = m_frame->page()->layerHostingMode();
    12931293#endif
    … …  
    15121512}
    15131513
    1514 #if PLATFORM(MAC)
     1514#if PLATFORM(COCOA)
    15151515   
    15161516RemoteAXObjectRef WebFrameLoaderClient::accessibilityRemoteObject()
    … …  
    15321532}
    15331533
    1534 #endif // PLATFORM(MAC)
     1534#endif // PLATFORM(COCOA)
    15351535
    15361536bool WebFrameLoaderClient::shouldAlwaysUsePluginDocument(const String& /*mimeType*/) const

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

    r162786 r164192  
    210210    virtual void registerForIconNotification(bool listen = true) override;
    211211   
    212 #if PLATFORM(MAC)
     212#if PLATFORM(COCOA)
    213213    virtual RemoteAXObjectRef accessibilityRemoteObject() override;
    214214   

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

    r163217 r164192  
    386386}
    387387
    388 #if PLATFORM(MAC)
     388#if PLATFORM(COCOA)
    389389// PasteboardStrategy
    390390

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h

    r162139 r164192  
    110110    virtual long changeCount() override;
    111111#endif
    112 #if PLATFORM(MAC)
     112#if PLATFORM(COCOA)
    113113    virtual void getTypes(Vector<String>& types, const String& pasteboardName) override;
    114114    virtual PassRefPtr<WebCore::SharedBuffer> bufferForType(const String& pasteboardType, const String& pasteboardName) override;

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

    r162114 r164192  
    165165
    166166#if !PLATFORM(IOS)
    167 #if PLATFORM(MAC)
    168167        INIT(SpeechSynthesisGetVoiceIdentifiers);
    169168        INIT(SpeechSynthesisGetDefaultVoiceIdentifierForLocale);
    170 #endif
    171169        INIT(GetAXTextMarkerTypeID);
    172170        INIT(GetAXTextMarkerRangeTypeID);
    … …  
    212210#endif
    213211
    214 #if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
     212#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    215213        INIT(NSElasticDeltaForTimeDelta);
    216214        INIT(NSElasticDeltaForReboundDelta);

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp

    r162276 r164192  
    2929
    3030// Subclasses
    31 #if PLATFORM(MAC)
     31#if PLATFORM(COCOA)
    3232#include "RemoteLayerTreeDrawingArea.h"
    3333#include "TiledCoreAnimationDrawingArea.h"
    … …  
    4747{
    4848    switch (parameters.drawingAreaType) {
    49 #if PLATFORM(MAC)
     49#if PLATFORM(COCOA)
    5050#if !PLATFORM(IOS)
    5151    case DrawingAreaTypeTiledCoreAnimation:

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

    r163079 r164192  
    8989    virtual void mainFrameContentSizeChanged(const WebCore::IntSize&) { }
    9090
    91 #if PLATFORM(MAC)
     91#if PLATFORM(COCOA)
    9292    virtual void setExposedRect(const WebCore::FloatRect&) = 0;
    9393    virtual WebCore::FloatRect exposedRect() const = 0;
    … …  
    128128    virtual void didUpdate() { }
    129129
    130 #if PLATFORM(MAC)
     130#if PLATFORM(COCOA)
    131131    // Used by TiledCoreAnimationDrawingArea.
    132132    virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition) { }

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in

    r162730 r164192  
    2525    DidUpdate()
    2626
    27 #if PLATFORM(MAC)
     27#if PLATFORM(COCOA)
    2828    // Used by TiledCoreAnimationDrawingArea.
    2929    UpdateGeometry(WebCore::IntSize viewSize, WebCore::IntSize layerPosition)

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp

    r163180 r164192  
    9292    PlatformWheelEvent platformWheelEvent = platform(wheelEvent);
    9393
    94 #if PLATFORM(MAC)
     94#if PLATFORM(COCOA)
    9595    switch (wheelEvent.phase()) {
    9696    case PlatformWheelEventPhaseBegan:

  • trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h

    r161148 r164192  
    9090#endif
    9191
    92 #if PLATFORM(MAC)
     92#if PLATFORM(COCOA)
    9393    virtual void setLayerHostingMode(LayerHostingMode) { }
    9494#endif

  • trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.cpp

    r151661 r164192  
    3838}
    3939
    40 #if !PLATFORM(MAC)
     40#if !PLATFORM(MAC) || PLATFORM(IOS)
    4141void PageBanner::addToPage(Type, WebPage*)
    4242{

  • trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h

    r160384 r164192  
    3131#include <wtf/PassRefPtr.h>
    3232
    33 #if PLATFORM(MAC)
     33#if PLATFORM(MAC) && !PLATFORM(IOS)
    3434OBJC_CLASS CALayer;
    3535#include <wtf/RetainPtr.h>
    … …  
    6161    };
    6262
    63 #if PLATFORM(MAC)
     63#if PLATFORM(MAC) && !PLATFORM(IOS)
    6464    static PassRefPtr<PageBanner> create(CALayer *, int height, Client*);
    6565    CALayer *layer();
    … …  
    8080
    8181private:
    82 #if PLATFORM(MAC)
     82#if PLATFORM(MAC) && !PLATFORM(IOS)
    8383    explicit PageBanner(CALayer *, int height, Client*);
    8484#endif
    … …  
    9191    bool m_isHidden;
    9292
    93 #if PLATFORM(MAC)
     93#if PLATFORM(MAC) && !PLATFORM(IOS)
    9494    RetainPtr<CALayer> m_layer;
    9595    int m_height;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

    r162982 r164192  
    7272#include <wtf/text/StringBuilder.h>
    7373
    74 #if PLATFORM(MAC)
     74#if PLATFORM(COCOA)
    7575#include <WebCore/LegacyWebArchive.h>
    7676#endif
    … …  
    735735}
    736736
    737 #if PLATFORM(MAC)
     737#if PLATFORM(COCOA)
    738738RetainPtr<CFDataRef> WebFrame::webArchiveData(FrameFilterFunction callback, void* context)
    739739{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h

    r160384 r164192  
    139139    LoadListener* loadListener() const { return m_loadListener; }
    140140   
    141 #if PLATFORM(MAC)
     141#if PLATFORM(COCOA)
    142142    typedef bool (*FrameFilterFunction)(WKBundleFrameRef, WKBundleFrameRef subframe, void* context);
    143143    RetainPtr<CFDataRef> webArchiveData(FrameFilterFunction, void* context);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp

    r163024 r164192  
    5757    , m_frontendClient(0)
    5858    , m_frontendChannel(frontendChannel)
    59 #if PLATFORM(MAC)
     59#if PLATFORM(COCOA)
    6060    , m_hasLocalizedStringsURL(false)
    6161#endif

  • trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h

    r161148 r164192  
    123123    WebInspectorFrontendClient* m_frontendClient;
    124124    WebCore::InspectorFrontendChannel* m_frontendChannel;
    125 #if PLATFORM(MAC)
     125#if PLATFORM(COCOA)
    126126    mutable String m_localizedStringsURL;
    127127    mutable bool m_hasLocalizedStringsURL;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r164126 r164192  
    153153#endif
    154154
    155 #if PLATFORM(MAC)
    156 #include "MachPort.h"
    157 #endif
    158 
    159155#if ENABLE(BATTERY_STATUS)
    160156#include "WebBatteryClient.h"
    … …  
    173169#endif
    174170
    175 #if PLATFORM(MAC)
     171#if PLATFORM(COCOA)
    176172#include "PDFPlugin.h"
    177173#include <WebCore/LegacyWebArchive.h>
    … …  
    252248#endif
    253249    , m_layerHostingMode(parameters.layerHostingMode)
    254 #if PLATFORM(MAC)
     250#if PLATFORM(COCOA)
    255251    , m_pdfPluginEnabled(false)
    256252    , m_hasCachedWindowFrame(false)
    … …  
    16081604        return true;
    16091605
    1610 #if PLATFORM(MAC)
     1606#if PLATFORM(COCOA)
    16111607    // FIXME: this really should be about OSX-style UI, not about the Mac port
    16121608    if (event.button() == WebCore::LeftButton && event.ctrlKey())
    … …  
    22602256    IPC::DataReference dataReference;
    22612257
    2262 #if PLATFORM(MAC)
     2258#if PLATFORM(COCOA)
    22632259    RefPtr<LegacyWebArchive> archive;
    22642260    RetainPtr<CFDataRef> data;
    … …  
    23522348    IPC::DataReference dataReference;
    23532349
    2354 #if PLATFORM(MAC)
     2350#if PLATFORM(COCOA)
    23552351    RetainPtr<CFDataRef> data;
    23562352    if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
    … …  
    23962392    m_scrollingPerformanceLoggingEnabled = store.getBoolValueForKey(WebPreferencesKey::scrollingPerformanceLoggingEnabledKey());
    23972393
    2398 #if PLATFORM(MAC)
     2394#if PLATFORM(COCOA)
    23992395    m_pdfPluginEnabled = store.getBoolValueForKey(WebPreferencesKey::pdfPluginEnabledKey());
    24002396#endif
    … …  
    24522448    settings.setDefaultFixedFontSize(store.getDoubleValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
    24532449    settings.setScreenFontSubstitutionEnabled(store.getBoolValueForKey(WebPreferencesKey::screenFontSubstitutionEnabledKey())
    2454 #if PLATFORM(MAC)
     2450#if PLATFORM(COCOA)
    24552451        || WebProcess::shared().shouldForceScreenFontSubstitution()
    24562452#endif
    … …  
    25012497#endif
    25022498
    2503 #if PLATFORM(MAC)
     2499#if PLATFORM(COCOA)
    25042500    settings.setQTKitEnabled(store.getBoolValueForKey(WebPreferencesKey::isQTKitEnabledKey()));
    25052501#endif
    … …  
    26342630}
    26352631
    2636 #if !PLATFORM(GTK) && !PLATFORM(MAC)
     2632#if !PLATFORM(GTK) && !PLATFORM(COCOA)
    26372633bool WebPage::handleEditingKeyboardEvent(KeyboardEvent* evt)
    26382634{
    … …  
    30963092void WebPage::sendSetWindowFrame(const FloatRect& windowFrame)
    30973093{
    3098 #if PLATFORM(MAC)
     3094#if PLATFORM(COCOA)
    30993095    m_hasCachedWindowFrame = false;
    31003096#endif
    … …  
    31023098}
    31033099
    3104 #if PLATFORM(MAC)
     3100#if PLATFORM(COCOA)
    31053101void WebPage::windowAndViewFramesChanged(const FloatRect& windowFrameInScreenCoordinates, const FloatRect& windowFrameInUnflippedScreenCoordinates, const FloatRect& viewFrameInWindowCoordinates, const FloatPoint& accessibilityViewCoordinates)
    31063102{
    … …  
    33273323}
    33283324
    3329 #if PLATFORM(MAC)
     3325#if PLATFORM(COCOA)
    33303326
    33313327bool WebPage::isSpeaking()
    … …  
    33633359    return pluginView->pdfDocumentForPrinting();
    33643360}
    3365 #endif // PLATFORM(MAC)
     3361#endif // PLATFORM(MAC) && !PLATFORM(IOS)
    33663362
    33673363void WebPage::beginPrinting(uint64_t frameID, const PrintInfo& printInfo)
    … …  
    33783374    if (pdfDocumentForPrintingFrame(coreFrame))
    33793375        return;
    3380 #endif // PLATFORM(MAC)
     3376#endif // PLATFORM(MAC) && !PLATFORM(IOS)
    33813377
    33823378    if (!m_printContext)
    … …  
    34153411        resultTotalScaleFactorForPrinting = m_printContext->computeAutomaticScaleFactor(FloatSize(printInfo.availablePaperWidth, printInfo.availablePaperHeight)) * printInfo.pageSetupScaleFactor;
    34163412    }
    3417 #if PLATFORM(MAC)
     3413#if PLATFORM(COCOA)
    34183414    else
    34193415        computePagesForPrintingPDFDocument(frameID, printInfo, resultPageRects);
    3420 #endif // PLATFORM(MAC)
     3416#endif // PLATFORM(COCOA)
    34213417
    34223418    // If we're asked to print, we should actually print at least a blank page.
    … …  
    34273423}
    34283424
    3429 #if PLATFORM(MAC)
     3425#if PLATFORM(COCOA)
    34303426void WebPage::drawRectToImage(uint64_t frameID, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, uint64_t callbackID)
    34313427{
    … …  
    35443540}
    35453541
    3546 #if PLATFORM(MAC)
     3542#if PLATFORM(COCOA)
    35473543void WebPage::savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID)
    35483544{
    … …  
    36043600#endif
    36053601
    3606 #if PLATFORM(MAC)
     3602#if PLATFORM(COCOA)
    36073603void WebPage::handleAlternativeTextUIResult(const String& result)
    36083604{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r163980 r164192  
    9393#endif
    9494
    95 #if PLATFORM(MAC)
     95#if PLATFORM(COCOA)
    9696#include "DictionaryPopupInfo.h"
    9797#include "LayerHostingContext.h"
    … …  
    228228
    229229    // -- Called from WebCore clients.
    230 #if PLATFORM(MAC)
     230#if PLATFORM(COCOA)
    231231    bool handleEditingKeyboardEvent(WebCore::KeyboardEvent*, bool saveCommands);
    232232#elif !PLATFORM(GTK)
    … …  
    376376    void setLayerHostingMode(unsigned);
    377377
    378 #if PLATFORM(MAC)
     378#if PLATFORM(COCOA)
    379379    void updatePluginsActiveAndFocusedState();
    380380    const WebCore::FloatRect& windowFrameInScreenCoordinates() const { return m_windowFrameInScreenCoordinates; }
    … …  
    390390
    391391    void updateHeaderAndFooterLayersForDeviceScaleChange(float scaleFactor);
    392 #endif // PLATFORM(MAC)
     392#endif // PLATFORM(COCOA)
    393393
    394394    bool windowIsFocused() const;
    … …  
    513513    void didChangeSelection();
    514514
    515 #if PLATFORM(MAC)
     515#if PLATFORM(COCOA)
    516516    void registerUIProcessAccessibilityTokens(const IPC::DataReference& elemenToken, const IPC::DataReference& windowToken);
    517517    WKAccessibilityWebPageObject* accessibilityRemoteObject();
    … …  
    562562    void dummy(bool&);
    563563
    564 #if PLATFORM(MAC)
     564#if PLATFORM(COCOA)
    565565    void performDictionaryLookupForSelection(WebCore::Frame*, const WebCore::VisibleSelection&);
    566566
    … …  
    595595    void endPrinting();
    596596    void computePagesForPrinting(uint64_t frameID, const PrintInfo&, uint64_t callbackID);
    597 #if PLATFORM(MAC)
     597#if PLATFORM(COCOA)
    598598    void drawRectToImage(uint64_t frameID, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, uint64_t callbackID);
    599599    void drawPagesToPDF(uint64_t frameID, const PrintInfo&, uint32_t first, uint32_t count, uint64_t callbackID);
    … …  
    626626    void unmarkAllMisspellings();
    627627    void unmarkAllBadGrammar();
    628 #if PLATFORM(MAC)
     628#if PLATFORM(COCOA)
    629629    void handleAlternativeTextUIResult(const String&);
    630630#endif
    … …  
    672672    void setScrollingPerformanceLoggingEnabled(bool);
    673673
    674 #if PLATFORM(MAC)
     674#if PLATFORM(COCOA)
    675675    bool shouldUsePDFPlugin() const;
    676676    bool pdfPluginEnabled() const { return m_pdfPluginEnabled; }
    … …  
    679679
    680680    void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size);
    681 #if PLATFORM(MAC)
     681#if PLATFORM(COCOA)
    682682    void savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID);
    683683#endif
    … …  
    732732    PassRefPtr<WebCore::Range> rangeForWebSelectionAtPosition(const WebCore::IntPoint&, const WebCore::VisiblePosition&, WKSelectionFlags&);
    733733#endif
    734 #if !PLATFORM(MAC)
     734#if !PLATFORM(COCOA)
    735735    static const char* interpretKeyEvent(const WebCore::KeyboardEvent*);
    736736#endif
    737737    bool performDefaultBehaviorForKeyEvent(const WebKeyboardEvent&);
    738738
    739 #if PLATFORM(MAC)
     739#if PLATFORM(COCOA)
    740740    bool executeKeypressCommandsInternal(const Vector<WebCore::KeypressCommand>&, WebCore::KeyboardEvent*);
    741741#endif
    … …  
    824824    void resumeActiveDOMObjectsAndAnimations();
    825825
    826 #if PLATFORM(MAC)
     826#if PLATFORM(COCOA)
    827827    void performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
    828828    void performDictionaryLookupForRange(WebCore::Frame*, WebCore::Range*, NSDictionary *options);
    … …  
    949949    LayerHostingMode m_layerHostingMode;
    950950
    951 #if PLATFORM(MAC)
     951#if PLATFORM(COCOA)
    952952    bool m_pdfPluginEnabled;
    953953

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r163821 r164192  
    124124    ForceRepaint(uint64_t callbackID)
    125125
    126 #if PLATFORM(MAC)
     126#if PLATFORM(COCOA)
    127127    # Dictionary support.
    128128    PerformDictionaryLookupAtLocation(WebCore::FloatPoint point)
    … …  
    216216    CapitalizeWord()
    217217#endif
    218 #if PLATFORM(MAC)
     218#if PLATFORM(COCOA)
    219219    SetSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled)
    220220#endif
    … …  
    234234    EndPrinting()
    235235    ComputePagesForPrinting(uint64_t frameID, WebKit::PrintInfo printInfo, uint64_t callbackID)
    236 #if PLATFORM(MAC)
     236#if PLATFORM(COCOA)
    237237    DrawRectToImage(uint64_t frameID, WebKit::PrintInfo printInfo, WebCore::IntRect rect, WebCore::IntSize imageSize, uint64_t callbackID)
    238238    DrawPagesToPDF(uint64_t frameID, WebKit::PrintInfo printInfo, uint32_t first, uint32_t count, uint64_t callbackID)
    … …  
    269269#endif
    270270
    271 #if PLATFORM(MAC)
     271#if PLATFORM(COCOA)
    272272    # Complex text input support for plug-ins.
    273273    SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput)
    … …  
    309309#endif
    310310
    311 #if PLATFORM(MAC)
     311#if PLATFORM(COCOA)
    312312    HandleAlternativeTextUIResult(String result)
    313313#endif

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm

    r162505 r164192  
    2626#include "config.h"
    2727#include "PageBanner.h"
     28
     29#if !PLATFORM(IOS)
    2830
    2931#include "WebPage.h"
    … …  
    167169}
    168170
     171#endif // !PLATFORM(IOS)
     172
    169173} // namespace WebKit

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r163121 r164192  
    9595
    9696#if ENABLE(NETWORK_PROCESS)
    97 #if PLATFORM(MAC)
     97#if PLATFORM(COCOA)
    9898#include "CookieStorageShim.h"
    9999#endif
    … …  
    156156    , m_hasSetCacheModel(false)
    157157    , m_cacheModel(CacheModelDocumentViewer)
    158 #if PLATFORM(MAC)
     158#if PLATFORM(COCOA)
    159159    , m_compositingRenderServerPort(MACH_PORT_NULL)
    160 #endif
    161 #if PLATFORM(MAC)
    162160    , m_clearResourceCachesDispatchGroup(0)
    163161#endif
    … …  
    341339        setShouldUseFontSmoothing(true);
    342340
    343 #if PLATFORM(MAC) || USE(CFNETWORK)
     341#if PLATFORM(COCOA) || USE(CFNETWORK)
    344342    SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
    345343#endif
    … …  
    352350    ensureNetworkProcessConnection();
    353351
    354 #if PLATFORM(MAC)
     352#if PLATFORM(COCOA)
    355353    if (usesNetworkProcess())
    356354        CookieStorageShim::shared().initialize();
    … …  
    381379        return;
    382380
    383 #if PLATFORM(MAC)
     381#if OS(DARWIN)
    384382    IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
    385383#elif USE(UNIX_DOMAIN_SOCKETS)
    … …  
    470468void WebProcess::ensurePrivateBrowsingSession(uint64_t sessionID)
    471469{
    472 #if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
     470#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
    473471    WebFrameNetworkingContext::ensurePrivateBrowsingSession(sessionID);
    474472#endif
    … …  
    477475void WebProcess::destroyPrivateBrowsingSession(uint64_t sessionID)
    478476{
    479 #if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
     477#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
    480478    SessionTracker::destroySession(sessionID);
    481479#endif
    … …  
    10591057        return;
    10601058
    1061 #if PLATFORM(MAC)
     1059#if OS(DARWIN)
    10621060    IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
    10631061    if (IPC::Connection::identifierIsNull(connectionIdentifier))
    … …  
    11371135}
    11381136
    1139 #if !PLATFORM(MAC)
     1137#if !PLATFORM(COCOA)
    11401138void WebProcess::initializeProcessName(const ChildProcessInitializationParameters&)
    11411139{
    … …  
    11871185        return;
    11881186
    1189 #if PLATFORM(MAC)
     1187#if PLATFORM(COCOA)
    11901188    wkDestroyRenderingResources();
    11911189#endif

  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r163121 r164192  
    4545#include <wtf/text/AtomicStringHash.h>
    4646
    47 #if PLATFORM(MAC)
     47#if PLATFORM(COCOA)
    4848#include <dispatch/dispatch.h>
    4949#endif
    … …  
    111111    InjectedBundle* injectedBundle() const { return m_injectedBundle.get(); }
    112112
    113 #if PLATFORM(MAC)
     113#if PLATFORM(COCOA)
    114114    mach_port_t compositingRenderServerPort() const { return m_compositingRenderServerPort; }
    115115#endif
    … …  
    133133    WebPageGroupProxy* webPageGroup(const WebPageGroupData&);
    134134
    135 #if PLATFORM(MAC)
     135#if PLATFORM(COCOA)
    136136    pid_t presenterApplicationPid() const { return m_presenterApplicationPid; }
    137137    bool shouldForceScreenFontSubstitution() const { return m_shouldForceScreenFontSubstitution; }
    … …  
    293293    CacheModel m_cacheModel;
    294294
    295 #if PLATFORM(MAC)
     295#if PLATFORM(COCOA)
    296296    mach_port_t m_compositingRenderServerPort;
    297297    pid_t m_presenterApplicationPid;

  • trunk/Source/WebKit2/WebProcess/WebProcess.messages.in

    r163121 r164192  
    8383    ReleasePageCache()
    8484
    85 #if PLATFORM(MAC)
    8685    SetProcessSuppressionEnabled(bool flag)
     86#if PLATFORM(COCOA)
    8787    SetQOS(int latencyQOS, int throughputQOS)
    8888#endif
Note: See TracChangeset for help on using the changeset viewer.