Stop using PLATFORM(MAC) in WebCore/platform except where it means “OS X but not...
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Feb 2014 23:37:54 +0000 (23:37 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Feb 2014 23:37:54 +0000 (23:37 +0000)
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).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@163657 268f45cc-cd09-0410-ab3c-d52691b4dbfc

104 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/platform/ContentFilter.h
Source/WebCore/platform/ContextMenu.h
Source/WebCore/platform/ContextMenuItem.h
Source/WebCore/platform/Cursor.cpp
Source/WebCore/platform/Cursor.h
Source/WebCore/platform/DragData.cpp
Source/WebCore/platform/DragImage.cpp
Source/WebCore/platform/Language.cpp
Source/WebCore/platform/LocalizedStrings.cpp
Source/WebCore/platform/LocalizedStrings.h
Source/WebCore/platform/MIMETypeRegistry.cpp
Source/WebCore/platform/PasteboardStrategy.h
Source/WebCore/platform/PlatformKeyboardEvent.h
Source/WebCore/platform/PlatformMenuDescription.h
Source/WebCore/platform/PlatformSpeechSynthesizer.h
Source/WebCore/platform/PlatformWheelEvent.h
Source/WebCore/platform/SchemeRegistry.cpp
Source/WebCore/platform/ScrollAnimator.cpp
Source/WebCore/platform/ScrollAnimator.h
Source/WebCore/platform/ScrollView.cpp
Source/WebCore/platform/ScrollView.h
Source/WebCore/platform/ScrollbarThemeComposite.h
Source/WebCore/platform/SharedBuffer.h
Source/WebCore/platform/URL.h
Source/WebCore/platform/Widget.cpp
Source/WebCore/platform/Widget.h
Source/WebCore/platform/audio/AudioSession.cpp
Source/WebCore/platform/audio/HRTFElevation.cpp
Source/WebCore/platform/audio/MediaSessionManager.cpp
Source/WebCore/platform/audio/mac/AudioSessionMac.cpp
Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp
Source/WebCore/platform/cf/SharedBufferCF.cpp
Source/WebCore/platform/cf/URLCF.cpp
Source/WebCore/platform/graphics/BitmapImage.h
Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp
Source/WebCore/platform/graphics/DisplayRefreshMonitor.h
Source/WebCore/platform/graphics/FloatPoint.h
Source/WebCore/platform/graphics/FloatRect.h
Source/WebCore/platform/graphics/FloatSize.h
Source/WebCore/platform/graphics/Font.cpp
Source/WebCore/platform/graphics/Font.h
Source/WebCore/platform/graphics/FontCache.cpp
Source/WebCore/platform/graphics/FontCache.h
Source/WebCore/platform/graphics/FontGlyphs.cpp
Source/WebCore/platform/graphics/GlyphPage.h
Source/WebCore/platform/graphics/GraphicsContext3D.h
Source/WebCore/platform/graphics/Image.h
Source/WebCore/platform/graphics/IntRect.h
Source/WebCore/platform/graphics/IntSize.h
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/platform/graphics/SimpleFontData.cpp
Source/WebCore/platform/graphics/SimpleFontData.h
Source/WebCore/platform/graphics/TiledBacking.h
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h
Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
Source/WebCore/platform/graphics/ca/PlatformCAFilters.h
Source/WebCore/platform/graphics/ca/PlatformCALayer.h
Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h
Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
Source/WebCore/platform/graphics/cg/ImageCG.cpp
Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
Source/WebCore/platform/graphics/cg/ImageSourceCG.h
Source/WebCore/platform/graphics/cg/PathCG.cpp
Source/WebCore/platform/graphics/cg/PatternCG.cpp
Source/WebCore/platform/graphics/gpu/DrawingBuffer.h
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
Source/WebCore/platform/mac/KeyEventMac.mm
Source/WebCore/platform/mac/PlatformEventFactoryMac.h
Source/WebCore/platform/mac/WebCoreSystemInterface.h
Source/WebCore/platform/mac/WebCoreSystemInterface.mm
Source/WebCore/platform/network/Credential.h
Source/WebCore/platform/network/NetworkStateNotifier.h
Source/WebCore/platform/network/NetworkStorageSession.h
Source/WebCore/platform/network/NetworkingContext.h
Source/WebCore/platform/network/ProtectionSpace.cpp
Source/WebCore/platform/network/ResourceHandle.cpp
Source/WebCore/platform/network/ResourceHandle.h
Source/WebCore/platform/network/ResourceHandleClient.cpp
Source/WebCore/platform/network/ResourceHandleClient.h
Source/WebCore/platform/network/ResourceHandleInternal.h
Source/WebCore/platform/network/ResourceRequestBase.cpp
Source/WebCore/platform/network/cf/AuthenticationCF.h
Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
Source/WebCore/platform/network/cf/ResourceError.h
Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
Source/WebCore/platform/network/cf/ResourceRequest.h
Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
Source/WebCore/platform/network/cf/ResourceResponse.h
Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
Source/WebCore/platform/network/mac/ResourceResponseMac.mm
Source/WebCore/platform/posix/FileSystemPOSIX.cpp
Source/WebCore/platform/text/TextBoundaries.cpp

index e06bb15..a2ac401 100644 (file)
@@ -1,3 +1,159 @@
+2014-02-07  Dan Bernstein  <mitz@apple.com>
+
+        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).
+
 2014-02-07  Ryosuke Niwa  <rniwa@webkit.org>
 
         Revert r154384 and r154674 as they broke selection rect computations for text with ligatures.
