Changeset 163657 in webkit


Ignore:
Timestamp:
Feb 7, 2014, 3:37:54 PM (11 years ago)
Author:
mitz@apple.com
Message:

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

Reviewed by Anders Carlsson.

  • Configurations/WebCore.xcconfig: Removed KeyEventMac.mm from

EXCLUDED_SOURCE_FILE_NAMES_iphoneos, because that file contains !PLATFORM(IOS) guards.
Removed WheelEventMac.mm from the same definition, because that file no longer exists.

  • platform/ContentFilter.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/ContextMenu.h: Ditto.
  • platform/ContextMenuItem.h: Ditto.
  • platform/Cursor.cpp: Ditto.
  • platform/Cursor.h: Ditto.
  • platform/DragData.cpp: Ditto.
  • platform/DragImage.cpp: Ditto.
  • platform/Language.cpp:

(WebCore::displayNameForLanguageLocale): Changed PLATFORM(MAC) to USE(CF) && !PLATFORM(WIN).

  • platform/LocalizedStrings.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebCore::contextMenuItemTagSearchWeb):

  • platform/LocalizedStrings.h: Ditto.
  • platform/MIMETypeRegistry.cpp: Ditto.

(WebCore::initializeSupportedImageMIMETypesForEncoding):

  • platform/PasteboardStrategy.h: Ditto.
  • platform/PlatformKeyboardEvent.h: Ditto.
  • platform/PlatformMenuDescription.h: Ditto.
  • platform/PlatformSpeechSynthesizer.h: Ditto.
  • platform/PlatformWheelEvent.h: Ditto.

(WebCore::PlatformWheelEvent::PlatformWheelEvent):

  • platform/SchemeRegistry.cpp: Ditto.

(WebCore::localURLSchemes):
(WebCore::SchemeRegistry::removeURLSchemeRegisteredAsLocal):
(WebCore::SchemeRegistry::shouldCacheResponsesFromURLSchemeIndefinitely):

  • platform/ScrollAnimator.cpp: Ditto.

(WebCore::ScrollAnimator::handleWheelEvent):

  • platform/ScrollAnimator.h: Ditto.
  • platform/ScrollView.cpp: Ditto.
  • platform/ScrollView.h: Ditto.
  • platform/ScrollbarThemeComposite.h: Ditto.
  • platform/SharedBuffer.h: Changed PLATFORM(MAC) to USE(FOUNDATION) around NSData-related

code.

  • platform/URL.h: Changed PLATFORM(MAC) to USE(FOUNDATION) around NSURL-related code.
  • platform/Widget.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/Widget.h: Ditto.
  • platform/audio/AudioSession.cpp: Changed !PLATFORM(MAC) && !PLATFORM(IOS) to

!PLATFORM(COCOA).

  • platform/audio/HRTFElevation.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/audio/MediaSessionManager.cpp: Ditto.
  • platform/audio/mac/AudioSessionMac.cpp: Updated comment.
  • platform/audio/mac/MediaSessionManagerMac.cpp: Removed PLATFORM(MAC) from Cocoa-only file.
  • platform/cf/SharedBufferCF.cpp: Changed !PLATFORM(MAC) to !USE(FOUNDATION) and updated

comment.

  • platform/cf/URLCF.cpp: Changed !PLATFORM(MAC) to !USE(FOUNDATION).
  • platform/graphics/BitmapImage.h: Changed one instance of PLATFORM(MAC) to
USE(CG)
USE(APPKIT), and another to PLATFORM(COCOA).
  • platform/graphics/DisplayRefreshMonitor.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebCore::DisplayRefreshMonitor::DisplayRefreshMonitor):

  • platform/graphics/DisplayRefreshMonitor.h: Ditto.
  • platform/graphics/FloatPoint.h: Collapsed nested #ifs into a single #if.
  • platform/graphics/FloatRect.h: Ditto.
  • platform/graphics/FloatSize.h: Ditto.
  • platform/graphics/Font.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/graphics/Font.h: Ditto.
  • platform/graphics/FontCache.cpp: Ditto.

(WebCore::FontCache::getFontData):

  • platform/graphics/FontCache.h: Ditto. Also removed redundant friend class declaration.
  • platform/graphics/FontGlyphs.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebCore::FontGlyphs::glyphDataAndPageForCharacter):

  • platform/graphics/GlyphPage.h: Ditto.
  • platform/graphics/GraphicsContext3D.h: Ditto.
  • platform/graphics/Image.h: Changed PLATFORM(MAC) to USE(APPKIT) around use of NSImage.

Changed another PLATFORM(MAC) to PLATFORM(COCOA).

  • platform/graphics/IntRect.h: Collapsed nested #ifs into a single #if.
  • platform/graphics/IntSize.h: Ditto.
  • platform/graphics/MediaPlayer.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebCore::installedMediaEngines):
(WebCore::MediaPlayer::supportsType):

  • platform/graphics/SimpleFontData.cpp: Ditto.

(WebCore::SimpleFontData::nonSyntheticItalicFontData):
(WebCore::SimpleFontData::DerivedFontData::~DerivedFontData):

  • platform/graphics/SimpleFontData.h: Ditto.
  • platform/graphics/TiledBacking.h: Ditto.
  • platform/graphics/ca/GraphicsLayerCA.cpp: Ditto.

(WebCore::GraphicsLayerCA::filtersCanBeComposited):
(WebCore::GraphicsLayerCA::createPlatformCALayer):

  • platform/graphics/ca/LayerFlushScheduler.h: Ditto.
  • platform/graphics/ca/PlatformCAAnimation.h: Ditto.
  • platform/graphics/ca/PlatformCAFilters.h: Ditto.
  • platform/graphics/ca/PlatformCALayer.h: Ditto.
  • platform/graphics/cg/BitmapImageCG.cpp: Ditto.
  • platform/graphics/cg/GraphicsContextCG.cpp: Ditto.

(WebCore::GraphicsContext::setAllowsFontSmoothing):

  • platform/graphics/cg/GraphicsContextPlatformPrivateCG.h: Ditto.
  • platform/graphics/cg/ImageBufferCG.cpp: Ditto.
  • platform/graphics/cg/ImageBufferDataCG.h: Ditto.
  • platform/graphics/cg/ImageCG.cpp: Ditto.
  • platform/graphics/cg/ImageSourceCG.cpp: Ditto.

(WebCore::ImageSource::setData):

  • platform/graphics/cg/ImageSourceCG.h: Ditto.
  • platform/graphics/cg/PathCG.cpp: Ditto.

(WebCore::Path::platformAddPathForRoundedRect):

  • platform/graphics/cg/PatternCG.cpp: Ditto.
  • platform/graphics/gpu/DrawingBuffer.h: Ditto.
  • platform/graphics/mac/MediaPlayerPrivateQTKit.mm:

(WebCore::MediaPlayerPrivateQTKit::createQTMovieView): Removed PLATFORM(MAC) guards, since
this file is only used on Mac and iOS.

  • platform/graphics/opengl/Extensions3DOpenGL.cpp:

(WebCore::Extensions3DOpenGL::supportsExtension): Changed the GL_EXT_draw_buffers check to
match the implementation.

  • platform/graphics/opengl/GraphicsContext3DOpenGL.cpp: Changed PLATFORM(MAC) to

PLATFORM(COCOA).

  • platform/mac/KeyEventMac.mm: Added !PLATFORM(IOS).
  • platform/mac/PlatformEventFactoryMac.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/mac/WebCoreSystemInterface.h: Ditto. Removed redundant check for PLATFORM(MAC).
  • platform/mac/WebCoreSystemInterface.mm: Removed redundant check for PLATFORM(MAC).
platform/network/Credential.h: Changed PLATFORM(IOS)
PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/network/NetworkStateNotifier.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • platform/network/NetworkStorageSession.h: Ditto.
  • platform/network/NetworkingContext.h: Ditto.
  • platform/network/ProtectionSpace.cpp: Ditto.

(WebCore::ProtectionSpace::receivesCredentialSecurely):

  • platform/network/ResourceHandle.cpp: Ditto.

(WebCore::ResourceHandle::clearAuthentication):
(WebCore::ResourceHandle::shouldContentSniffURL):

  • platform/network/ResourceHandle.h: Ditto.
  • platform/network/ResourceHandleClient.cpp: Ditto.
  • platform/network/ResourceHandleClient.h: Ditto.
  • platform/network/ResourceHandleInternal.h: Ditto.

(WebCore::ResourceHandleInternal::ResourceHandleInternal):

  • platform/network/ResourceRequestBase.cpp: Ditto.
  • platform/network/cf/AuthenticationCF.h: Ditto.
  • platform/network/cf/CookieStorageCFNet.cpp: Ditto.
  • platform/network/cf/CredentialStorageCFNet.cpp: Ditto.
  • platform/network/cf/FormDataStreamCFNet.cpp: Ditto.
  • platform/network/cf/NetworkStorageSessionCFNet.cpp: Ditto.

(WebCore::NetworkStorageSession::switchToNewTestingSession):
(WebCore::NetworkStorageSession::createPrivateBrowsingSession):

  • platform/network/cf/ResourceError.h: Ditto.
  • platform/network/cf/ResourceHandleCFNet.cpp: Ditto.

(WebCore::ResourceHandle::createCFURLConnection):

  • platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
  • platform/network/cf/ResourceRequest.h: Ditto.

(WebCore::ResourceRequest::ResourceRequest):

  • platform/network/cf/ResourceRequestCFNet.cpp: Ditto.

(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
(WebCore::ResourceRequest::setStorageSession):

  • platform/network/cf/ResourceResponse.h: Ditto.
  • platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:

(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):

  • platform/network/mac/ResourceResponseMac.mm: Ditto.
  • platform/posix/FileSystemPOSIX.cpp: Changed PLATFORM(MAC) to OS(DARWIN) &&

!PLATFORM(EFL) && !PLATFORM(GTK).

  • platform/text/TextBoundaries.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
Location:
trunk/Source/WebCore
Files:
104 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r163655 r163657  
     12014-02-07  Dan Bernstein  <mitz@apple.com>
     2
     3        Stop using PLATFORM(MAC) in WebCore/platform except where it means “OS X but not iOS”
     4        https://bugs.webkit.org/show_bug.cgi?id=128404
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Configurations/WebCore.xcconfig: Removed KeyEventMac.mm from
     9        EXCLUDED_SOURCE_FILE_NAMES_iphoneos, because that file contains !PLATFORM(IOS) guards.
     10        Removed WheelEventMac.mm from the same definition, because that file no longer exists.
     11        * platform/ContentFilter.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     12        * platform/ContextMenu.h: Ditto.
     13        * platform/ContextMenuItem.h: Ditto.
     14        * platform/Cursor.cpp: Ditto.
     15        * platform/Cursor.h: Ditto.
     16        * platform/DragData.cpp: Ditto.
     17        * platform/DragImage.cpp: Ditto.
     18        * platform/Language.cpp:
     19        (WebCore::displayNameForLanguageLocale): Changed PLATFORM(MAC) to USE(CF) && !PLATFORM(WIN).
     20        * platform/LocalizedStrings.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     21        (WebCore::contextMenuItemTagSearchWeb):
     22        * platform/LocalizedStrings.h: Ditto.
     23        * platform/MIMETypeRegistry.cpp: Ditto.
     24        (WebCore::initializeSupportedImageMIMETypesForEncoding):
     25        * platform/PasteboardStrategy.h: Ditto.
     26        * platform/PlatformKeyboardEvent.h: Ditto.
     27        * platform/PlatformMenuDescription.h: Ditto.
     28        * platform/PlatformSpeechSynthesizer.h: Ditto.
     29        * platform/PlatformWheelEvent.h: Ditto.
     30        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
     31        * platform/SchemeRegistry.cpp: Ditto.
     32        (WebCore::localURLSchemes):
     33        (WebCore::SchemeRegistry::removeURLSchemeRegisteredAsLocal):
     34        (WebCore::SchemeRegistry::shouldCacheResponsesFromURLSchemeIndefinitely):
     35        * platform/ScrollAnimator.cpp: Ditto.
     36        (WebCore::ScrollAnimator::handleWheelEvent):
     37        * platform/ScrollAnimator.h: Ditto.
     38        * platform/ScrollView.cpp: Ditto.
     39        * platform/ScrollView.h: Ditto.
     40        * platform/ScrollbarThemeComposite.h: Ditto.
     41        * platform/SharedBuffer.h: Changed PLATFORM(MAC) to USE(FOUNDATION) around NSData-related
     42        code.
     43        * platform/URL.h: Changed PLATFORM(MAC) to USE(FOUNDATION) around NSURL-related code.
     44        * platform/Widget.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     45        * platform/Widget.h: Ditto.
     46        * platform/audio/AudioSession.cpp: Changed !PLATFORM(MAC) && !PLATFORM(IOS) to
     47        !PLATFORM(COCOA).
     48        * platform/audio/HRTFElevation.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     49        * platform/audio/MediaSessionManager.cpp: Ditto.
     50        * platform/audio/mac/AudioSessionMac.cpp: Updated comment.
     51        * platform/audio/mac/MediaSessionManagerMac.cpp: Removed PLATFORM(MAC) from Cocoa-only file.
     52        * platform/cf/SharedBufferCF.cpp: Changed !PLATFORM(MAC) to !USE(FOUNDATION) and updated
     53        comment.
     54        * platform/cf/URLCF.cpp: Changed !PLATFORM(MAC) to !USE(FOUNDATION).
     55        * platform/graphics/BitmapImage.h: Changed one instance of PLATFORM(MAC) to
     56        USE(CG) || USE(APPKIT), and another to PLATFORM(COCOA).
     57        * platform/graphics/DisplayRefreshMonitor.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     58        (WebCore::DisplayRefreshMonitor::DisplayRefreshMonitor):
     59        * platform/graphics/DisplayRefreshMonitor.h: Ditto.
     60        * platform/graphics/FloatPoint.h: Collapsed nested #ifs into a single #if.
     61        * platform/graphics/FloatRect.h: Ditto.
     62        * platform/graphics/FloatSize.h: Ditto.
     63        * platform/graphics/Font.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     64        * platform/graphics/Font.h: Ditto.
     65        * platform/graphics/FontCache.cpp: Ditto.
     66        (WebCore::FontCache::getFontData):
     67        * platform/graphics/FontCache.h: Ditto. Also removed redundant friend class declaration.
     68        * platform/graphics/FontGlyphs.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     69        (WebCore::FontGlyphs::glyphDataAndPageForCharacter):
     70        * platform/graphics/GlyphPage.h: Ditto.
     71        * platform/graphics/GraphicsContext3D.h: Ditto.
     72        * platform/graphics/Image.h: Changed PLATFORM(MAC) to USE(APPKIT) around use of NSImage.
     73        Changed another PLATFORM(MAC) to PLATFORM(COCOA).
     74        * platform/graphics/IntRect.h: Collapsed nested #ifs into a single #if.
     75        * platform/graphics/IntSize.h: Ditto.
     76        * platform/graphics/MediaPlayer.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     77        (WebCore::installedMediaEngines):
     78        (WebCore::MediaPlayer::supportsType):
     79        * platform/graphics/SimpleFontData.cpp: Ditto.
     80        (WebCore::SimpleFontData::nonSyntheticItalicFontData):
     81        (WebCore::SimpleFontData::DerivedFontData::~DerivedFontData):
     82        * platform/graphics/SimpleFontData.h: Ditto.
     83        * platform/graphics/TiledBacking.h: Ditto.
     84        * platform/graphics/ca/GraphicsLayerCA.cpp: Ditto.
     85        (WebCore::GraphicsLayerCA::filtersCanBeComposited):
     86        (WebCore::GraphicsLayerCA::createPlatformCALayer):
     87        * platform/graphics/ca/LayerFlushScheduler.h: Ditto.
     88        * platform/graphics/ca/PlatformCAAnimation.h: Ditto.
     89        * platform/graphics/ca/PlatformCAFilters.h: Ditto.
     90        * platform/graphics/ca/PlatformCALayer.h: Ditto.
     91        * platform/graphics/cg/BitmapImageCG.cpp: Ditto.
     92        * platform/graphics/cg/GraphicsContextCG.cpp: Ditto.
     93        (WebCore::GraphicsContext::setAllowsFontSmoothing):
     94        * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h: Ditto.
     95        * platform/graphics/cg/ImageBufferCG.cpp: Ditto.
     96        * platform/graphics/cg/ImageBufferDataCG.h: Ditto.
     97        * platform/graphics/cg/ImageCG.cpp: Ditto.
     98        * platform/graphics/cg/ImageSourceCG.cpp: Ditto.
     99        (WebCore::ImageSource::setData):
     100        * platform/graphics/cg/ImageSourceCG.h: Ditto.
     101        * platform/graphics/cg/PathCG.cpp: Ditto.
     102        (WebCore::Path::platformAddPathForRoundedRect):
     103        * platform/graphics/cg/PatternCG.cpp: Ditto.
     104        * platform/graphics/gpu/DrawingBuffer.h: Ditto.
     105        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
     106        (WebCore::MediaPlayerPrivateQTKit::createQTMovieView): Removed PLATFORM(MAC) guards, since
     107        this file is only used on Mac and iOS.
     108        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
     109        (WebCore::Extensions3DOpenGL::supportsExtension): Changed the GL_EXT_draw_buffers check to
     110        match the implementation.
     111        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp: Changed PLATFORM(MAC) to
     112        PLATFORM(COCOA).
     113        * platform/mac/KeyEventMac.mm: Added !PLATFORM(IOS).
     114        * platform/mac/PlatformEventFactoryMac.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     115        * platform/mac/WebCoreSystemInterface.h: Ditto. Removed redundant check for PLATFORM(MAC).
     116        * platform/mac/WebCoreSystemInterface.mm: Removed redundant check for PLATFORM(MAC).
     117        * platform/network/Credential.h: Changed PLATFORM(IOS) || PLATFORM(MAC) to PLATFORM(COCOA).
     118        * platform/network/NetworkStateNotifier.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     119        * platform/network/NetworkStorageSession.h: Ditto.
     120        * platform/network/NetworkingContext.h: Ditto.
     121        * platform/network/ProtectionSpace.cpp: Ditto.
     122        (WebCore::ProtectionSpace::receivesCredentialSecurely):
     123        * platform/network/ResourceHandle.cpp: Ditto.
     124        (WebCore::ResourceHandle::clearAuthentication):
     125        (WebCore::ResourceHandle::shouldContentSniffURL):
     126        * platform/network/ResourceHandle.h: Ditto.
     127        * platform/network/ResourceHandleClient.cpp: Ditto.
     128        * platform/network/ResourceHandleClient.h: Ditto.
     129        * platform/network/ResourceHandleInternal.h: Ditto.
     130        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
     131        * platform/network/ResourceRequestBase.cpp: Ditto.
     132        * platform/network/cf/AuthenticationCF.h: Ditto.
     133        * platform/network/cf/CookieStorageCFNet.cpp: Ditto.
     134        * platform/network/cf/CredentialStorageCFNet.cpp: Ditto.
     135        * platform/network/cf/FormDataStreamCFNet.cpp: Ditto.
     136        * platform/network/cf/NetworkStorageSessionCFNet.cpp: Ditto.
     137        (WebCore::NetworkStorageSession::switchToNewTestingSession):
     138        (WebCore::NetworkStorageSession::createPrivateBrowsingSession):
     139        * platform/network/cf/ResourceError.h: Ditto.
     140        * platform/network/cf/ResourceHandleCFNet.cpp: Ditto.
     141        (WebCore::ResourceHandle::createCFURLConnection):
     142        * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
     143        * platform/network/cf/ResourceRequest.h: Ditto.
     144        (WebCore::ResourceRequest::ResourceRequest):
     145        * platform/network/cf/ResourceRequestCFNet.cpp: Ditto.
     146        (WebCore::ResourceRequest::doUpdatePlatformRequest):
     147        (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
     148        (WebCore::ResourceRequest::setStorageSession):
     149        * platform/network/cf/ResourceResponse.h: Ditto.
     150        * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
     151        (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
     152        * platform/network/mac/ResourceResponseMac.mm: Ditto.
     153        * platform/posix/FileSystemPOSIX.cpp: Changed PLATFORM(MAC) to OS(DARWIN) &&
     154        !PLATFORM(EFL) && !PLATFORM(GTK).
     155        * platform/text/TextBoundaries.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     156
    11572014-02-07  Ryosuke Niwa  <rniwa@webkit.org>
    2158

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r162477 r163657  
    113113
    114114EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
    115 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ClipboardMac.mm ColorMac.mm Cursor.cpp CursorMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KeyEventMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollingCoordinatorMac.mm ScrollingStateScrollingNodeMac.mm ScrollingTreeScrollingNodeMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WheelEventMac.mm WidgetMac.mm mac/LayerPool.mm DisplayRefreshMonitorMac.cpp;
     115EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ClipboardMac.mm ColorMac.mm Cursor.cpp CursorMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollingCoordinatorMac.mm ScrollingStateScrollingNodeMac.mm ScrollingTreeScrollingNodeMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm mac/LayerPool.mm DisplayRefreshMonitorMac.cpp;
    116116EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
    117117EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm JSTouch* JSGesture* DOMGesture* DOMTouch* KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h;

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

    r163486 r163657  
    3737#endif
    3838
    39 #if PLATFORM(MAC)
     39#if PLATFORM(COCOA)
    4040OBJC_CLASS NSMutableData;
    4141OBJC_CLASS WebFilterEvaluator;
    … …  
    7575    explicit ContentFilter(const ResourceResponse&);
    7676   
    77 #if PLATFORM(MAC)
     77#if PLATFORM(COCOA)
    7878    RetainPtr<WebFilterEvaluator> m_platformContentFilter;
    7979    RetainPtr<NSData> m_replacementData;

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

    r149186 r163657  
    3535#include <wtf/text/WTFString.h>
    3636
    37 #if PLATFORM(MAC)
     37#if PLATFORM(COCOA)
    3838#include <wtf/RetainPtr.h>
    3939#elif PLATFORM(WIN)
    … …  
    8888        Vector<ContextMenuItem> m_items;
    8989#else
    90 #if PLATFORM(MAC)
     90#if PLATFORM(COCOA)
    9191        // Keep this in sync with the PlatformMenuDescription typedef
    9292        RetainPtr<NSMutableArray> m_platformDescription;

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

    r156795 r163657  
    3434#include <wtf/text/WTFString.h>
    3535
    36 #if PLATFORM(MAC)
     36#if PLATFORM(COCOA)
    3737#include <wtf/RetainPtr.h>
    3838OBJC_CLASS NSMenuItem;
    … …  
    138138        ContextMenuItemTagTextDirectionLeftToRight,
    139139        ContextMenuItemTagTextDirectionRightToLeft,
    140 #if PLATFORM(MAC)
     140#if PLATFORM(COCOA)
    141141        ContextMenuItemTagCorrectSpellingAutomatically,
    142142        ContextMenuItemTagSubstitutionsMenu,
    … …  
    178178
    179179#if ENABLE(CONTEXT_MENUS)
    180 #if PLATFORM(MAC)
     180#if PLATFORM(COCOA)
    181181    typedef NSMenuItem* PlatformMenuItemDescription;
    182182#elif PLATFORM(GTK)
    … …  
    248248        Vector<ContextMenuItem> m_subMenuItems;
    249249#else
    250 #if PLATFORM(MAC)
     250#if PLATFORM(COCOA)
    251251        RetainPtr<NSMenuItem> m_platformDescription;
    252252#else

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

    r161662 r163657  
    177177}
    178178
    179 #if !PLATFORM(MAC)
     179#if !PLATFORM(COCOA)
    180180
    181181PlatformCursor Cursor::platformCursor() const

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

    r162451 r163657  
    3737#include <wtf/PassRefPtr.h>
    3838#include <wtf/RefCounted.h>
    39 #elif PLATFORM(MAC)
     39#elif PLATFORM(COCOA)
    4040#include <wtf/RetainPtr.h>
    4141#elif PLATFORM(GTK)

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

    r156692 r163657  
    3232namespace WebCore {
    3333
    34 #if !PLATFORM(MAC)
     34#if !PLATFORM(COCOA)
    3535DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition,
    3636    DragOperation sourceOperationMask, DragApplicationFlags flags)

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

    r161825 r163657  
    202202}
    203203
    204 #if !PLATFORM(MAC) && (!PLATFORM(WIN) || OS(WINCE))
     204#if !PLATFORM(COCOA) && (!PLATFORM(WIN) || OS(WINCE))
    205205DragImageRef createDragImageForLink(URL&, const String&, FontRenderingMode)
    206206{

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

    r149255 r163657  
    3131#include <wtf/text/WTFString.h>
    3232
    33 #if PLATFORM(MAC)
     33#if USE(CF) && !PLATFORM(WIN)
    3434#include <CoreFoundation/CoreFoundation.h>
    3535#endif
    … …  
    148148String displayNameForLanguageLocale(const String& localeName)
    149149{
    150 #if PLATFORM(MAC)
     150#if USE(CF) && !PLATFORM(WIN)
    151151    if (!localeName.isNull() && !localeName.isEmpty()) {
    152152        RetainPtr<CFLocaleRef> currentLocale = adoptCF(CFLocaleCopyCurrent());

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

    r162629 r163657  
    3838#endif
    3939
    40 #if PLATFORM(MAC)
     40#if PLATFORM(COCOA)
    4141#include "WebCoreSystemInterface.h"
    4242#endif
    … …  
    134134}
    135135
    136 #if PLATFORM(MAC)
     136#if PLATFORM(COCOA)
    137137String copyImageUnknownFileLabel()
    138138{
    … …  
    227227}
    228228
    229 #if PLATFORM(MAC)
     229#if PLATFORM(COCOA)
    230230String contextMenuItemTagSearchInSpotlight()
    231231{
    … …  
    236236String contextMenuItemTagSearchWeb()
    237237{
    238 #if PLATFORM(MAC)
     238#if PLATFORM(COCOA)
    239239    RetainPtr<CFStringRef> searchProviderName = adoptCF(wkCopyDefaultSearchProviderDisplayName());
    240240    return formatLocalizedString(WEB_UI_STRING("Search with %@", "Search with search provider context menu item with provider name inserted"), searchProviderName.get());
    … …  
    296296}
    297297
    298 #if PLATFORM(MAC)
     298#if PLATFORM(COCOA)
    299299String contextMenuItemTagShowFonts()
    300300{
    … …  
    323323}
    324324
    325 #if PLATFORM(MAC)
     325#if PLATFORM(COCOA)
    326326String contextMenuItemTagStyles()
    327327{
    … …  
    375375}
    376376
    377 #if PLATFORM(MAC)
     377#if PLATFORM(COCOA)
    378378
    379379String contextMenuItemTagCorrectSpellingAutomatically()
    … …  
    445445}
    446446
    447 #endif // PLATFORM(MAC)
     447#endif // PLATFORM(COCOA)
    448448
    449449String contextMenuItemTagOpenVideoInNewWindow()
    … …  
    654654#endif // !PLATFORM(IOS)
    655655
    656 #if PLATFORM(MAC) || PLATFORM(IOS)
     656#if PLATFORM(COCOA)
    657657String AXARIAContentGroupText(const String& ariaType)
    658658{
    … …  
    701701    return String();
    702702}
    703 #endif // PLATFORM(MAC) || PLATFORM(IOS)
     703#endif // PLATFORM(COCOA)
    704704
    705705String missingPluginText()
    … …  
    747747#endif
    748748
    749 #if PLATFORM(MAC)
     749#if PLATFORM(COCOA)
    750750String builtInPDFPluginName()
    751751{

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

    r162629 r163657  
    4444    String defaultDetailsSummaryText();
    4545
    46 #if PLATFORM(MAC)
     46#if PLATFORM(COCOA)
    4747    String copyImageUnknownFileLabel();
    4848#endif
    … …  
    106106    String contextMenuItemTagLeftToRight();
    107107    String contextMenuItemTagRightToLeft();
    108 #if PLATFORM(MAC)
     108#if PLATFORM(COCOA)
    109109    String contextMenuItemTagSearchInSpotlight();
    110110    String contextMenuItemTagShowFonts();
    … …  
    180180    String weekFormatInLDML();
    181181#endif
    182 #if PLATFORM(MAC) || PLATFORM(IOS)
     182#if PLATFORM(COCOA)
    183183    String AXARIAContentGroupText(const String& ariaType);
    184184#endif
    … …  
    197197#endif
    198198
    199 #if PLATFORM(MAC)
     199#if PLATFORM(COCOA)
    200200    String builtInPDFPluginName();
    201201    String pdfDocumentTypeDescription();
    … …  
    250250    String textTrackAutomaticMenuItemText();
    251251    String textTrackNoLabelText();
    252 #if PLATFORM(MAC) || PLATFORM(WIN)
     252#if PLATFORM(COCOA) || PLATFORM(WIN)
    253253    String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language);
    254254    String textTrackLanguageMenuItemText(const String& title, const String& language);

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

    r163440 r163657  
    287287
    288288#if USE(CG)
    289 #if PLATFORM(MAC)
     289#if PLATFORM(COCOA)
    290290    RetainPtr<CFArrayRef> supportedTypes = adoptCF(CGImageDestinationCopyTypeIdentifiers());
    291291    CFIndex count = CFArrayGetCount(supportedTypes.get());

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

    r156588 r163657  
    5252    virtual long changeCount() = 0;
    5353#endif // PLATFORM(IOS)
    54 #if PLATFORM(MAC)
     54#if PLATFORM(COCOA)
    5555    virtual void getTypes(Vector<String>& types, const String& pasteboardName) = 0;
    5656    virtual PassRefPtr<SharedBuffer> bufferForType(const String& pasteboardType, const String& pasteboardName) = 0;

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

    r161680 r163657  
    3232#include <wtf/text/WTFString.h>
    3333
    34 #if PLATFORM(MAC)
     34#if PLATFORM(COCOA)
    3535#include <wtf/RetainPtr.h>
    3636OBJC_CLASS NSEvent;
    … …  
    3838
    3939#if PLATFORM(IOS)
    40 #ifdef __OBJC__
    41 @class WebEvent;
    42 #else
    43 class WebEvent;
    44 #endif
     40OBCJ_CLASS WebEvent;
    4541#endif
    4642
    … …  
    120116        static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey);
    121117
    122 #if PLATFORM(MAC)
     118#if PLATFORM(COCOA)
    123119#if !PLATFORM(IOS)
    124120        NSEvent* macEvent() const { return m_macEvent.get(); }
    … …  
    159155        bool m_isSystemKey;
    160156
    161 #if PLATFORM(MAC)
     157#if PLATFORM(COCOA)
    162158#if !PLATFORM(IOS)
    163159        RetainPtr<NSEvent> m_macEvent;

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

    r156795 r163657  
    2727#define PlatformMenuDescription_h
    2828
    29 #if PLATFORM(MAC)
     29#if PLATFORM(COCOA)
    3030OBJC_CLASS NSMutableArray;
    3131#elif PLATFORM(WIN)
    … …  
    3838
    3939#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
    40 #if PLATFORM(MAC)
     40#if PLATFORM(COCOA)
    4141    typedef NSMutableArray* PlatformMenuDescription;
    4242#elif PLATFORM(GTK)

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

    r157653 r163657  
    3333#include <wtf/Vector.h>
    3434
    35 #if PLATFORM(MAC)
     35#if PLATFORM(COCOA)
    3636#include <wtf/RetainPtr.h>
    3737OBJC_CLASS WebSpeechSynthesisWrapper;
    … …  
    8787    PlatformSpeechSynthesizerClient* m_speechSynthesizerClient;
    8888   
    89 #if PLATFORM(MAC)
     89#if PLATFORM(COCOA)
    9090    RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
    9191#endif

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

    r163338 r163657  
    5454    };
    5555
    56 #if PLATFORM(MAC)
     56#if PLATFORM(COCOA)
    5757    enum PlatformWheelEventPhase {
    5858        PlatformWheelEventPhaseNone        = 0,
    … …  
    7676            , m_granularity(ScrollByPixelWheelEvent)
    7777            , m_directionInvertedFromDevice(false)
    78 #if PLATFORM(MAC)
     78#if PLATFORM(COCOA)
    7979            , m_hasPreciseScrollingDeltas(false)
    8080            , m_phase(PlatformWheelEventPhaseNone)
    … …  
    9797            , m_granularity(granularity)
    9898            , m_directionInvertedFromDevice(false)
    99 #if PLATFORM(MAC)
     99#if PLATFORM(COCOA)
    100100            , m_hasPreciseScrollingDeltas(false)
    101101            , m_phase(PlatformWheelEventPhaseNone)
    … …  
    155155#endif
    156156
    157 #if PLATFORM(MAC)
     157#if PLATFORM(COCOA)
    158158        bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
    159159        void setHasPreciseScrollingDeltas(bool b) { m_hasPreciseScrollingDeltas = b; }
    … …  
    186186        PlatformWheelEventGranularity m_granularity;
    187187        bool m_directionInvertedFromDevice;
    188 #if PLATFORM(MAC)
     188#if PLATFORM(COCOA)
    189189        bool m_hasPreciseScrollingDeltas;
    190190        PlatformWheelEventPhase m_phase;

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

    r163121 r163657  
    3737    if (localSchemes.isEmpty()) {
    3838        localSchemes.add("file");
    39 #if PLATFORM(MAC)
     39#if PLATFORM(COCOA)
    4040        localSchemes.add("applewebdata");
    4141#endif
    … …  
    123123    if (scheme == "file")
    124124        return;
    125 #if PLATFORM(MAC)
     125#if PLATFORM(COCOA)
    126126    if (scheme == "applewebdata")
    127127        return;
    … …  
    326326bool SchemeRegistry::shouldCacheResponsesFromURLSchemeIndefinitely(const String& scheme)
    327327{
    328 #if PLATFORM(MAC)
     328#if PLATFORM(COCOA)
    329329    if (equalIgnoringCase(scheme, "applewebdata"))
    330330        return true;

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

    r162985 r163657  
    8282bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
    8383{
    84 #if PLATFORM(MAC)
     84#if PLATFORM(COCOA)
    8585    // Events in the PlatformWheelEventPhaseMayBegin phase have no deltas, and therefore never passes through the scroll handling logic below.
    8686    // This causes us to return with an 'unhandled' return state, even though this event was successfully processed.

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

    r161589 r163657  
    6868#endif
    6969
    70 #if PLATFORM(MAC)
     70#if PLATFORM(COCOA)
    7171    virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }
    7272#endif

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

    r163079 r163657  
    13981398}
    13991399
    1400 #if !PLATFORM(MAC)
     1400#if !PLATFORM(COCOA)
    14011401
    14021402void ScrollView::platformAddChild(Widget*)
    … …  
    14101410#endif
    14111411
    1412 #if !PLATFORM(MAC)
     1412#if !PLATFORM(COCOA)
    14131413
    14141414void ScrollView::platformSetScrollbarsSuppressed(bool)
    … …  
    14261426#endif
    14271427
    1428 #if !PLATFORM(MAC)
     1428#if !PLATFORM(COCOA)
    14291429
    14301430void ScrollView::platformSetScrollbarModes()

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

    r162663 r163657  
    5454#endif // PLATFORM(IOS)
    5555
    56 #if PLATFORM(MAC) && defined __OBJC__
     56#if PLATFORM(COCOA) && defined __OBJC__
    5757@protocol WebCoreFrameScrollView;
    5858#endif
    … …  
    447447    void updateOverhangAreas();
    448448
    449 #if PLATFORM(MAC) && defined __OBJC__
     449#if PLATFORM(COCOA) && defined __OBJC__
    450450public:
    451451    NSView* documentView() const;

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

    r157253 r163657  
    2929#include "ScrollbarTheme.h"
    3030
    31 #if PLATFORM(MAC)
     31#if PLATFORM(COCOA)
    3232typedef id ScrollbarPainter;
    3333#else

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

    r163444 r163657  
    4343#endif
    4444
    45 #if PLATFORM(MAC)
     45#if USE(FOUNDATION)
    4646OBJC_CLASS NSData;
    4747#endif
    … …  
    6868    ~SharedBuffer();
    6969   
    70 #if PLATFORM(MAC)
     70#if USE(FOUNDATION)
    7171    // FIXME: This class exists as a temporary workaround so that code that does:
    7272    // [buffer->createNSData() autorelease] will fail to compile.

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

    r162922 r163657  
    4040#endif
    4141
    42 #if PLATFORM(MAC)
     42#if USE(FOUNDATION)
    4343OBJC_CLASS NSURL;
    4444#endif
    … …  
    170170#endif
    171171
    172 #if PLATFORM(MAC)
     172#if USE(FOUNDATION)
    173173    URL(NSURL*);
    174174    operator NSURL*() const;

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

    r159023 r163657  
    142142}
    143143
    144 #if !PLATFORM(MAC)
     144#if !PLATFORM(COCOA)
    145145IntRect Widget::convertFromRootToContainingWindow(const Widget*, const IntRect& rect)
    146146{

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

    r162451 r163657  
    3939#include <wtf/RefCounted.h>
    4040
    41 #if PLATFORM(MAC)
     41#if PLATFORM(COCOA)
    4242#include <wtf/RetainPtr.h>
    4343#endif
    4444
    45 #if PLATFORM(MAC)
     45#if PLATFORM(COCOA)
    4646OBJC_CLASS NSView;
    4747OBJC_CLASS NSWindow;
    … …  
    185185    virtual bool transformsAffectFrameRect() { return true; }
    186186
    187 #if PLATFORM(MAC)
     187#if PLATFORM(COCOA)
    188188    NSView* getOuterView() const;
    189189
    … …  
    221221private:
    222222    ScrollView* m_parent;
    223 #if !PLATFORM(MAC)
     223#if !PLATFORM(COCOA)
    224224    PlatformWidget m_widget;
    225225#else
    … …  
    239239    TYPE_CASTS_BASE(ToValueTypeName, Widget, object, object->predicate, object.predicate)
    240240
    241 #if !PLATFORM(MAC)
     241#if !PLATFORM(COCOA)
    242242
    243243inline PlatformWidget Widget::platformWidget() const

  • trunk/Source/WebCore/platform/audio/AudioSession.cpp

    r150651 r163657  
    6262}
    6363
    64 #if !PLATFORM(IOS) && !PLATFORM(MAC)
     64#if !PLATFORM(COCOA)
    6565class AudioSessionPrivate {
    6666};
    … …  
    125125    notImplemented();
    126126}
    127 #endif // !PLATFORM(IOS)
     127#endif // !PLATFORM(COCOA)
    128128
    129129}

  • trunk/Source/WebCore/platform/audio/HRTFElevation.cpp

    r162451 r163657  
    5959const float ResponseSampleRate = 44100;
    6060
    61 #if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER)
     61#if PLATFORM(COCOA) || USE(WEBAUDIO_GSTREAMER)
    6262#define USE_CONCATENATED_IMPULSE_RESPONSES
    6363#endif

  • trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp

    r163390 r163657  
    177177}
    178178
    179 #if !PLATFORM(MAC)
     179#if !PLATFORM(COCOA)
    180180void MediaSessionManager::updateSessionState()
    181181{

  • trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp

    r162368 r163657  
    165165}
    166166
    167 #endif // USE(AUDIO_SESSION) && PLATFORM(MAC)
     167#endif // USE(AUDIO_SESSION) && PLATFORM(MAC) && !PLATFORM(IOS)

  • trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp

    r161694 r163657  
    2727#include "MediaSessionManager.h"
    2828
    29 #if USE(AUDIO_SESSION) && PLATFORM(MAC)
     29#if USE(AUDIO_SESSION)
    3030
    3131#include "AudioSession.h"
    … …  
    3737static const size_t kWebAudioBufferSize = 128;
    3838
    39 #if PLATFORM(IOS) ||__MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     39#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    4040static const size_t kLowPowerVideoBufferSize = 4096;
    4141#endif
    … …  
    5555}
    5656
    57 #endif // USE(AUDIO_SESSION) && PLATFORM(MAC)
     57#endif // USE(AUDIO_SESSION)

  • trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp

    r161589 r163657  
    5050}
    5151
    52 // Mac is a CF platform but has an even more efficient version of this method,
    53 // so only use this version for non-Mac
    54 #if !PLATFORM(MAC)
     52// Using Foundation allows for an even more efficient implementation of this function,
     53// so only use this version for non-Foundation.
     54#if !USE(FOUNDATION)
    5555RetainPtr<CFDataRef> SharedBuffer::createCFData()
    5656{

  • trunk/Source/WebCore/platform/cf/URLCF.cpp

    r161589 r163657  
    5151}
    5252
    53 #if !PLATFORM(MAC)
     53#if !USE(FOUNDATION)
    5454RetainPtr<CFURLRef> URL::createCFURL() const
    5555{

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

    r162827 r163657  
    3535#include "IntSize.h"
    3636
    37 #if PLATFORM(MAC)
     37#if USE(CG) || USE(APPKIT)
    3838#include <wtf/RetainPtr.h>
    3939#endif
    … …  
    164164#endif
    165165
    166 #if PLATFORM(MAC)
     166#if PLATFORM(COCOA)
    167167    virtual CFDataRef getTIFFRepresentation() override;
    168168#endif

  • trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp

    r161680 r163657  
    6161    , m_displayID(displayID)
    6262    , m_clientsToBeNotified(nullptr)
    63 #if PLATFORM(MAC)
     63#if PLATFORM(COCOA)
    6464    , m_displayLink(0)
    6565#endif

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

    r161680 r163657  
    3636#include <wtf/Threading.h>
    3737
    38 #if PLATFORM(MAC)
     38#if PLATFORM(COCOA)
    3939typedef struct __CVDisplayLink *CVDisplayLinkRef;
    4040#endif

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

    r163231 r163657  
    137137#endif
    138138
    139 #if !PLATFORM(IOS)
    140 #if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     139#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    141140    FloatPoint(const NSPoint&);
    142141    operator NSPoint() const;
    143142#endif
    144 #endif // !PLATFORM(IOS)
    145143
    146144    FloatPoint matrixTransform(const TransformationMatrix&) const;

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

    r161680 r163657  
    172172#endif
    173173
    174 #if !PLATFORM(IOS)
    175 #if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     174#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    176175    FloatRect(const NSRect&);
    177176    operator NSRect() const;
    178177#endif
    179 #endif // !PLATFORM(IOS)
    180178
    181179#if USE(CAIRO)

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

    r161680 r163657  
    114114#endif
    115115
    116 #if !PLATFORM(IOS)
    117 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
     116#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    118117    explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
    119118    operator NSSize() const;
    120119#endif
    121 #endif // !PLATFORM(IOS)
    122120
    123121    void dump(PrintStream& out) const;

  • trunk/Source/WebCore/platform/graphics/Font.cpp

    r163655 r163657  
    410410}
    411411
    412 #if !PLATFORM(MAC)
     412#if !PLATFORM(COCOA)
    413413PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const
    414414{

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

    r161608 r163657  
    158158        return glyphDataAndPageForCharacter(c, mirror, variant).first;
    159159    }
    160 #if PLATFORM(MAC)
     160#if PLATFORM(COCOA)
    161161    const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, size_t length, FontDataVariant) const;
    162162#endif

  • trunk/Source/WebCore/platform/graphics/FontCache.cpp

    r161598 r163657  
    574574        familyIndex = cAllFamiliesScanned;
    575575
    576 #if PLATFORM(MAC)
     576#if PLATFORM(COCOA)
    577577    if (!result) {
    578578        // We didn't find a font. Try to find a similar font using our own specific knowledge about our platform.

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

    r163310 r163657  
    186186#endif
    187187    PassOwnPtr<FontPlatformData> createFontPlatformData(const FontDescription&, const AtomicString& family);
    188 #if PLATFORM(MAC)
     188#if PLATFORM(COCOA)
    189189    PassRefPtr<SimpleFontData> similarFontPlatformData(const FontDescription&);
    190190#endif
    … …  
    195195    int m_purgePreventCount;
    196196
    197 #if PLATFORM(MAC)
     197#if PLATFORM(COCOA)
    198198    friend class ComplexTextController;
    199199#endif
    200200    friend class SimpleFontData; // For getCachedFontData(const FontPlatformData*)
    201201    friend class FontGlyphs;
    202 #if PLATFORM(IOS)
    203     friend class ComplexTextController;
    204 #endif
    205202};
    206203

  • trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp

    r163310 r163657  
    307307                            break;
    308308                        }
    309 #if PLATFORM(MAC)
     309#if PLATFORM(COCOA)
    310310                        else if (data.fontData->platformData().syntheticOblique())
    311311                            return glyphDataAndPageForCJKCharacterWithoutSyntheticItalic(c, data, page, pageNumber);

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

    r163310 r163657  
    170170    // Implemented by the platform.
    171171    bool fill(unsigned offset, unsigned length, UChar* characterBuffer, unsigned bufferLength, const SimpleFontData*);
    172 #if PLATFORM(MAC)
     172#if PLATFORM(COCOA)
    173173    static bool mayUseMixedFontDataWhenFilling(const UChar* characterBuffer, unsigned bufferLength, const SimpleFontData*);
    174174#else

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

    r163079 r163657  
    5151#endif
    5252
    53 #if PLATFORM(MAC)
     53#if PLATFORM(COCOA)
    5454#if PLATFORM(IOS)
    5555#include <OpenGLES/ES2/gl.h>
    … …  
    485485    ~GraphicsContext3D();
    486486
    487 #if PLATFORM(MAC)
     487#if PLATFORM(COCOA)
    488488    PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; }
    489489    Platform3DObject platformTexture() const { return m_compositorTexture; }

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

    r162827 r163657  
    4141#include <wtf/text/WTFString.h>
    4242
    43 #if PLATFORM(MAC)
     43#if USE(APPKIT)
    4444OBJC_CLASS NSImage;
    4545#endif
    … …  
    149149#endif
    150150
    151 #if PLATFORM(MAC)
     151#if PLATFORM(COCOA)
    152152    virtual CFDataRef getTIFFRepresentation() { return 0; }
    153153#endif

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

    r162273 r163657  
    194194#endif
    195195
    196 #if !PLATFORM(IOS)
    197 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
     196#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    198197    operator NSRect() const;
    199198#endif
    200 #endif // !PLATFORM(IOS)
    201199
    202200    void dump(PrintStream& out) const;
    … …  
    251249#endif
    252250
    253 #if !PLATFORM(IOS)
    254 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
     251#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    255252IntRect enclosingIntRect(const NSRect&);
    256253#endif
    257 #endif // !PLATFORM(IOS)
    258254
    259255} // namespace WebCore

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

    r162668 r163657  
    130130#endif
    131131
    132 #if !PLATFORM(IOS)   
    133 #if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     132#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    134133    explicit IntSize(const NSSize &); // don't do this implicitly since it's lossy
    135134    operator NSSize() const;
    136135#endif
    137 #endif // !PLATFORM(IOS)
    138136
    139137#if PLATFORM(WIN)

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r163079 r163657  
    5454#endif
    5555
    56 #if PLATFORM(MAC)
     56#if PLATFORM(COCOA)
    5757#if PLATFORM(IOS)
    5858#include "MediaPlayerPrivateIOS.h"
    … …  
    214214#if USE(AVFOUNDATION)
    215215    if (Settings::isAVFoundationEnabled()) {
    216 #if PLATFORM(MAC)
     216#if PLATFORM(COCOA)
    217217        MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
    218218#if ENABLE(MEDIA_SOURCE)
    … …  
    770770        return IsNotSupported;
    771771
    772 #if PLATFORM(MAC)
     772#if PLATFORM(COCOA)
    773773    // YouTube will ask if the HTMLMediaElement canPlayType video/webm, then
    774774    // video/x-flv, then finally video/mp4, and will then load a URL of the first type

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp

    r161589 r163657  
    237237    if (!m_derivedFontData->nonSyntheticItalic) {
    238238        FontPlatformData nonSyntheticItalicFontPlatformData(m_platformData);
    239 #if PLATFORM(MAC)
     239#if PLATFORM(COCOA)
    240240        nonSyntheticItalicFontPlatformData.m_syntheticOblique = false;
    241241#endif
    … …  
    277277    if (uprightOrientation)
    278278        GlyphPageTreeNode::pruneTreeCustomFontData(uprightOrientation.get());
    279 #if PLATFORM(MAC)
     279#if PLATFORM(COCOA)
    280280    if (compositeFontReferences) {
    281281        CFDictionaryRef dictionary = CFDictionaryRef(compositeFontReferences.get());

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

    r162158 r163657  
    4141#include <wtf/text/StringHash.h>
    4242
    43 #if PLATFORM(MAC)
     43#if PLATFORM(COCOA)
    4444#include "WebCoreSystemInterface.h"
    45 #endif
    46 
    47 #if PLATFORM(MAC)
    4845#include <wtf/RetainPtr.h>
    4946#endif
    … …  
    190187    bool shouldNotBeUsedForArabic() const { return m_shouldNotBeUsedForArabic; };
    191188#endif
    192 #if PLATFORM(MAC)
     189#if PLATFORM(COCOA)
    193190    CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
    194191#endif
    195192
    196 #if PLATFORM(MAC) || USE(HARFBUZZ)
     193#if PLATFORM(COCOA) || USE(HARFBUZZ)
    197194    bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
    198195#endif
    … …  
    288285        RefPtr<SimpleFontData> uprightOrientation;
    289286        RefPtr<SimpleFontData> nonSyntheticItalic;
    290 #if PLATFORM(MAC)
     287#if PLATFORM(COCOA)
    291288        mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
    292289#endif
    … …  
    305302#endif
    306303
    307 #if PLATFORM(MAC)
     304#if PLATFORM(COCOA)
    308305    mutable HashMap<unsigned, RetainPtr<CFDictionaryRef>> m_CFStringAttributes;
    309306#endif
    310307
    311 #if PLATFORM(MAC) || USE(HARFBUZZ)
     308#if PLATFORM(COCOA) || USE(HARFBUZZ)
    312309    mutable OwnPtr<HashMap<String, bool>> m_combiningCharacterSequenceSupport;
    313310#endif

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

    r163190 r163657  
    3333
    3434class IntRect;
    35 #if PLATFORM(MAC)
     35#if PLATFORM(COCOA)
    3636class PlatformCALayer;
    3737#endif
    … …  
    101101    virtual void setScrollingModeIndication(ScrollingModeIndication) = 0;
    102102
    103 #if PLATFORM(MAC)
     103#if PLATFORM(COCOA)
    104104    virtual PlatformCALayer* tiledScrollingIndicatorLayer() = 0;
    105105#endif

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r163104 r163657  
    5151#endif
    5252
    53 #if PLATFORM(MAC)
     53#if PLATFORM(COCOA)
    5454#include "PlatformCALayerMac.h"
    5555#include "WebCoreSystemInterface.h"
    … …  
    316316bool GraphicsLayerCA::filtersCanBeComposited(const FilterOperations& filters)
    317317{
    318 #if PLATFORM(MAC)
     318#if PLATFORM(COCOA)
    319319    return PlatformCALayerMac::filtersCanBeComposited(filters);
    320320#elif PLATFORM(WIN)
    … …  
    326326PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
    327327{
    328 #if PLATFORM(MAC)
     328#if PLATFORM(COCOA)
    329329    return PlatformCALayerMac::create(layerType, owner);
    330330#elif PLATFORM(WIN)
    … …  
    335335PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformLayer* platformLayer, PlatformCALayerClient* owner)
    336336{
    337 #if PLATFORM(MAC)
     337#if PLATFORM(COCOA)
    338338    return PlatformCALayerMac::create(platformLayer, owner);
    339339#elif PLATFORM(WIN)

  • trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h

    r163079 r163657  
    5151    LayerFlushSchedulerClient* m_client;
    5252   
    53 #if PLATFORM(MAC)
     53#if PLATFORM(COCOA)
    5454    RetainPtr<CFRunLoopObserverRef> m_runLoopObserver;
    5555    static void runLoopObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity, void* context);

  • trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h

    r163079 r163657  
    3535#include <wtf/Vector.h>
    3636
    37 #if PLATFORM(MAC)
     37#if PLATFORM(COCOA)
    3838OBJC_CLASS CAPropertyAnimation;
    3939typedef CAPropertyAnimation* PlatformAnimationRef;
    … …  
    5252public:
    5353    friend class PlatformCALayer;
    54 #if PLATFORM(MAC)
     54#if PLATFORM(COCOA)
    5555    friend class PlatformCALayerMac;
    5656#elif PLATFORM(WIN)
    … …  
    155155    AnimationType m_type;
    156156   
    157 #if PLATFORM(MAC)
     157#if PLATFORM(COCOA)
    158158    RetainPtr<CAPropertyAnimation> m_animation;
    159159#elif PLATFORM(WIN)

  • trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h

    r163079 r163657  
    5353    static const char* animatedFilterPropertyName(FilterOperation::OperationType, int internalFilterPropertyIndex);
    5454
    55 #if PLATFORM(MAC)
     55#if PLATFORM(COCOA)
    5656    static RetainPtr<NSValue> filterValueForOperation(const FilterOperation*, int internalFilterPropertyIndex);
    5757#endif

  • trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

    r163079 r163657  
    5050
    5151class PlatformCALayer : public RefCounted<PlatformCALayer> {
    52 #if PLATFORM(MAC)
     52#if PLATFORM(COCOA)
    5353    friend class PlatformCALayerMac;
    5454#elif PLATFORM(WIN)
    … …  
    219219    virtual PassRefPtr<PlatformCALayer> createCompatibleLayer(LayerType, PlatformCALayerClient*) const = 0;
    220220
    221 #if PLATFORM(MAC)
     221#if PLATFORM(COCOA)
    222222    virtual void enumerateRectsBeingDrawn(CGContextRef, void (^block)(CGRect)) = 0;
    223223#endif

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

    r162828 r163657  
    4343#endif
    4444
    45 #if PLATFORM(MAC)
     45#if PLATFORM(COCOA)
    4646#include "WebCoreSystemInterface.h"
    4747#endif

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

    r163387 r163657  
    4444#include <wtf/RetainPtr.h>
    4545
    46 #if PLATFORM(MAC)
     46#if PLATFORM(COCOA)
    4747#include "WebCoreSystemInterface.h"
    4848#endif
    … …  
    16161616{
    16171617    UNUSED_PARAM(allowsFontSmoothing);
    1618 #if PLATFORM(MAC)
     1618#if PLATFORM(COCOA)
    16191619    CGContextRef context = platformContext();
    16201620    CGContextSetAllowsFontSmoothing(context, allowsFontSmoothing);

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h

    r147862 r163657  
    5252    }
    5353
    54 #if PLATFORM(MAC)
     54#if PLATFORM(COCOA)
    5555    // These methods do nothing on Mac.
    5656    void save() {}

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

    r162827 r163657  
    4444#include <wtf/text/WTFString.h>
    4545
    46 #if PLATFORM(MAC)
     46#if PLATFORM(COCOA)
    4747#include "WebCoreSystemInterface.h"
    4848#endif

  • trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h

    r161589 r163657  
    3131#include <wtf/RetainPtr.h>
    3232
    33 #if PLATFORM(MAC) && USE(CA)
     33#if PLATFORM(COCOA) && USE(CA)
    3434#if !PLATFORM(IOS_SIMULATOR)
    3535#define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1

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

    r162827 r163657  
    3636#include <wtf/RetainPtr.h>
    3737
    38 #if PLATFORM(MAC)
     38#if PLATFORM(COCOA)
    3939#include "WebCoreSystemInterface.h"
    4040#endif

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

    r162778 r163657  
    5858#endif
    5959
    60 #if !PLATFORM(MAC)
     60#if !PLATFORM(COCOA)
    6161size_t sharedBufferGetBytesAtPosition(void* info, void* buffer, off_t position, size_t count)
    6262{
    … …  
    152152void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
    153153{
    154 #if PLATFORM(MAC)
     154#if PLATFORM(COCOA)
    155155    if (!m_decoder)
    156156        m_decoder = CGImageSourceCreateIncremental(0);

  • trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.h

    r95901 r163657  
    3636String MIMETypeForImageSourceType(const String& type);
    3737
    38 #if !PLATFORM(MAC)
     38#if !PLATFORM(COCOA)
    3939size_t sharedBufferGetBytesAtPosition(void* info, void* buffer, off_t position, size_t count);
    4040#endif

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

    r162827 r163657  
    4040#include <wtf/text/WTFString.h>
    4141
    42 #if PLATFORM(MAC)
     42#if PLATFORM(COCOA)
    4343#include "WebCoreSystemInterface.h"
    4444#endif
    … …  
    256256void Path::platformAddPathForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
    257257{
    258 #if PLATFORM(MAC)
     258#if PLATFORM(COCOA)
    259259    bool equalWidths = (topLeftRadius.width() == topRightRadius.width() && topRightRadius.width() == bottomLeftRadius.width() && bottomLeftRadius.width() == bottomRightRadius.width());
    260260    bool equalHeights = (topLeftRadius.height() == bottomLeftRadius.height() && bottomLeftRadius.height() == topRightRadius.height() && topRightRadius.height() == bottomRightRadius.height());

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

    r162827 r163657  
    3434#include <wtf/MainThread.h>
    3535
    36 #if PLATFORM(MAC)
     36#if PLATFORM(COCOA)
    3737#include "WebCoreSystemInterface.h"
    3838#endif

  • trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h

    r163079 r163657  
    4040#include <wtf/OwnPtr.h>
    4141#include <wtf/PassOwnPtr.h>
    42 #if PLATFORM(MAC)
     42#if PLATFORM(COCOA)
    4343#include <wtf/RetainPtr.h>
    4444#endif
    … …  
    162162    bool m_contentsChanged;
    163163
    164 #if PLATFORM(MAC)
     164#if PLATFORM(COCOA)
    165165    RetainPtr<WebGLLayer> m_platformLayer;
    166166#endif

  • trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

    r163079 r163657  
    433433    setSize(m_player->size());
    434434    NSView* parentView = 0;
    435 #if PLATFORM(MAC)
    436435    parentView = m_player->frameView()->documentView();
    437436    [parentView addSubview:m_qtMovieView.get()];
    438 #endif
    439437    [m_qtMovieView.get() setDelegate:m_objcObserver.get()];
    440438    [m_objcObserver.get() setView:m_qtMovieView.get()];

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

    r162451 r163657  
    205205
    206206    if (name == "GL_EXT_draw_buffers") {
    207 #if PLATFORM(MAC)
     207#if PLATFORM(MAC) && !PLATFORM(IOS)
    208208        return m_availableExtensions.contains("GL_ARB_draw_buffers");
    209209#else

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

    r162565 r163657  
    352352}
    353353
    354 #if !PLATFORM(MAC)
     354#if !PLATFORM(COCOA)
    355355void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
    356356{

  • trunk/Source/WebCore/platform/mac/KeyEventMac.mm

    r103643 r163657  
    2727#import "PlatformKeyboardEvent.h"
    2828
    29 #if PLATFORM(MAC)
     29#if PLATFORM(MAC) && !PLATFORM(IOS)
    3030
    3131#import "KeyEventCocoa.h"
    … …  
    7979} // namespace WebCore
    8080
    81 #endif // PLATFORM(MAC)
     81#endif // PLATFORM(MAC) && !PLATFORM(IOS)

  • trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h

    r157316 r163657  
    4040};
    4141
    42 #if PLATFORM(MAC) && defined(__OBJC__)
     42#if PLATFORM(COCOA) && defined(__OBJC__)
    4343// FIXME: This doesn't really belong here.
    4444IntPoint globalPoint(const NSPoint& windowPoint, NSWindow *);

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

    r162166 r163657  
    6666#endif
    6767
    68 #if PLATFORM(MAC) && USE(CA)
     68#if PLATFORM(COCOA) && USE(CA)
    6969#if !PLATFORM(IOS_SIMULATOR)
    7070typedef struct __IOSurface *IOSurfaceRef;
    … …  
    262262extern CGSize (*wkCTRunGetInitialAdvance)(CTRunRef);
    263263
    264 #if PLATFORM(MAC) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
     264#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
    265265extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
    266266extern CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
    … …  
    281281   
    282282#if !PLATFORM(IOS)
    283 #if PLATFORM(MAC)
    284283extern NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
    285284extern NSString *(*wkSpeechSynthesisGetDefaultVoiceIdentifierForLocale)(NSLocale *);
    286 #endif
    287285
    288286extern void (*wkUnregisterUniqueIdForElement)(id element);

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm

    r162166 r163657  
    152152NSCursor *(*wkCursor)(const char*);
    153153
    154 #if PLATFORM(MAC)
    155154NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
    156155NSString *(*wkSpeechSynthesisGetDefaultVoiceIdentifierForLocale)(NSLocale *);
    157 #endif
    158156
    159157void (*wkUnregisterUniqueIdForElement)(id element);

  • trunk/Source/WebCore/platform/network/Credential.h

    r161589 r163657  
    2828#include <wtf/text/WTFString.h>
    2929
    30 #define CERTIFICATE_CREDENTIALS_SUPPORTED (PLATFORM(IOS) || PLATFORM(MAC))
     30#define CERTIFICATE_CREDENTIALS_SUPPORTED (PLATFORM(COCOA))
    3131
    3232#if CERTIFICATE_CREDENTIALS_SUPPORTED

  • trunk/Source/WebCore/platform/network/NetworkStateNotifier.h

    r161833 r163657  
    101101};
    102102
    103 #if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(EFL)
     103#if !PLATFORM(COCOA) && !PLATFORM(WIN) && !PLATFORM(EFL)
    104104
    105105inline NetworkStateNotifier::NetworkStateNotifier()

  • trunk/Source/WebCore/platform/network/NetworkStorageSession.h

    r161890 r163657  
    3030#include <wtf/text/WTFString.h>
    3131
    32 #if PLATFORM(MAC) || USE(CFNETWORK)
     32#if PLATFORM(COCOA) || USE(CFNETWORK)
    3333typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
    3434typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
    … …  
    4848    static void switchToNewTestingSession();
    4949
    50 #if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
     50#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
    5151    bool isPrivateBrowsingSession() const { return m_isPrivate; }
    5252#endif
    5353
    54 #if PLATFORM(MAC) || USE(CFNETWORK)
     54#if PLATFORM(COCOA) || USE(CFNETWORK)
    5555    NetworkStorageSession(RetainPtr<CFURLStorageSessionRef>);
    5656    // May be null, in which case a Foundation default should be used.
    … …  
    6969
    7070private:
    71 #if PLATFORM(MAC) || USE(CFNETWORK)
     71#if PLATFORM(COCOA) || USE(CFNETWORK)
    7272    NetworkStorageSession();
    7373    RetainPtr<CFURLStorageSessionRef> m_platformSession;
    … …  
    7878#endif
    7979
    80 #if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
     80#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
    8181    bool m_isPrivate;
    8282#endif

  • trunk/Source/WebCore/platform/network/NetworkingContext.h

    r162920 r163657  
    2525#include <wtf/RetainPtr.h>
    2626
    27 #if PLATFORM(MAC)
     27#if PLATFORM(COCOA)
    2828#include <wtf/SchedulePair.h>
    2929#endif
    3030
    31 #if PLATFORM(MAC)
     31#if PLATFORM(COCOA)
    3232OBJC_CLASS NSOperationQueue;
    3333#endif
    … …  
    5050    virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const = 0;
    5151
    52 #if PLATFORM(MAC)
     52#if PLATFORM(COCOA)
    5353    virtual bool needsSiteSpecificQuirks() const = 0;
    5454    virtual bool localFileContentSniffingEnabled() const = 0; // FIXME: Reconcile with ResourceHandle::forceContentSniffing().
    … …  
    5858#endif
    5959
    60 #if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
     60#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
    6161    virtual NetworkStorageSession& storageSession() const = 0;
    6262#endif

  • trunk/Source/WebCore/platform/network/ProtectionSpace.cpp

    r149255 r163657  
    2626#include "ProtectionSpace.h"
    2727
    28 #if USE(CFNETWORK) && !PLATFORM(MAC)
     28#if USE(CFNETWORK) && !PLATFORM(COCOA)
    2929#include "AuthenticationCF.h"
    3030#include <CFNetwork/CFURLProtectionSpacePriv.h>
    … …  
    9393bool ProtectionSpace::receivesCredentialSecurely() const
    9494{
    95 #if USE(CFNETWORK) && !PLATFORM(MAC)
     95#if USE(CFNETWORK) && !PLATFORM(COCOA)
    9696    RetainPtr<CFURLProtectionSpaceRef> cfSpace = adoptCF(createCF(*this));
    9797    return cfSpace && CFURLProtectionSpaceReceivesCredentialSecurely(cfSpace.get());

  • trunk/Source/WebCore/platform/network/ResourceHandle.cpp

    r161768 r163657  
    153153}
    154154
    155 #if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
     155#if !PLATFORM(COCOA) && !USE(CFNETWORK) && !USE(SOUP)
    156156// ResourceHandle never uses async client calls on these platforms yet.
    157157void ResourceHandle::continueWillSendRequest(const ResourceRequest&)
    … …  
    200200void ResourceHandle::clearAuthentication()
    201201{
    202 #if PLATFORM(MAC)
     202#if PLATFORM(COCOA)
    203203    d->m_currentMacChallenge = nil;
    204204#endif
    … …  
    213213bool ResourceHandle::shouldContentSniffURL(const URL& url)
    214214{
    215 #if PLATFORM(MAC)
     215#if PLATFORM(COCOA)
    216216    if (shouldForceContentSniffing)
    217217        return true;

  • trunk/Source/WebCore/platform/network/ResourceHandle.h

    r162920 r163657  
    5555#endif
    5656
    57 #if PLATFORM(MAC) || USE(CFNETWORK)
     57#if PLATFORM(COCOA) || USE(CFNETWORK)
    5858#include <wtf/RetainPtr.h>
    5959#endif
    6060
    61 #if PLATFORM(MAC)
     61#if PLATFORM(COCOA)
    6262OBJC_CLASS NSCachedURLResponse;
    6363OBJC_CLASS NSData;
    … …  
    7676#endif
    7777
    78 #if PLATFORM(MAC) || USE(CFNETWORK)
     78#if PLATFORM(COCOA) || USE(CFNETWORK)
    7979typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
    8080#endif
    … …  
    101101
    102102class ResourceHandle : public RefCounted<ResourceHandle>
    103 #if PLATFORM(MAC) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
     103#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
    104104    , public AuthenticationClient
    105105#endif
    … …  
    111111    virtual ~ResourceHandle();
    112112
    113 #if PLATFORM(MAC) || USE(CFNETWORK)
     113#if PLATFORM(COCOA) || USE(CFNETWORK)
    114114    void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
    115115#endif
    116 #if PLATFORM(MAC) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
     116#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
    117117    bool shouldUseCredentialStorage();
    118118    void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
    … …  
    122122#endif
    123123
    124 #if PLATFORM(MAC)
     124#if PLATFORM(COCOA)
    125125#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    126126    bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
    … …  
    216216#if USE(CFNETWORK)
    217217    void continueWillCacheResponse(CFCachedURLResponseRef);
    218 #elif PLATFORM(MAC)
     218#elif PLATFORM(COCOA)
    219219    void continueWillCacheResponse(NSCachedURLResponse *);
    220220#endif
    … …  
    234234    using RefCounted<ResourceHandle>::deref;
    235235
    236 #if PLATFORM(MAC) || USE(CFNETWORK)
     236#if PLATFORM(COCOA) || USE(CFNETWORK)
    237237    static CFStringRef synchronousLoadRunLoopMode();
    238238#endif
    … …  
    271271    virtual void derefAuthenticationClient() override { deref(); }
    272272
    273 #if PLATFORM(MAC) || USE(CFNETWORK)
     273#if PLATFORM(COCOA) || USE(CFNETWORK)
    274274    enum class SchedulingBehavior {
    275275        Asynchronous,

  • trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp

    r160467 r163657  
    6767    handle->continueWillCacheResponse(response);
    6868}
    69 #elif PLATFORM(MAC)
     69#elif PLATFORM(COCOA)
    7070void ResourceHandleClient::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *response)
    7171{

  • trunk/Source/WebCore/platform/network/ResourceHandleClient.h

    r161338 r163657  
    3636#endif
    3737
    38 #if PLATFORM(MAC)
     38#if PLATFORM(COCOA)
    3939OBJC_CLASS NSCachedURLResponse;
    4040#endif
    … …  
    9393#if USE(CFNETWORK)
    9494        virtual void willCacheResponseAsync(ResourceHandle*, CFCachedURLResponseRef);
    95 #elif PLATFORM(MAC)
     95#elif PLATFORM(COCOA)
    9696        virtual void willCacheResponseAsync(ResourceHandle*, NSCachedURLResponse *);
    9797#endif
    … …  
    121121#endif // PLATFORM(WIN)
    122122
    123 #elif PLATFORM(MAC)
     123#elif PLATFORM(COCOA)
    124124        virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; }
    125125        virtual void willStopBufferingData(ResourceHandle*, const char*, unsigned) { }

  • trunk/Source/WebCore/platform/network/ResourceHandleInternal.h

    r162599 r163657  
    5656#endif
    5757
    58 #if PLATFORM(MAC)
     58#if PLATFORM(COCOA)
    5959OBJC_CLASS NSURLAuthenticationChallenge;
    6060OBJC_CLASS NSURLConnection;
    6161#endif
    6262
    63 #if PLATFORM(MAC) || USE(CFNETWORK)
     63#if PLATFORM(COCOA) || USE(CFNETWORK)
    6464typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
    6565#endif
    … …  
    113113            , m_previousPosition(0)
    114114#endif
    115 #if PLATFORM(MAC)
     115#if PLATFORM(COCOA)
    116116            , m_startWhenScheduled(false)
    117117            , m_needsSiteSpecificQuirks(false)
    … …  
    151151        RefPtr<ResourceHandleCFURLConnectionDelegate> m_connectionDelegate;
    152152#endif
    153 #if PLATFORM(MAC) && !USE(CFNETWORK)
     153#if PLATFORM(COCOA) && !USE(CFNETWORK)
    154154        RetainPtr<NSURLConnection> m_connection;
    155155        RetainPtr<id> m_delegate;
    156156#endif
    157 #if PLATFORM(MAC)
     157#if PLATFORM(COCOA)
    158158        bool m_startWhenScheduled;
    159159        bool m_needsSiteSpecificQuirks;
    160160#endif
    161 #if PLATFORM(MAC) || USE(CFNETWORK)
     161#if PLATFORM(COCOA) || USE(CFNETWORK)
    162162        RetainPtr<CFURLStorageSessionRef> m_storageSession;
    163163#endif
    … …  
    212212#endif
    213213
    214 #if PLATFORM(MAC)
     214#if PLATFORM(COCOA)
    215215        // We need to keep a reference to the original challenge to be able to cancel it.
    216216        // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender.

  • trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

    r163089 r163657  
    3131namespace WebCore {
    3232
    33 #if !USE(SOUP) && (!PLATFORM(MAC) || USE(CFNETWORK))
     33#if !USE(SOUP) && (!PLATFORM(COCOA) || USE(CFNETWORK))
    3434double ResourceRequestBase::s_defaultTimeoutInterval = INT_MAX;
    3535#else
    … …  
    523523}
    524524
    525 #if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
     525#if !PLATFORM(COCOA) && !USE(CFNETWORK) && !USE(SOUP)
    526526unsigned initializeMaximumHTTPConnectionCountPerHost()
    527527{

  • trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h

    r91084 r163657  
    4444CFURLProtectionSpaceRef createCF(const ProtectionSpace&);
    4545
    46 #if PLATFORM(MAC)
     46#if PLATFORM(COCOA)
    4747AuthenticationChallenge core(CFURLAuthChallengeRef);
    4848#endif

  • trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp

    r138427 r163657  
    3030#include <wtf/MainThread.h>
    3131
    32 #if PLATFORM(MAC)
     32#if PLATFORM(COCOA)
    3333#include "WebCoreSystemInterface.h"
    3434#elif PLATFORM(WIN)

  • trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp

    r161589 r163657  
    3434#include <wtf/RetainPtr.h>
    3535
    36 #if PLATFORM(MAC)
     36#if PLATFORM(COCOA)
    3737#include "WebCoreSystemInterface.h"
    3838#elif PLATFORM(WIN)

  • trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp

    r155242 r163657  
    4949#endif
    5050
    51 #if PLATFORM(MAC)
     51#if PLATFORM(COCOA)
    5252extern "C" void CFURLRequestSetHTTPRequestBody(CFMutableURLRequestRef mutableHTTPRequest, CFDataRef httpBody);
    5353extern "C" void CFURLRequestSetHTTPHeaderFieldValue(CFMutableURLRequestRef mutableHTTPRequest, CFStringRef httpHeaderField, CFStringRef httpHeaderFieldValue);

  • trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp

    r157337 r163657  
    3131#include <wtf/PassOwnPtr.h>
    3232
    33 #if PLATFORM(MAC)
     33#if PLATFORM(COCOA)
    3434#include "WebCoreSystemInterface.h"
    3535#else
    … …  
    5656    // Set a private session for testing to avoid interfering with global cookies. This should be different from private browsing session.
    5757    // FIXME: It looks like creating a new session with the same identifier may be just creating a reference to the same storage. See <rdar://problem/11571450> and <rdar://problem/12384380>.
    58 #if PLATFORM(MAC)
     58#if PLATFORM(COCOA)
    5959    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR("Private WebKit Session")))));
    6060#else
    … …  
    9494    RetainPtr<CFStringRef> cfIdentifier = String(identifierBase + ".PrivateBrowsing").createCFString();
    9595
    96 #if PLATFORM(MAC)
     96#if PLATFORM(COCOA)
    9797    auto session = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(cfIdentifier.get())));
    9898#else

  • trunk/Source/WebCore/platform/network/cf/ResourceError.h

    r131168 r163657  
    3838#endif
    3939
    40 #if PLATFORM(MAC)
     40#if PLATFORM(COCOA)
    4141OBJC_CLASS NSError;
    4242#endif
    … …  
    7373#endif
    7474
    75 #if PLATFORM(MAC)
     75#if PLATFORM(COCOA)
    7676    ResourceError(NSError *);
    7777    NSError *nsError() const;
    … …  
    8989#if USE(CFNETWORK)
    9090    mutable RetainPtr<CFErrorRef> m_platformError;
    91 #if PLATFORM(MAC)
     91#if PLATFORM(COCOA)
    9292    mutable RetainPtr<NSError> m_platformNSError;
    9393#endif

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

    r161796 r163657  
    5252#include <wtf/text/CString.h>
    5353
    54 #if PLATFORM(MAC)
     54#if PLATFORM(COCOA)
    5555#include "ResourceHandleCFURLConnectionDelegateWithOperationQueue.h"
    5656#include "WebCoreSystemInterface.h"
    … …  
    218218    CFRelease(streamProperties);
    219219
    220 #if PLATFORM(MAC)
     220#if PLATFORM(COCOA)
    221221    if (client() && client()->usesAsyncCallbacks())
    222222        d->m_connectionDelegate = adoptRef(new ResourceHandleCFURLConnectionDelegateWithOperationQueue(this));
    … …  
    547547}
    548548
    549 #if PLATFORM(MAC)
     549#if PLATFORM(COCOA)
    550550void ResourceHandle::schedule(SchedulePair* pair)
    551551{

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp

    r160467 r163657  
    3333#include "ResourceHandle.h"
    3434
    35 #if PLATFORM(MAC)
     35#if PLATFORM(COCOA)
    3636#include "WebCoreSystemInterface.h"
    3737#endif

  • trunk/Source/WebCore/platform/network/cf/ResourceRequest.h

    r161602 r163657  
    3333OBJC_CLASS NSURLRequest;
    3434
    35 #if PLATFORM(MAC) || USE(CFNETWORK)
     35#if PLATFORM(COCOA) || USE(CFNETWORK)
    3636typedef const struct _CFURLRequest* CFURLRequestRef;
    3737typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
    … …  
    7676       
    7777#if USE(CFNETWORK)
    78 #if PLATFORM(MAC)
     78#if PLATFORM(COCOA)
    7979        ResourceRequest(NSURLRequest *);
    8080        void updateNSURLRequest();
    … …  
    8888            , m_cfRequest(cfRequest)
    8989        {
    90 #if PLATFORM(MAC)
     90#if PLATFORM(COCOA)
    9191            updateNSURLRequest();
    9292#endif
    … …  
    105105        void updateFromDelegatePreservingOldHTTPBody(const ResourceRequest&);
    106106
    107 #if PLATFORM(MAC)
     107#if PLATFORM(COCOA)
    108108        void applyWebArchiveHackForMail();
    109109        NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
    … …  
    116116#endif
    117117
    118 #if PLATFORM(MAC) || USE(CFNETWORK)
     118#if PLATFORM(COCOA) || USE(CFNETWORK)
    119119        CFURLRequestRef cfURLRequest(HTTPBodyUpdatePolicy) const;
    120120        void setStorageSession(CFURLStorageSessionRef);
    … …  
    124124        static void setHTTPPipeliningEnabled(bool);
    125125
    126 #if PLATFORM(MAC)
     126#if PLATFORM(COCOA)
    127127        static bool useQuickLookResourceCachingQuirks();
    128128#endif
    … …  
    150150        RetainPtr<CFURLRequestRef> m_cfRequest;
    151151#endif
    152 #if PLATFORM(MAC)
     152#if PLATFORM(COCOA)
    153153        RetainPtr<NSURLRequest> m_nsRequest;
    154154#endif

  • trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

    r163089 r163657  
    4242#endif
    4343
    44 #if PLATFORM(MAC)
     44#if PLATFORM(COCOA)
    4545#include "ResourceLoadPriority.h"
    4646#include "WebCoreSystemInterface.h"
    … …  
    8585    return reinterpret_cast<CFURLRequestCopyContentDispositionEncodingFallbackArrayFunction>(GetProcAddress(findCFNetworkModule(), "_CFURLRequestCopyContentDispositionEncodingFallbackArray"));
    8686}
    87 #elif PLATFORM(MAC)
     87#elif PLATFORM(COCOA)
    8888static CFURLRequestSetContentDispositionEncodingFallbackArrayFunction findCFURLRequestSetContentDispositionEncodingFallbackArrayFunction()
    8989{
    … …  
    193193
    194194    m_cfRequest = adoptCF(cfRequest);
    195 #if PLATFORM(MAC)
     195#if PLATFORM(COCOA)
    196196    updateNSURLRequest();
    197197#endif
    … …  
    229229
    230230    m_cfRequest = adoptCF(cfRequest);
    231 #if PLATFORM(MAC)
     231#if PLATFORM(COCOA)
    232232    updateNSURLRequest();
    233233#endif
    … …  
    333333    wkSetRequestStorageSession(storageSession, cfRequest);
    334334    m_cfRequest = adoptCF(cfRequest);
    335 #if PLATFORM(MAC)
     335#if PLATFORM(COCOA)
    336336    updateNSURLRequest();
    337337#endif
    338338}
    339339
    340 #if PLATFORM(MAC)
     340#if PLATFORM(COCOA)
    341341void ResourceRequest::applyWebArchiveHackForMail()
    342342{

  • trunk/Source/WebCore/platform/network/cf/ResourceResponse.h

    r162052 r163657  
    5454        m_isNull = !cfResponse;
    5555    }
    56 #if PLATFORM(MAC)
     56#if PLATFORM(COCOA)
    5757    ResourceResponse(NSURLResponse *);
    5858#endif
    … …  
    8989    CFURLResponseRef cfURLResponse() const;
    9090#endif
    91 #if PLATFORM(MAC)
     91#if PLATFORM(COCOA)
    9292    NSURLResponse *nsURLResponse() const;
    9393#endif
    9494
    95 #if PLATFORM(MAC) || USE(CFNETWORK)
     95#if PLATFORM(COCOA) || USE(CFNETWORK)
    9696    void setCertificateChain(CFArrayRef);
    9797    RetainPtr<CFArrayRef> certificateChain() const;
    … …  
    106106    PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
    107107    void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
    108 #if PLATFORM(MAC)
     108#if PLATFORM(COCOA)
    109109    void initNSURLResponse() const;
    110110#endif
    … …  
    118118    mutable RetainPtr<CFURLResponseRef> m_cfResponse;
    119119#endif
    120 #if PLATFORM(MAC)
     120#if PLATFORM(COCOA)
    121121    mutable RetainPtr<NSURLResponse> m_nsResponse;
    122122#endif
    123 #if PLATFORM(MAC) || USE(CFNETWORK)
     123#if PLATFORM(COCOA) || USE(CFNETWORK)
    124124    // Certificate chain is normally part of NS/CFURLResponse, but there is no way to re-add it to a deserialized response after IPC.
    125125    RetainPtr<CFArrayRef> m_externalCertificateChain;

  • trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp

    r160467 r163657  
    4141#include <wtf/text/WTFString.h>
    4242
    43 #if PLATFORM(MAC)
     43#if PLATFORM(COCOA)
    4444#include "WebCoreSystemInterface.h"
    4545#include "WebCoreURLResponse.h"
    46 #endif // PLATFORM(MAC)
     46#endif // PLATFORM(COCOA)
    4747
    4848#if PLATFORM(IOS)
    … …  
    103103}
    104104
    105 #if !PLATFORM(MAC)
     105#if !PLATFORM(COCOA)
    106106static void setDefaultMIMEType(CFURLResponseRef response)
    107107{
    … …  
    110110    CFURLResponseSetMIMEType(response, defaultMIMETypeString);
    111111}
    112 #endif // !PLATFORM(MAC)
     112#endif // !PLATFORM(COCOA)
    113113
    114114void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(CFURLResponseRef cfResponse)
    … …  
    119119        return;
    120120
    121 #if PLATFORM(MAC)
     121#if PLATFORM(COCOA)
    122122    // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
    123123    CFHTTPMessageRef msg = wkGetCFURLResponseHTTPResponse(cfResponse);

  • trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm

    r162079 r163657  
    175175#endif // USE(CFNETWORK)
    176176
    177 #if PLATFORM(MAC) || USE(CFNETWORK)
     177#if PLATFORM(COCOA) || USE(CFNETWORK)
    178178
    179179void ResourceResponse::setCertificateChain(CFArrayRef certificateChain)
    … …  
    191191}
    192192
    193 #endif // PLATFORM(MAC) || USE(CFNETWORK)
     193#endif // PLATFORM(COCOA) || USE(CFNETWORK)
    194194
    195195} // namespace WebCore

  • trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp

    r162943 r163657  
    313313#endif
    314314
    315 #if !PLATFORM(MAC)
     315#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
    316316String openTemporaryFile(const String& prefix, PlatformFileHandle& handle)
    317317{

  • trunk/Source/WebCore/platform/text/TextBoundaries.cpp

    r163310 r163657  
    5757}
    5858
    59 #if !PLATFORM(MAC)
     59#if !PLATFORM(COCOA)
    6060
    6161int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
    … …  
    105105}
    106106
    107 #endif // !PLATFORM(MAC)
     107#endif // !PLATFORM(COCOA)
    108108
    109109} // namespace WebCore
Note: See TracChangeset for help on using the changeset viewer.