index b2aee4d..621393b 100644 (file)
@@ -112,6 +112,6 @@ JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(PRODUCTION_FR
 JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
 
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-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;
+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 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;
 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
 EXCLUDED_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;
index 6831deb..d0f81af 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/Functional.h>
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSMutableData;
 OBJC_CLASS WebFilterEvaluator;
 #endif
@@ -74,7 +74,7 @@ public:
 private:
     explicit ContentFilter(const ResourceResponse&);
     
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<WebFilterEvaluator> m_platformContentFilter;
     RetainPtr<NSData> m_replacementData;
 #endif
index e76d32d..3d05fcf 100644 (file)
@@ -34,7 +34,7 @@
 #include "PlatformMenuDescription.h"
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/RetainPtr.h>
 #elif PLATFORM(WIN)
 #include <windows.h>
@@ -87,7 +87,7 @@ namespace WebCore {
 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
         Vector<ContextMenuItem> m_items;
 #else
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         // Keep this in sync with the PlatformMenuDescription typedef
         RetainPtr<NSMutableArray> m_platformDescription;
 #else
index da8273d..ee7431a 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS NSMenuItem;
 #elif PLATFORM(GTK)
@@ -137,7 +137,7 @@ namespace WebCore {
         ContextMenuItemTagTextDirectionDefault,
         ContextMenuItemTagTextDirectionLeftToRight,
         ContextMenuItemTagTextDirectionRightToLeft,
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         ContextMenuItemTagCorrectSpellingAutomatically,
         ContextMenuItemTagSubstitutionsMenu,
         ContextMenuItemTagShowSubstitutions,
@@ -177,7 +177,7 @@ namespace WebCore {
     };
 
 #if ENABLE(CONTEXT_MENUS)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     typedef NSMenuItem* PlatformMenuItemDescription;
 #elif PLATFORM(GTK)
     typedef GtkMenuItem* PlatformMenuItemDescription;
@@ -247,7 +247,7 @@ namespace WebCore {
         bool m_checked;
         Vector<ContextMenuItem> m_subMenuItems;
 #else
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         RetainPtr<NSMenuItem> m_platformDescription;
 #else
         PlatformMenuItemDescription m_platformDescription;
index bd28d52..30e269b 100644 (file)
@@ -176,7 +176,7 @@ Cursor::Cursor(Type type)
 {
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 
 PlatformCursor Cursor::platformCursor() const
 {
index 22407aa..bb23a74 100644 (file)
@@ -36,7 +36,7 @@ typedef struct HICON__* HICON;
 typedef HICON HCURSOR;
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
-#elif PLATFORM(MAC)
+#elif PLATFORM(COCOA)
 #include <wtf/RetainPtr.h>
 #elif PLATFORM(GTK)
 #include "GRefPtrGtk.h"
index aa727e5..29b6aba 100644 (file)
@@ -31,7 +31,7 @@
 #if ENABLE(DRAG_SUPPORT)
 namespace WebCore {
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition, 
     DragOperation sourceOperationMask, DragApplicationFlags flags)
     : m_clientPosition(clientPosition)
index 3af6b30..d229c18 100644 (file)
@@ -201,7 +201,7 @@ DragImageRef createDragImageForImage(Frame& frame, Node& node, IntRect& imageRec
     return createDragImageFromSnapshot(snapshotNode(frame, node), &node);
 }
 
-#if !PLATFORM(MAC) && (!PLATFORM(WIN) || OS(WINCE))
+#if !PLATFORM(COCOA) && (!PLATFORM(WIN) || OS(WINCE))
 DragImageRef createDragImageForLink(URL&, const String&, FontRenderingMode)
 {
     return nullptr;
index fcd3125..8b18991 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if USE(CF) && !PLATFORM(WIN)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
@@ -147,7 +147,7 @@ size_t indexOfBestMatchingLanguageInList(const String& language, const Vector<St
 
 String displayNameForLanguageLocale(const String& localeName)
 {
-#if PLATFORM(MAC)
+#if USE(CF) && !PLATFORM(WIN)
     if (!localeName.isNull() && !localeName.isEmpty()) {
         RetainPtr<CFLocaleRef> currentLocale = adoptCF(CFLocaleCopyCurrent());
         return CFLocaleCopyDisplayNameForPropertyValue(currentLocale.get(), kCFLocaleIdentifier, localeName.createCFString().get());
index 80f23fe..66fa73e 100644 (file)
@@ -37,7 +37,7 @@
 #include <wtf/RetainPtr.h>
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #endif
 
@@ -133,7 +133,7 @@ String defaultDetailsSummaryText()
     return WEB_UI_STRING("Details", "text to display in <details> tag when it has no <summary> child");
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 String copyImageUnknownFileLabel()
 {
     return WEB_UI_STRING("unknown", "Unknown filename");
@@ -226,7 +226,7 @@ String contextMenuItemTagLearnSpelling()
     return WEB_UI_STRING("Learn Spelling", "Learn Spelling context menu item");
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 String contextMenuItemTagSearchInSpotlight()
 {
     return WEB_UI_STRING("Search in Spotlight", "Search in Spotlight context menu item");
@@ -235,7 +235,7 @@ String contextMenuItemTagSearchInSpotlight()
 
 String contextMenuItemTagSearchWeb()
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<CFStringRef> searchProviderName = adoptCF(wkCopyDefaultSearchProviderDisplayName());
     return formatLocalizedString(WEB_UI_STRING("Search with %@", "Search with search provider context menu item with provider name inserted"), searchProviderName.get());
 #else
@@ -295,7 +295,7 @@ String contextMenuItemTagFontMenu()
     return WEB_UI_STRING("Font", "Font context sub-menu item");
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 String contextMenuItemTagShowFonts()
 {
     return WEB_UI_STRING("Show Fonts", "Show fonts context menu item");
@@ -322,7 +322,7 @@ String contextMenuItemTagOutline()
     return WEB_UI_STRING("Outline", "Outline context menu item");
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 String contextMenuItemTagStyles()
 {
     return WEB_UI_STRING("Styles...", "Styles context menu item");
@@ -374,7 +374,7 @@ String contextMenuItemTagRightToLeft()
     return WEB_UI_STRING("Right to Left", "Right to Left context menu item");
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 
 String contextMenuItemTagCorrectSpellingAutomatically()
 {
@@ -444,7 +444,7 @@ String contextMenuItemTagChangeBack(const String& replacedString)
     return replacedString;
 }
 
-#endif // PLATFORM(MAC)
+#endif // PLATFORM(COCOA)
 
 String contextMenuItemTagOpenVideoInNewWindow()
 {
@@ -653,7 +653,7 @@ String AXListItemActionVerb()
 }
 #endif // !PLATFORM(IOS)
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(COCOA)
 String AXARIAContentGroupText(const String& ariaType)
 {
     if (ariaType == "ARIAApplicationAlert")
@@ -700,7 +700,7 @@ String AXARIAContentGroupText(const String& ariaType)
         return WEB_UI_STRING("math", "An ARIA accessibility group that contains mathematical symbols.");
     return String();
 }
-#endif // PLATFORM(MAC) || PLATFORM(IOS)
+#endif // PLATFORM(COCOA)
 
 String missingPluginText()
 {
@@ -746,7 +746,7 @@ String allFilesText()
 }
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 String builtInPDFPluginName()
 {
     // Also exposed to DOM.
index faee563..939e6cd 100644 (file)
@@ -43,7 +43,7 @@ namespace WebCore {
     String fileButtonNoFilesSelectedLabel();
     String defaultDetailsSummaryText();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     String copyImageUnknownFileLabel();
 #endif
 
@@ -105,7 +105,7 @@ namespace WebCore {
     String contextMenuItemTagDefaultDirection();
     String contextMenuItemTagLeftToRight();
     String contextMenuItemTagRightToLeft();
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     String contextMenuItemTagSearchInSpotlight();
     String contextMenuItemTagShowFonts();
     String contextMenuItemTagStyles();
@@ -179,7 +179,7 @@ namespace WebCore {
     // technical standard 35, Locale Data Markup Language, e.g. "'Week' ww, yyyy"
     String weekFormatInLDML();
 #endif
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(COCOA)
     String AXARIAContentGroupText(const String& ariaType);
 #endif
 
@@ -196,7 +196,7 @@ namespace WebCore {
     String allFilesText();
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     String builtInPDFPluginName();
     String pdfDocumentTypeDescription();
     String postScriptDocumentTypeDescription();
@@ -249,7 +249,7 @@ namespace WebCore {
     String textTrackOffMenuItemText();
     String textTrackAutomaticMenuItemText();
     String textTrackNoLabelText();
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(COCOA) || PLATFORM(WIN)
     String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language);
     String textTrackLanguageMenuItemText(const String& title, const String& language);
     String closedCaptionTrackMenuItemText(const String&);
index 027d6df..18c7411 100644 (file)
@@ -286,7 +286,7 @@ static void initializeSupportedImageMIMETypesForEncoding()
     supportedImageMIMETypesForEncoding = new HashSet<String>;
 
 #if USE(CG)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<CFArrayRef> supportedTypes = adoptCF(CGImageDestinationCopyTypeIdentifiers());
     CFIndex count = CFArrayGetCount(supportedTypes.get());
     for (CFIndex i = 0; i < count; i++) {
index 66f74de..b9217f7 100644 (file)
@@ -51,7 +51,7 @@ public:
     virtual URL readURLFromPasteboard(int index, const String& pasteboardType) = 0;
     virtual long changeCount() = 0;
 #endif // PLATFORM(IOS)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual void getTypes(Vector<String>& types, const String& pasteboardName) = 0;
     virtual PassRefPtr<SharedBuffer> bufferForType(const String& pasteboardType, const String& pasteboardName) = 0;
     virtual void getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName) = 0;
index 600b870..2096c21 100644 (file)
 #include <wtf/WindowsExtras.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS NSEvent;
 #endif
 
 #if PLATFORM(IOS)
-#ifdef __OBJC__
-@class WebEvent;
-#else
-class WebEvent;
-#endif
+OBCJ_CLASS WebEvent;
 #endif
 
 #if PLATFORM(GTK)
@@ -119,7 +115,7 @@ namespace WebCore {
         static bool currentCapsLockState();
         static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #if !PLATFORM(IOS)
         NSEvent* macEvent() const { return m_macEvent.get(); }
 #else
@@ -158,7 +154,7 @@ namespace WebCore {
         bool m_isKeypad;
         bool m_isSystemKey;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #if !PLATFORM(IOS)
         RetainPtr<NSEvent> m_macEvent;
 #else
index aa8230f..4981308 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef PlatformMenuDescription_h
 #define PlatformMenuDescription_h
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSMutableArray;
 #elif PLATFORM(WIN)
 #include <windows.h>
@@ -37,7 +37,7 @@ typedef struct _GtkMenu GtkMenu;
 namespace WebCore {
 
 #if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     typedef NSMutableArray* PlatformMenuDescription;
 #elif PLATFORM(GTK)
     typedef GtkMenu* PlatformMenuDescription;
index cfae5ca..d36e3b8 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/RetainPtr.h>
 OBJC_CLASS WebSpeechSynthesisWrapper;
 #endif
@@ -86,7 +86,7 @@ private:
     bool m_voiceListIsInitialized;
     PlatformSpeechSynthesizerClient* m_speechSynthesizerClient;
     
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
 #endif
 };
index 9d3925e..e94bdf4 100644 (file)
@@ -53,7 +53,7 @@ namespace WebCore {
         ScrollByPixelWheelEvent,
     };
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     enum PlatformWheelEventPhase {
         PlatformWheelEventPhaseNone        = 0,
         PlatformWheelEventPhaseBegan       = 1 << 0,
@@ -75,7 +75,7 @@ namespace WebCore {
             , m_wheelTicksY(0)
             , m_granularity(ScrollByPixelWheelEvent)
             , m_directionInvertedFromDevice(false)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
             , m_hasPreciseScrollingDeltas(false)
             , m_phase(PlatformWheelEventPhaseNone)
             , m_momentumPhase(PlatformWheelEventPhaseNone)
@@ -96,7 +96,7 @@ namespace WebCore {
             , m_wheelTicksY(wheelTicksY)
             , m_granularity(granularity)
             , m_directionInvertedFromDevice(false)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
             , m_hasPreciseScrollingDeltas(false)
             , m_phase(PlatformWheelEventPhaseNone)
             , m_momentumPhase(PlatformWheelEventPhaseNone)
@@ -154,7 +154,7 @@ namespace WebCore {
         explicit PlatformWheelEvent(const Evas_Event_Mouse_Wheel*);
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
         void setHasPreciseScrollingDeltas(bool b) { m_hasPreciseScrollingDeltas = b; }
         PlatformWheelEventPhase phase() const { return m_phase; }
@@ -185,7 +185,7 @@ namespace WebCore {
         float m_wheelTicksY;
         PlatformWheelEventGranularity m_granularity;
         bool m_directionInvertedFromDevice;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         bool m_hasPreciseScrollingDeltas;
         PlatformWheelEventPhase m_phase;
         PlatformWheelEventPhase m_momentumPhase;
index 7713802..cc8f95d 100644 (file)
@@ -36,7 +36,7 @@ static URLSchemesMap& localURLSchemes()
 
     if (localSchemes.isEmpty()) {
         localSchemes.add("file");
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         localSchemes.add("applewebdata");
 #endif
     }
@@ -122,7 +122,7 @@ void SchemeRegistry::removeURLSchemeRegisteredAsLocal(const String& scheme)
 {
     if (scheme == "file")
         return;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (scheme == "applewebdata")
         return;
 #endif
@@ -325,7 +325,7 @@ bool SchemeRegistry::schemeShouldBypassContentSecurityPolicy(const String& schem
 
 bool SchemeRegistry::shouldCacheResponsesFromURLSchemeIndefinitely(const String& scheme)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (equalIgnoringCase(scheme, "applewebdata"))
         return true;
 #endif
index bdf8d8e..422a949 100644 (file)
@@ -81,7 +81,7 @@ void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
 
 bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // Events in the PlatformWheelEventPhaseMayBegin phase have no deltas, and therefore never passes through the scroll handling logic below.
     // This causes us to return with an 'unhandled' return state, even though this event was successfully processed.
     //
index f0dc984..e8adc95 100644 (file)
@@ -67,7 +67,7 @@ public:
     virtual bool handleTouchEvent(const PlatformTouchEvent&);
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }
 #endif
 
index 5974f84..2da2551 100644 (file)
@@ -1397,7 +1397,7 @@ void ScrollView::setScrollOrigin(const IntPoint& origin, bool updatePositionAtAl
         updateScrollbars(scrollOffset());
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 
 void ScrollView::platformAddChild(Widget*)
 {
@@ -1409,7 +1409,7 @@ void ScrollView::platformRemoveChild(Widget*)
 
 #endif
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 
 void ScrollView::platformSetScrollbarsSuppressed(bool)
 {
@@ -1425,7 +1425,7 @@ void ScrollView::platformSetScrollbarOverlayStyle(ScrollbarOverlayStyle)
 
 #endif
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 
 void ScrollView::platformSetScrollbarModes()
 {
index 502ee7a..d027718 100644 (file)
@@ -53,7 +53,7 @@ class WAKView;
 #endif
 #endif // PLATFORM(IOS)
 
-#if PLATFORM(MAC) && defined __OBJC__
+#if PLATFORM(COCOA) && defined __OBJC__
 @protocol WebCoreFrameScrollView;
 #endif
 
@@ -446,7 +446,7 @@ private:
     void calculateOverhangAreasForPainting(IntRect& horizontalOverhangRect, IntRect& verticalOverhangRect);
     void updateOverhangAreas();
 
-#if PLATFORM(MAC) && defined __OBJC__
+#if PLATFORM(COCOA) && defined __OBJC__
 public:
     NSView* documentView() const;
 
index 7c702e9..406f558 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "ScrollbarTheme.h"
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 typedef id ScrollbarPainter;
 #else
 typedef void* ScrollbarPainter;
index 9584316..3c610a4 100644 (file)
@@ -42,7 +42,7 @@
 #include "GUniquePtrSoup.h"
 #endif
 
-#if PLATFORM(MAC)
+#if USE(FOUNDATION)
 OBJC_CLASS NSData;
 #endif
 
@@ -67,7 +67,7 @@ public:
     
     ~SharedBuffer();
     
-#if PLATFORM(MAC)
+#if USE(FOUNDATION)
     // FIXME: This class exists as a temporary workaround so that code that does:
     // [buffer->createNSData() autorelease] will fail to compile.
     // Once both Mac and iOS builds with this change we can change the return type to be RetainPtr<NSData>,
index 8ab1377..7dbe791 100644 (file)
@@ -39,7 +39,7 @@ typedef const struct __CFURL* CFURLRef;
 #include "GUniquePtrSoup.h"
 #endif
 
-#if PLATFORM(MAC)
+#if USE(FOUNDATION)
 OBJC_CLASS NSURL;
 #endif
 
@@ -169,7 +169,7 @@ public:
     GUniquePtr<SoupURI> createSoupURI() const;
 #endif
 
-#if PLATFORM(MAC)
+#if USE(FOUNDATION)
     URL(NSURL*);
     operator NSURL*() const;
 #endif
index 75be818..8e2e604 100644 (file)
@@ -141,7 +141,7 @@ IntPoint Widget::convertToContainingWindow(const IntPoint& localPoint) const
     return convertFromRootToContainingWindow(this, localPoint);
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 IntRect Widget::convertFromRootToContainingWindow(const Widget*, const IntRect& rect)
 {
     return rect;
index 2f3f27c..fd12f51 100644 (file)
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/RetainPtr.h>
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSView;
 OBJC_CLASS NSWindow;
 typedef NSView *PlatformWidget;
@@ -184,7 +184,7 @@ public:
     // the frame rects be the same no matter what transforms are applied.
     virtual bool transformsAffectFrameRect() { return true; }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     NSView* getOuterView() const;
 
     void removeFromSuperview();
@@ -220,7 +220,7 @@ private:
 
 private:
     ScrollView* m_parent;
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
     PlatformWidget m_widget;
 #else
     RetainPtr<NSView> m_widget;
@@ -238,7 +238,7 @@ private:
 #define WIDGET_TYPE_CASTS(ToValueTypeName, predicate) \
     TYPE_CASTS_BASE(ToValueTypeName, Widget, object, object->predicate, object.predicate)
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 
 inline PlatformWidget Widget::platformWidget() const
 {
index 7529a1b..dec8662 100644 (file)
@@ -61,7 +61,7 @@ void AudioSession::endedAudioInterruption()
         (*i)->endedAudioInterruption();
 }
 
-#if !PLATFORM(IOS) && !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 class AudioSessionPrivate {
 };
 
@@ -124,7 +124,7 @@ void AudioSession::setPreferredBufferSize(size_t)
 {
     notImplemented();
 }
-#endif // !PLATFORM(IOS)
+#endif // !PLATFORM(COCOA)
 
 }
 
index 982d8d4..026872c 100644 (file)
@@ -58,7 +58,7 @@ const size_t ResponseFrameSize = 256;
 // The impulse responses may be resampled to a different sample-rate (depending on the audio hardware) when they are loaded.
 const float ResponseSampleRate = 44100;
 
-#if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER)
+#if PLATFORM(COCOA) || USE(WEBAUDIO_GSTREAMER)
 #define USE_CONCATENATED_IMPULSE_RESPONSES
 #endif
 
index db59ba4..0dbf3f0 100644 (file)
@@ -176,7 +176,7 @@ void MediaSessionManager::applicationWillEnterForeground() const
     }
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 void MediaSessionManager::updateSessionState()
 {
 }
index a4e5e29..16ecf5d 100644 (file)
@@ -164,4 +164,4 @@ void AudioSession::setPreferredBufferSize(size_t bufferSize)
 
 }
 
-#endif // USE(AUDIO_SESSION) && PLATFORM(MAC)
+#endif // USE(AUDIO_SESSION) && PLATFORM(MAC) && !PLATFORM(IOS)
index d632b5a..302f3ea 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "MediaSessionManager.h"
 
-#if USE(AUDIO_SESSION) && PLATFORM(MAC)
+#if USE(AUDIO_SESSION)
 
 #include "AudioSession.h"
 #include "Logging.h"
@@ -36,7 +36,7 @@ using namespace WebCore;
 
 static const size_t kWebAudioBufferSize = 128;
 
-#if PLATFORM(IOS) ||__MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
 static const size_t kLowPowerVideoBufferSize = 4096;
 #endif
 
@@ -54,4 +54,4 @@ void MediaSessionManager::updateSessionState()
 #endif
 }
 
-#endif // USE(AUDIO_SESSION) && PLATFORM(MAC)
+#endif // USE(AUDIO_SESSION)
index e185939..1920aed 100644 (file)
@@ -49,9 +49,9 @@ SharedBuffer::SharedBuffer(CFDataRef cfData)
 {
 }
 
-// Mac is a CF platform but has an even more efficient version of this method,
-// so only use this version for non-Mac
-#if !PLATFORM(MAC)
+// Using Foundation allows for an even more efficient implementation of this function,
+// so only use this version for non-Foundation.
+#if !USE(FOUNDATION)
 RetainPtr<CFDataRef> SharedBuffer::createCFData()
 {
     if (m_cfData) {
index 5b16948..2d8012f 100644 (file)
@@ -50,7 +50,7 @@ URL::URL(CFURLRef url)
     parse(urlBytes.data());
 }
 
-#if !PLATFORM(MAC)
+#if !USE(FOUNDATION)
 RetainPtr<CFURLRef> URL::createCFURL() const
 {
     // FIXME: What should this return for invalid URLs?
index c2161b6..a2eb4c2 100644 (file)
@@ -34,7 +34,7 @@
 #include "ImageSource.h"
 #include "IntSize.h"
 
-#if PLATFORM(MAC)
+#if USE(CG) || USE(APPKIT)
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -163,7 +163,7 @@ public:
     virtual NSImage* getNSImage() override;
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual CFDataRef getTIFFRepresentation() override;
 #endif
 
index 5641864..fd757c3 100644 (file)
@@ -60,7 +60,7 @@ DisplayRefreshMonitor::DisplayRefreshMonitor(PlatformDisplayID displayID)
     , m_unscheduledFireCount(0)
     , m_displayID(displayID)
     , m_clientsToBeNotified(nullptr)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     , m_displayLink(0)
 #endif
 {
index 648a191..6f3a2a0 100644 (file)
@@ -35,7 +35,7 @@
 #include <wtf/RefPtr.h>
 #include <wtf/Threading.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 typedef struct __CVDisplayLink *CVDisplayLinkRef;
 #endif
 
index 103cfec..5cb393d 100644 (file)
@@ -136,12 +136,10 @@ public:
     operator CGPoint() const;
 #endif
 
-#if !PLATFORM(IOS)
-#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     FloatPoint(const NSPoint&);
     operator NSPoint() const;
 #endif
-#endif // !PLATFORM(IOS)
 
     FloatPoint matrixTransform(const TransformationMatrix&) const;
     FloatPoint matrixTransform(const AffineTransform&) const;
index 8056686..863eaa9 100644 (file)
@@ -171,12 +171,10 @@ public:
     operator CGRect() const;
 #endif
 
-#if !PLATFORM(IOS)
-#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     FloatRect(const NSRect&);
     operator NSRect() const;
 #endif
-#endif // !PLATFORM(IOS)
 
 #if USE(CAIRO)
     FloatRect(const cairo_rectangle_t&);
index d7aa6df..7fc4b9e 100644 (file)
@@ -113,12 +113,10 @@ public:
     operator CGSize() const;
 #endif
 
-#if !PLATFORM(IOS)
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
     operator NSSize() const;
 #endif
-#endif // !PLATFORM(IOS)
 
     void dump(PrintStream& out) const;
 
index 624694b..f576df0 100644 (file)
@@ -409,7 +409,7 @@ float Font::width(const TextRun& run, int& charsConsumed, String& glyphName) con
     return width(run);
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const
 {
     return nullptr;
index 35151f1..1ad36ac 100644 (file)
@@ -157,7 +157,7 @@ public:
     {
         return glyphDataAndPageForCharacter(c, mirror, variant).first;
     }
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, size_t length, FontDataVariant) const;
 #endif
     std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32 c, bool mirror, FontDataVariant variant) const
index df26e68..0b1c407 100644 (file)
@@ -573,7 +573,7 @@ PassRefPtr<FontData> FontCache::getFontData(const FontDescription& description,
     if (familyIndex == familyCount)
         familyIndex = cAllFamiliesScanned;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (!result) {
         // We didn't find a font. Try to find a similar font using our own specific knowledge about our platform.
         // For example on OS X, we know to map any families containing the words Arabic, Pashto, or Urdu to the
index 76c6e75..289e11f 100644 (file)
@@ -185,7 +185,7 @@ private:
     PassRefPtr<SimpleFontData> getSystemFontFallbackForCharacters(const FontDescription&, const SimpleFontData*, const UChar* characters, int length);
 #endif
     PassOwnPtr<FontPlatformData> createFontPlatformData(const FontDescription&, const AtomicString& family);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     PassRefPtr<SimpleFontData> similarFontPlatformData(const FontDescription&);
 #endif
 
@@ -194,14 +194,11 @@ private:
     // Don't purge if this count is > 0;
     int m_purgePreventCount;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     friend class ComplexTextController;
 #endif
     friend class SimpleFontData; // For getCachedFontData(const FontPlatformData*)
     friend class FontGlyphs;
-#if PLATFORM(IOS)
-    friend class ComplexTextController;
-#endif
 };
 
 // Get the global fontCache.
index d6e2a59..cd042ca 100644 (file)
@@ -306,7 +306,7 @@ std::pair<GlyphData, GlyphPage*> FontGlyphs::glyphDataAndPageForCharacter(const
                             variant = BrokenIdeographVariant;
                             break;
                         }
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
                         else if (data.fontData->platformData().syntheticOblique())
                             return glyphDataAndPageForCJKCharacterWithoutSyntheticItalic(c, data, page, pageNumber);
 #endif
index fac76e8..fdbcf7f 100644 (file)
@@ -169,7 +169,7 @@ public:
 
     // Implemented by the platform.
     bool fill(unsigned offset, unsigned length, UChar* characterBuffer, unsigned bufferLength, const SimpleFontData*);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     static bool mayUseMixedFontDataWhenFilling(const UChar* characterBuffer, unsigned bufferLength, const SimpleFontData*);
 #else
     static bool mayUseMixedFontDataWhenFilling(const UChar*, unsigned, const SimpleFontData*) { return false; }
index c3f3e79..6d3fede 100644 (file)
@@ -50,7 +50,7 @@
 #undef VERSION
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #if PLATFORM(IOS)
 #include <OpenGLES/ES2/gl.h>
 #ifdef __OBJC__
@@ -484,7 +484,7 @@ public:
     static PassRefPtr<GraphicsContext3D> createForCurrentGLContext();
     ~GraphicsContext3D();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; }
     Platform3DObject platformTexture() const { return m_compositorTexture; }
     CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); }
index 251f5a4..cf58a5c 100644 (file)
@@ -40,7 +40,7 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if USE(APPKIT)
 OBJC_CLASS NSImage;
 #endif
 
@@ -148,7 +148,7 @@ public:
     virtual NSImage* getNSImage() { return 0; }
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual CFDataRef getTIFFRepresentation() { return 0; }
 #endif
 
index 043ca0e..b06d677 100644 (file)
@@ -193,11 +193,9 @@ public:
     operator CGRect() const;
 #endif
 
-#if !PLATFORM(IOS)
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     operator NSRect() const;
 #endif
-#endif // !PLATFORM(IOS)
 
     void dump(PrintStream& out) const;
 
@@ -250,11 +248,9 @@ inline bool IntRect::isInfinite() const
 IntRect enclosingIntRect(const CGRect&);
 #endif
 
-#if !PLATFORM(IOS)
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
 IntRect enclosingIntRect(const NSRect&);
 #endif
-#endif // !PLATFORM(IOS)
 
 } // namespace WebCore
 
index 3f16a86..21f3da3 100644 (file)
@@ -129,12 +129,10 @@ public:
     operator CGSize() const;
 #endif
 
-#if !PLATFORM(IOS)    
-#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     explicit IntSize(const NSSize &); // don't do this implicitly since it's lossy
     operator NSSize() const;
 #endif
-#endif // !PLATFORM(IOS)
 
 #if PLATFORM(WIN)
     IntSize(const SIZE&);
index e3f7724..1afe9f4 100644 (file)
@@ -53,7 +53,7 @@
 #define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #if PLATFORM(IOS)
 #include "MediaPlayerPrivateIOS.h"
 #else
@@ -213,7 +213,7 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines(RequeryEngineOptions r
 
 #if USE(AVFOUNDATION)
     if (Settings::isAVFoundationEnabled()) {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
 #if ENABLE(MEDIA_SOURCE)
         MediaPlayerPrivateMediaSourceAVFObjC::registerMediaEngine(addMediaEngine);
@@ -769,7 +769,7 @@ MediaPlayer::SupportsType MediaPlayer::supportsType(const MediaEngineSupportPara
     if (!engine)
         return IsNotSupported;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // YouTube will ask if the HTMLMediaElement canPlayType video/webm, then
     // video/x-flv, then finally video/mp4, and will then load a URL of the first type
     // in that list which returns "probably". When Perian is installed,
index b0627ad..fc4d963 100644 (file)
@@ -236,7 +236,7 @@ PassRefPtr<SimpleFontData> SimpleFontData::nonSyntheticItalicFontData() const
         m_derivedFontData = DerivedFontData::create(isCustomFont());
     if (!m_derivedFontData->nonSyntheticItalic) {
         FontPlatformData nonSyntheticItalicFontPlatformData(m_platformData);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         nonSyntheticItalicFontPlatformData.m_syntheticOblique = false;
 #endif
         m_derivedFontData->nonSyntheticItalic = create(nonSyntheticItalicFontPlatformData, isCustomFont(), false, true);
@@ -276,7 +276,7 @@ SimpleFontData::DerivedFontData::~DerivedFontData()
         GlyphPageTreeNode::pruneTreeCustomFontData(verticalRightOrientation.get());
     if (uprightOrientation)
         GlyphPageTreeNode::pruneTreeCustomFontData(uprightOrientation.get());
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (compositeFontReferences) {
         CFDictionaryRef dictionary = CFDictionaryRef(compositeFontReferences.get());
         CFIndex count = CFDictionaryGetCount(dictionary);
index ffdde17..5da5c98 100644 (file)
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/StringHash.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
-#endif
-
-#if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -189,11 +186,11 @@ public:
     CTFontRef getCTFont() const { return m_platformData.font(); }
     bool shouldNotBeUsedForArabic() const { return m_shouldNotBeUsedForArabic; };
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
 #endif
 
-#if PLATFORM(MAC) || USE(HARFBUZZ)
+#if PLATFORM(COCOA) || USE(HARFBUZZ)
     bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
 #endif
 
@@ -287,7 +284,7 @@ private:
         RefPtr<SimpleFontData> verticalRightOrientation;
         RefPtr<SimpleFontData> uprightOrientation;
         RefPtr<SimpleFontData> nonSyntheticItalic;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
 #endif
 
@@ -304,11 +301,11 @@ private:
     float m_syntheticBoldOffset;
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     mutable HashMap<unsigned, RetainPtr<CFDictionaryRef>> m_CFStringAttributes;
 #endif
 
-#if PLATFORM(MAC) || USE(HARFBUZZ)
+#if PLATFORM(COCOA) || USE(HARFBUZZ)
     mutable OwnPtr<HashMap<String, bool>> m_combiningCharacterSequenceSupport;
 #endif
 
index 30405b0..d40e5ed 100644 (file)
@@ -32,7 +32,7 @@ static const int defaultTileWidth = 512;
 static const int defaultTileHeight = 512;
 
 class IntRect;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 class PlatformCALayer;
 #endif
 
@@ -100,7 +100,7 @@ public:
     virtual IntRect tileGridExtent() const = 0;
     virtual void setScrollingModeIndication(ScrollingModeIndication) = 0;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual PlatformCALayer* tiledScrollingIndicatorLayer() = 0;
 #endif
 };
index f6f89cf..13e9b0f 100644 (file)
@@ -50,7 +50,7 @@
 #include "WebCoreThread.h"
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "PlatformCALayerMac.h"
 #include "WebCoreSystemInterface.h"
 #endif
@@ -315,7 +315,7 @@ std::unique_ptr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* facto
 #if ENABLE(CSS_FILTERS)
 bool GraphicsLayerCA::filtersCanBeComposited(const FilterOperations& filters)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     return PlatformCALayerMac::filtersCanBeComposited(filters);
 #elif PLATFORM(WIN)
     return PlatformCALayerWin::filtersCanBeComposited(filters);
@@ -325,7 +325,7 @@ bool GraphicsLayerCA::filtersCanBeComposited(const FilterOperations& filters)
     
 PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     return PlatformCALayerMac::create(layerType, owner);
 #elif PLATFORM(WIN)
     return PlatformCALayerWin::create(layerType, owner);
@@ -334,7 +334,7 @@ PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALay
     
 PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformLayer* platformLayer, PlatformCALayerClient* owner)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     return PlatformCALayerMac::create(platformLayer, owner);
 #elif PLATFORM(WIN)
     return PlatformCALayerWin::create(platformLayer, owner);
index 60188f3..cc1e9f3 100644 (file)
@@ -50,7 +50,7 @@ private:
     bool m_isSuspended;
     LayerFlushSchedulerClient* m_client;
     
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<CFRunLoopObserverRef> m_runLoopObserver;
     static void runLoopObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity, void* context);
 
index acbaea2..d526a03 100644 (file)
@@ -34,7 +34,7 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS CAPropertyAnimation;
 typedef CAPropertyAnimation* PlatformAnimationRef;
 #elif PLATFORM(WIN)
@@ -51,7 +51,7 @@ class TimingFunction;
 class PlatformCAAnimation : public RefCounted<PlatformCAAnimation> {
 public:
     friend class PlatformCALayer;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     friend class PlatformCALayerMac;
 #elif PLATFORM(WIN)
     friend class PlatformCALayerWin;
@@ -154,7 +154,7 @@ protected:
 private:
     AnimationType m_type;
     
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<CAPropertyAnimation> m_animation;
 #elif PLATFORM(WIN)
     RetainPtr<CACFAnimationRef> m_animation;
index 797d3b6..5953a29 100644 (file)
@@ -52,7 +52,7 @@ public:
     static int numAnimatedFilterProperties(FilterOperation::OperationType);
     static const char* animatedFilterPropertyName(FilterOperation::OperationType, int internalFilterPropertyIndex);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     static RetainPtr<NSValue> filterValueForOperation(const FilterOperation*, int internalFilterPropertyIndex);
 #endif
 
index e4744b0..0575cdb 100644 (file)
@@ -49,7 +49,7 @@ class PlatformCALayer;
 typedef Vector<RefPtr<PlatformCALayer>> PlatformCALayerList;
 
 class PlatformCALayer : public RefCounted<PlatformCALayer> {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     friend class PlatformCALayerMac;
 #elif PLATFORM(WIN)
     friend class PlatformCALayerWin;
@@ -218,7 +218,7 @@ public:
 
     virtual PassRefPtr<PlatformCALayer> createCompatibleLayer(LayerType, PlatformCALayerClient*) const = 0;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual void enumerateRectsBeingDrawn(CGContextRef, void (^block)(CGRect)) = 0;
 #endif
 
index eac6ca0..e0ad080 100644 (file)
@@ -42,7 +42,7 @@
 #include <CoreGraphics/CGContextPrivate.h>
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #endif
 
index 11de222..0c561f8 100644 (file)
@@ -43,7 +43,7 @@
 #include <wtf/MathExtras.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #endif
 
@@ -1615,7 +1615,7 @@ InterpolationQuality GraphicsContext::imageInterpolationQuality() const
 void GraphicsContext::setAllowsFontSmoothing(bool allowsFontSmoothing)
 {
     UNUSED_PARAM(allowsFontSmoothing);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     CGContextRef context = platformContext();
     CGContextSetAllowsFontSmoothing(context, allowsFontSmoothing);
 #endif
index fcc9d01..4c82a2d 100644 (file)
@@ -51,7 +51,7 @@ public:
     {
     }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // These methods do nothing on Mac.
     void save() {}
     void restore() {}
index f9f4940..2abed90 100644 (file)
@@ -43,7 +43,7 @@
 #include <wtf/text/Base64.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #endif
 
index 8960d00..60ddc45 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/RefPtr.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC) && USE(CA)
+#if PLATFORM(COCOA) && USE(CA)
 #if !PLATFORM(IOS_SIMULATOR)
 #define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
 #endif // !PLATFORM(IOS_SIMULATOR)
index e24c749..b7b252e 100644 (file)
@@ -35,7 +35,7 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #endif
 
index bc99229..7bd693e 100644 (file)
@@ -57,7 +57,7 @@ const CFStringRef kCGImageSourceSkipMetadata = CFSTR("kCGImageSourceSkipMetadata
 bool ImageSource::s_acceleratedImageDecoding;
 #endif
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 size_t sharedBufferGetBytesAtPosition(void* info, void* buffer, off_t position, size_t count)
 {
     SharedBuffer* sharedBuffer = static_cast<SharedBuffer*>(info);
@@ -151,7 +151,7 @@ bool ImageSource::initialized() const
 
 void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (!m_decoder)
         m_decoder = CGImageSourceCreateIncremental(0);
     // On Mac the NSData inside the SharedBuffer can be secretly appended to without the SharedBuffer's knowledge.  We use SharedBuffer's ability
index bff8162..5f8849b 100644 (file)
@@ -35,7 +35,7 @@ String preferredExtensionForImageSourceType(const String& type);
 
 String MIMETypeForImageSourceType(const String& type);
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 size_t sharedBufferGetBytesAtPosition(void* info, void* buffer, off_t position, size_t count);
 #endif
 
index 597fde8..9f39ccc 100644 (file)
@@ -39,7 +39,7 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #endif
 
@@ -255,7 +255,7 @@ void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius)
 
 void Path::platformAddPathForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     bool equalWidths = (topLeftRadius.width() == topRightRadius.width() && topRightRadius.width() == bottomLeftRadius.width() && bottomLeftRadius.width() == bottomRightRadius.width());
     bool equalHeights = (topLeftRadius.height() == bottomLeftRadius.height() && bottomLeftRadius.height() == topRightRadius.height() && topRightRadius.height() == bottomRightRadius.height());
 
index 1806504..4f7bd4d 100644 (file)
@@ -33,7 +33,7 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <wtf/MainThread.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #endif
 
index 0b75f76..22d9d4b 100644 (file)
@@ -39,7 +39,7 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -161,7 +161,7 @@ private:
     // True if our contents have been modified since the last presentation of this buffer.
     bool m_contentsChanged;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<WebGLLayer> m_platformLayer;
 #endif
 };
index 789b9ef..60ca5c7 100644 (file)
@@ -432,10 +432,8 @@ void MediaPlayerPrivateQTKit::createQTMovieView()
     m_qtMovieView = adoptNS([[QTMovieView alloc] init]);
     setSize(m_player->size());
     NSView* parentView = 0;
-#if PLATFORM(MAC)
     parentView = m_player->frameView()->documentView();
     [parentView addSubview:m_qtMovieView.get()];
-#endif
     [m_qtMovieView.get() setDelegate:m_objcObserver.get()];
     [m_objcObserver.get() setView:m_qtMovieView.get()];
     [m_qtMovieView.get() setMovie:m_qtMovie.get()];
index f8321ca..d32a075 100644 (file)
@@ -204,7 +204,7 @@ bool Extensions3DOpenGL::supportsExtension(const String& name)
         return m_availableExtensions.contains("GL_EXT_texture_filter_anisotropic");
 
     if (name == "GL_EXT_draw_buffers") {
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
         return m_availableExtensions.contains("GL_ARB_draw_buffers");
 #else
         // FIXME: implement support for other platforms.
index 02e1b9e..8afeaad 100644 (file)
@@ -351,7 +351,7 @@ void GraphicsContext3D::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsi
         ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
 {
     UNUSED_PARAM(mode);
index 4bdf620..88a4c9e 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "PlatformKeyboardEvent.h"
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
 
 #import "KeyEventCocoa.h"
 #import "Logging.h"
@@ -78,4 +78,4 @@ void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKe
 
 } // namespace WebCore
 
-#endif // PLATFORM(MAC)
+#endif // PLATFORM(MAC) && !PLATFORM(IOS)
index 1bccd36..aba25dc 100644 (file)
@@ -39,7 +39,7 @@ public:
     static PlatformKeyboardEvent createPlatformKeyboardEvent(NSEvent *);
 };
 
-#if PLATFORM(MAC) && defined(__OBJC__)
+#if PLATFORM(COCOA) && defined(__OBJC__)
 // FIXME: This doesn't really belong here.
 IntPoint globalPoint(const NSPoint& windowPoint, NSWindow *);
 
index 15e2154..16bbeab 100644 (file)
@@ -65,7 +65,7 @@ typedef FMFont ATSUFontID;
 typedef UInt16 ATSGlyphRef;
 #endif
 
-#if PLATFORM(MAC) && USE(CA)
+#if PLATFORM(COCOA) && USE(CA)
 #if !PLATFORM(IOS_SIMULATOR)
 typedef struct __IOSurface *IOSurfaceRef;
 #endif // !PLATFORM(IOS_SIMULATOR)
@@ -261,7 +261,7 @@ extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(cons
 
 extern CGSize (*wkCTRunGetInitialAdvance)(CTRunRef);
 
-#if PLATFORM(MAC) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
 extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
 extern CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
 #endif
@@ -280,10 +280,8 @@ extern NSCursor *(*wkCursor)(const char*);
 #endif // !PLATFORM(IOS)
     
 #if !PLATFORM(IOS)
-#if PLATFORM(MAC)
 extern NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
 extern NSString *(*wkSpeechSynthesisGetDefaultVoiceIdentifierForLocale)(NSLocale *);
-#endif
 
 extern void (*wkUnregisterUniqueIdForElement)(id element);
 extern void (*wkAccessibilityHandleFocusChanged)(void);    
index 46c225c..76c82bd 100644 (file)
@@ -151,10 +151,8 @@ NSURL *(*wkAVAssetResolvedURL)(AVAsset*);
 
 NSCursor *(*wkCursor)(const char*);
 
-#if PLATFORM(MAC)
 NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
 NSString *(*wkSpeechSynthesisGetDefaultVoiceIdentifierForLocale)(NSLocale *);
-#endif
 
 void (*wkUnregisterUniqueIdForElement)(id element);
 void (*wkAccessibilityHandleFocusChanged)(void);
index 2166b9b..909bc13 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <wtf/text/WTFString.h>
 
-#define CERTIFICATE_CREDENTIALS_SUPPORTED (PLATFORM(IOS) || PLATFORM(MAC))
+#define CERTIFICATE_CREDENTIALS_SUPPORTED (PLATFORM(COCOA))
 
 #if CERTIFICATE_CREDENTIALS_SUPPORTED
 #include <Security/SecBase.h>
index 1763996..01d7916 100644 (file)
@@ -100,7 +100,7 @@ private:
 #endif
 };
 
-#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(EFL)
+#if !PLATFORM(COCOA) && !PLATFORM(WIN) && !PLATFORM(EFL)
 
 inline NetworkStateNotifier::NetworkStateNotifier()
     : m_isOnLine(true)
index bb6fb7f..10b3af2 100644 (file)
@@ -29,7 +29,7 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
 typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
 #endif
@@ -47,11 +47,11 @@ public:
 
     static void switchToNewTestingSession();
 
-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
     bool isPrivateBrowsingSession() const { return m_isPrivate; }
 #endif
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
     NetworkStorageSession(RetainPtr<CFURLStorageSessionRef>);
     // May be null, in which case a Foundation default should be used.
     CFURLStorageSessionRef platformSession() { return m_platformSession.get(); }
@@ -68,7 +68,7 @@ public:
 #endif
 
 private:
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
     NetworkStorageSession();
     RetainPtr<CFURLStorageSessionRef> m_platformSession;
 #elif USE(SOUP)
@@ -77,7 +77,7 @@ private:
     RefPtr<NetworkingContext> m_context;
 #endif
 
-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
     bool m_isPrivate;
 #endif
 };
index 3080a7e..fcffc04 100644 (file)
 #include <wtf/RefCounted.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <wtf/SchedulePair.h>
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSOperationQueue;
 #endif
 
@@ -49,7 +49,7 @@ public:
 
     virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const = 0;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     virtual bool needsSiteSpecificQuirks() const = 0;
     virtual bool localFileContentSniffingEnabled() const = 0; // FIXME: Reconcile with ResourceHandle::forceContentSniffing().
     virtual SchedulePairHashSet* scheduledRunLoopPairs() const { return 0; }
@@ -57,7 +57,7 @@ public:
     virtual ResourceError blockedError(const ResourceRequest&) const = 0;
 #endif
 
-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
     virtual NetworkStorageSession& storageSession() const = 0;
 #endif
 
index e926ad1..536f959 100644 (file)
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "ProtectionSpace.h"
 
-#if USE(CFNETWORK) && !PLATFORM(MAC)
+#if USE(CFNETWORK) && !PLATFORM(COCOA)
 #include "AuthenticationCF.h"
 #include <CFNetwork/CFURLProtectionSpacePriv.h>
 #include <wtf/RetainPtr.h>
@@ -92,7 +92,7 @@ ProtectionSpaceAuthenticationScheme ProtectionSpace::authenticationScheme() cons
 
 bool ProtectionSpace::receivesCredentialSecurely() const
 {
-#if USE(CFNETWORK) && !PLATFORM(MAC)
+#if USE(CFNETWORK) && !PLATFORM(COCOA)
     RetainPtr<CFURLProtectionSpaceRef> cfSpace = adoptCF(createCF(*this));
     return cfSpace && CFURLProtectionSpaceReceivesCredentialSecurely(cfSpace.get());
 #else
index 1a3994e..2ed41db 100644 (file)
@@ -152,7 +152,7 @@ void ResourceHandle::setClient(ResourceHandleClient* client)
     d->m_client = client;
 }
 
-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
+#if !PLATFORM(COCOA) && !USE(CFNETWORK) && !USE(SOUP)
 // ResourceHandle never uses async client calls on these platforms yet.
 void ResourceHandle::continueWillSendRequest(const ResourceRequest&)
 {
@@ -199,7 +199,7 @@ bool ResourceHandle::hasAuthenticationChallenge() const
 
 void ResourceHandle::clearAuthentication()
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     d->m_currentMacChallenge = nil;
 #endif
     d->m_currentWebChallenge.nullify();
@@ -212,7 +212,7 @@ bool ResourceHandle::shouldContentSniff() const
 
 bool ResourceHandle::shouldContentSniffURL(const URL& url)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (shouldForceContentSniffing)
         return true;
 #endif
index c1da034..6445faa 100644 (file)
@@ -54,11 +54,11 @@ typedef void* LPVOID;
 typedef LPVOID HINTERNET;
 #endif
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
 #include <wtf/RetainPtr.h>
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSCachedURLResponse;
 OBJC_CLASS NSData;
 OBJC_CLASS NSError;
@@ -75,7 +75,7 @@ typedef int CFHTTPCookieStorageAcceptPolicy;
 typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
 #endif
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
 #endif
 
@@ -100,7 +100,7 @@ class SharedBuffer;
 template <typename T> class Timer;
 
 class ResourceHandle : public RefCounted<ResourceHandle>
-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
     , public AuthenticationClient
 #endif
     {
@@ -110,10 +110,10 @@ public:
 
     virtual ~ResourceHandle();
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
     void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
 #endif
-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
     bool shouldUseCredentialStorage();
     void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
     virtual void receivedCredential(const AuthenticationChallenge&, const Credential&) override;
@@ -121,7 +121,7 @@ public:
     virtual void receivedCancellation(const AuthenticationChallenge&) override;
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
     bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
 #endif
@@ -215,7 +215,7 @@ public:
     // Called in response to ResourceHandleClient::willCacheResponseAsync().
 #if USE(CFNETWORK)
     void continueWillCacheResponse(CFCachedURLResponseRef);
-#elif PLATFORM(MAC)
+#elif PLATFORM(COCOA)
     void continueWillCacheResponse(NSCachedURLResponse *);
 #endif
 
@@ -233,7 +233,7 @@ public:
     using RefCounted<ResourceHandle>::ref;
     using RefCounted<ResourceHandle>::deref;
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
     static CFStringRef synchronousLoadRunLoopMode();
 #endif
 #if PLATFORM(IOS) && USE(CFNETWORK)
@@ -270,7 +270,7 @@ private:
     virtual void refAuthenticationClient() override { ref(); }
     virtual void derefAuthenticationClient() override { deref(); }
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
     enum class SchedulingBehavior {
         Asynchronous,
         Synchronous
index 8eb4eeb..d968a37 100644 (file)
@@ -66,7 +66,7 @@ void ResourceHandleClient::willCacheResponseAsync(ResourceHandle* handle, CFCach
 {
     handle->continueWillCacheResponse(response);
 }
-#elif PLATFORM(MAC)
+#elif PLATFORM(COCOA)
 void ResourceHandleClient::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *response)
 {
     handle->continueWillCacheResponse(response);
index aa4b79a..98f1371 100644 (file)
@@ -35,7 +35,7 @@
 #include <wtf/RetainPtr.h>
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSCachedURLResponse;
 #endif
 
@@ -92,7 +92,7 @@ namespace WebCore {
         // Client will pass an updated request using ResourceHandle::continueWillCacheResponse() when ready.
 #if USE(CFNETWORK)
         virtual void willCacheResponseAsync(ResourceHandle*, CFCachedURLResponseRef);
-#elif PLATFORM(MAC)
+#elif PLATFORM(COCOA)
         virtual void willCacheResponseAsync(ResourceHandle*, NSCachedURLResponse *);
 #endif
 
@@ -120,7 +120,7 @@ namespace WebCore {
         virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) { return true; }
 #endif // PLATFORM(WIN)
 
-#elif PLATFORM(MAC)
+#elif PLATFORM(COCOA)
         virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; }
         virtual void willStopBufferingData(ResourceHandle*, const char*, unsigned) { }
 #endif
index 7dc43e2..d67f881 100644 (file)
 class Frame;
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSURLAuthenticationChallenge;
 OBJC_CLASS NSURLConnection;
 #endif
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
 #endif
 
@@ -112,7 +112,7 @@ namespace WebCore {
             , m_redirectCount(0)
             , m_previousPosition(0)
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
             , m_startWhenScheduled(false)
             , m_needsSiteSpecificQuirks(false)
             , m_currentMacChallenge(nil)
@@ -150,15 +150,15 @@ namespace WebCore {
         ResourceRequest m_currentRequest;
         RefPtr<ResourceHandleCFURLConnectionDelegate> m_connectionDelegate;
 #endif
-#if PLATFORM(MAC) && !USE(CFNETWORK)
+#if PLATFORM(COCOA) && !USE(CFNETWORK)
         RetainPtr<NSURLConnection> m_connection;
         RetainPtr<id> m_delegate;
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         bool m_startWhenScheduled;
         bool m_needsSiteSpecificQuirks;
 #endif
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
         RetainPtr<CFURLStorageSessionRef> m_storageSession;
 #endif
 #if USE(WININET)
@@ -211,7 +211,7 @@ namespace WebCore {
         } m_credentialDataToSaveInPersistentStore;
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         // We need to keep a reference to the original challenge to be able to cancel it.
         // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender.
         NSURLAuthenticationChallenge *m_currentMacChallenge;
index 36964e8..4c4c6d2 100644 (file)
@@ -30,7 +30,7 @@
 
 namespace WebCore {
 
-#if !USE(SOUP) && (!PLATFORM(MAC) || USE(CFNETWORK))
+#if !USE(SOUP) && (!PLATFORM(COCOA) || USE(CFNETWORK))
 double ResourceRequestBase::s_defaultTimeoutInterval = INT_MAX;
 #else
 // Will use NSURLRequest default timeout unless set to a non-zero value with setDefaultTimeoutInterval().
@@ -522,7 +522,7 @@ void ResourceRequestBase::updateResourceRequest(HTTPBodyUpdatePolicy bodyPolicy)
     }
 }
 
-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
+#if !PLATFORM(COCOA) && !USE(CFNETWORK) && !USE(SOUP)
 unsigned initializeMaximumHTTPConnectionCountPerHost()
 {
     // This is used by the loader to control the number of issued parallel load requests. 
index f1281cb..66d43ff 100644 (file)
@@ -43,7 +43,7 @@ CFURLAuthChallengeRef createCF(const AuthenticationChallenge&);
 CFURLCredentialRef createCF(const Credential&);
 CFURLProtectionSpaceRef createCF(const ProtectionSpace&);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 AuthenticationChallenge core(CFURLAuthChallengeRef);
 #endif
 Credential core(CFURLCredentialRef);
index e303ed8..d546074 100644 (file)
@@ -29,7 +29,7 @@
 #include "NetworkStorageSession.h"
 #include <wtf/MainThread.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #elif PLATFORM(WIN)
 #include "LoaderRunLoopCF.h"
index c7252c3..0851211 100644 (file)
@@ -33,7 +33,7 @@
 #include "ProtectionSpace.h"
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #elif PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
index 63a4428..8baa57d 100644 (file)
@@ -48,7 +48,7 @@
 #include <CoreServices/CoreServices.h>
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 extern "C" void CFURLRequestSetHTTPRequestBody(CFMutableURLRequestRef mutableHTTPRequest, CFDataRef httpBody);
 extern "C" void CFURLRequestSetHTTPHeaderFieldValue(CFMutableURLRequestRef mutableHTTPRequest, CFStringRef httpHeaderField, CFStringRef httpHeaderFieldValue);
 extern "C" void CFURLRequestSetHTTPRequestBodyStream(CFMutableURLRequestRef req, CFReadStreamRef bodyStream);
index a13f316..81dff2e 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/NeverDestroyed.h>
 #include <wtf/PassOwnPtr.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #else
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
@@ -55,7 +55,7 @@ void NetworkStorageSession::switchToNewTestingSession()
 {
     // Set a private session for testing to avoid interfering with global cookies. This should be different from private browsing session.
     // 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>.
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR("Private WebKit Session")))));
 #else
     defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR("Private WebKit Session"), defaultNetworkStorageSession()->platformSession()))));
@@ -93,7 +93,7 @@ std::unique_ptr<NetworkStorageSession> NetworkStorageSession::createPrivateBrows
 {
     RetainPtr<CFStringRef> cfIdentifier = String(identifierBase + ".PrivateBrowsing").createCFString();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     auto session = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(cfIdentifier.get())));
 #else
     auto session = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(cfIdentifier.get(), defaultNetworkStorageSession()->platformSession())));
index 6a8c7da..7ce4dfe 100644 (file)
@@ -37,7 +37,7 @@
 #include <wincrypt.h> // windows.h must be included before wincrypt.h.
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSError;
 #endif
 
@@ -72,7 +72,7 @@ public:
     operator CFStreamError() const;
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     ResourceError(NSError *);
     NSError *nsError() const;
     operator NSError *() const;
@@ -88,7 +88,7 @@ private:
     bool m_dataIsUpToDate;
 #if USE(CFNETWORK)
     mutable RetainPtr<CFErrorRef> m_platformError;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     mutable RetainPtr<NSError> m_platformNSError;
 #endif
 #if PLATFORM(WIN)
index 3284f21..06f27e4 100644 (file)
@@ -51,7 +51,7 @@
 #include <wtf/text/Base64.h>
 #include <wtf/text/CString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "ResourceHandleCFURLConnectionDelegateWithOperationQueue.h"
 #include "WebCoreSystemInterface.h"
 #if USE(CFNETWORK)
@@ -217,7 +217,7 @@ void ResourceHandle::createCFURLConnection(bool shouldUseCredentialStorage, bool
     CFDictionaryAddValue(propertiesDictionary.get(), kCFURLConnectionSocketStreamProperties, streamProperties);
     CFRelease(streamProperties);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (client() && client()->usesAsyncCallbacks())
         d->m_connectionDelegate = adoptRef(new ResourceHandleCFURLConnectionDelegateWithOperationQueue(this));
     else
@@ -546,7 +546,7 @@ bool ResourceHandle::loadsBlocked()
     return false;
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 void ResourceHandle::schedule(SchedulePair* pair)
 {
     CFRunLoopRef runLoop = pair->runLoop();
index 2a26d5a..bc297f5 100644 (file)
@@ -32,7 +32,7 @@
 
 OBJC_CLASS NSURLRequest;
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
 typedef const struct _CFURLRequest* CFURLRequestRef;
 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
 #endif
@@ -75,7 +75,7 @@ namespace WebCore {
         }
         
 #if USE(CFNETWORK)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         ResourceRequest(NSURLRequest *);
         void updateNSURLRequest();
 #endif
@@ -87,7 +87,7 @@ namespace WebCore {
 #endif
             , m_cfRequest(cfRequest)
         {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
             updateNSURLRequest();
 #endif
         }
@@ -104,7 +104,7 @@ namespace WebCore {
 
         void updateFromDelegatePreservingOldHTTPBody(const ResourceRequest&);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         void applyWebArchiveHackForMail();
         NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
 #endif
@@ -115,7 +115,7 @@ namespace WebCore {
         void setCachePartition(const String& cachePartition) { m_cachePartition = partitionName(cachePartition); }
 #endif
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
         CFURLRequestRef cfURLRequest(HTTPBodyUpdatePolicy) const;
         void setStorageSession(CFURLStorageSessionRef);
 #endif
@@ -123,7 +123,7 @@ namespace WebCore {
         static bool httpPipeliningEnabled();
         static void setHTTPPipeliningEnabled(bool);
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         static bool useQuickLookResourceCachingQuirks();
 #endif
 
@@ -149,7 +149,7 @@ namespace WebCore {
 #if USE(CFNETWORK)
         RetainPtr<CFURLRequestRef> m_cfRequest;
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         RetainPtr<NSURLRequest> m_nsRequest;
 #endif
 #if ENABLE(CACHE_PARTITIONING)
index 81d20e7..1ba0324 100644 (file)
@@ -41,7 +41,7 @@
 #endif
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "ResourceLoadPriority.h"
 #include "WebCoreSystemInterface.h"
 #include <dlfcn.h>
@@ -84,7 +84,7 @@ static CFURLRequestCopyContentDispositionEncodingFallbackArrayFunction findCFURL
 {
     return reinterpret_cast<CFURLRequestCopyContentDispositionEncodingFallbackArrayFunction>(GetProcAddress(findCFNetworkModule(), "_CFURLRequestCopyContentDispositionEncodingFallbackArray"));
 }
-#elif PLATFORM(MAC)
+#elif PLATFORM(COCOA)
 static CFURLRequestSetContentDispositionEncodingFallbackArrayFunction findCFURLRequestSetContentDispositionEncodingFallbackArrayFunction()
 {
     return reinterpret_cast<CFURLRequestSetContentDispositionEncodingFallbackArrayFunction>(dlsym(RTLD_DEFAULT, "_CFURLRequestSetContentDispositionEncodingFallbackArray"));
@@ -192,7 +192,7 @@ void ResourceRequest::doUpdatePlatformRequest()
 #endif
 
     m_cfRequest = adoptCF(cfRequest);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     updateNSURLRequest();
 #endif
 }
@@ -228,7 +228,7 @@ void ResourceRequest::doUpdatePlatformHTTPBody()
     }
 
     m_cfRequest = adoptCF(cfRequest);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     updateNSURLRequest();
 #endif
 }
@@ -332,12 +332,12 @@ void ResourceRequest::setStorageSession(CFURLStorageSessionRef storageSession)
     CFMutableURLRequestRef cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
     wkSetRequestStorageSession(storageSession, cfRequest);
     m_cfRequest = adoptCF(cfRequest);
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     updateNSURLRequest();
 #endif
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 void ResourceRequest::applyWebArchiveHackForMail()
 {
 #if !PLATFORM(IOS)
index bf7d328..680a4aa 100644 (file)
@@ -53,7 +53,7 @@ public:
     {
         m_isNull = !cfResponse;
     }
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     ResourceResponse(NSURLResponse *);
 #endif
 #else
@@ -88,11 +88,11 @@ public:
 #if USE(CFNETWORK)
     CFURLResponseRef cfURLResponse() const;
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     NSURLResponse *nsURLResponse() const;
 #endif
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
     void setCertificateChain(CFArrayRef);
     RetainPtr<CFArrayRef> certificateChain() const;
 #endif
@@ -105,7 +105,7 @@ private:
     void platformLazyInit(InitLevel);
     PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
     void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void initNSURLResponse() const;
 #endif
 
@@ -117,10 +117,10 @@ private:
 #if USE(CFNETWORK)
     mutable RetainPtr<CFURLResponseRef> m_cfResponse;
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     mutable RetainPtr<NSURLResponse> m_nsResponse;
 #endif
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
     // Certificate chain is normally part of NS/CFURLResponse, but there is no way to re-add it to a deserialized response after IPC.
     RetainPtr<CFArrayRef> m_externalCertificateChain;
 #endif
index faf02d7..fa72865 100644 (file)
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #include "WebCoreURLResponse.h"
-#endif // PLATFORM(MAC)
+#endif // PLATFORM(COCOA)
 
 #if PLATFORM(IOS)
 #include "WebCoreThread.h"
@@ -102,14 +102,14 @@ CFURLRequestRef SynchronousResourceHandleCFURLConnectionDelegate::willSendReques
     return cfRequest;
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 static void setDefaultMIMEType(CFURLResponseRef response)
 {
     static CFStringRef defaultMIMETypeString = defaultMIMEType().createCFString().leakRef();
     
     CFURLResponseSetMIMEType(response, defaultMIMETypeString);
 }
-#endif // !PLATFORM(MAC)
+#endif // !PLATFORM(COCOA)
 
 void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(CFURLResponseRef cfResponse)
 {
@@ -118,7 +118,7 @@ void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(CFURLR
     if (!m_handle->client())
         return;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
     CFHTTPMessageRef msg = wkGetCFURLResponseHTTPResponse(cfResponse);
     int statusCode = msg ? CFHTTPMessageGetResponseStatusCode(msg) : 0;
index d1a3fb3..3ff8bd2 100644 (file)
@@ -174,7 +174,7 @@ bool ResourceResponse::platformCompare(const ResourceResponse& a, const Resource
 
 #endif // USE(CFNETWORK)
 
-#if PLATFORM(MAC) || USE(CFNETWORK)
+#if PLATFORM(COCOA) || USE(CFNETWORK)
 
 void ResourceResponse::setCertificateChain(CFArrayRef certificateChain)
 {
@@ -190,7 +190,7 @@ RetainPtr<CFArrayRef> ResourceResponse::certificateChain() const
     return adoptCF(wkCopyNSURLResponseCertificateChain(nsURLResponse()));
 }
 
-#endif // PLATFORM(MAC) || USE(CFNETWORK)
+#endif // PLATFORM(COCOA) || USE(CFNETWORK)
 
 } // namespace WebCore
 
index c7e7960..e4b6e31 100644 (file)
@@ -312,7 +312,7 @@ Vector<String> listDirectory(const String& path, const String& filter)
 }
 #endif
 
-#if !PLATFORM(MAC)
+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
 String openTemporaryFile(const String& prefix, PlatformFileHandle& handle)
 {
     char buffer[PATH_MAX];
index 3f4c75d..2bcdc57 100644 (file)
@@ -56,7 +56,7 @@ int startOfLastWordBoundaryContext(const UChar* characters, int length)
     return 0;
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 
 int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
 {
@@ -104,6 +104,6 @@ void findEndWordBoundary(const UChar* chars, int len, int position, int* end)
         *end = textBreakLast(it);
 }
 
-#endif // !PLATFORM(MAC)
+#endif // !PLATFORM(COCOA)
 
 } // namespace WebCore