<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163657] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163657">163657</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 15:37:54 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreplatformContentFilterh">trunk/Source/WebCore/platform/ContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuh">trunk/Source/WebCore/platform/ContextMenu.h</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuItemh">trunk/Source/WebCore/platform/ContextMenuItem.h</a></li>
<li><a href="#trunkSourceWebCoreplatformCursorcpp">trunk/Source/WebCore/platform/Cursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformCursorh">trunk/Source/WebCore/platform/Cursor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformDragDatacpp">trunk/Source/WebCore/platform/DragData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformDragImagecpp">trunk/Source/WebCore/platform/DragImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLanguagecpp">trunk/Source/WebCore/platform/Language.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringscpp">trunk/Source/WebCore/platform/LocalizedStrings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringsh">trunk/Source/WebCore/platform/LocalizedStrings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistrycpp">trunk/Source/WebCore/platform/MIMETypeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardStrategyh">trunk/Source/WebCore/platform/PasteboardStrategy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformKeyboardEventh">trunk/Source/WebCore/platform/PlatformKeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformMenuDescriptionh">trunk/Source/WebCore/platform/PlatformMenuDescription.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformSpeechSynthesizerh">trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformWheelEventh">trunk/Source/WebCore/platform/PlatformWheelEvent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformSchemeRegistrycpp">trunk/Source/WebCore/platform/SchemeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorcpp">trunk/Source/WebCore/platform/ScrollAnimator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorh">trunk/Source/WebCore/platform/ScrollAnimator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarThemeCompositeh">trunk/Source/WebCore/platform/ScrollbarThemeComposite.h</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
<li><a href="#trunkSourceWebCoreplatformWidgetcpp">trunk/Source/WebCore/platform/Widget.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformWidgeth">trunk/Source/WebCore/platform/Widget.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioAudioSessioncpp">trunk/Source/WebCore/platform/audio/AudioSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioHRTFElevationcpp">trunk/Source/WebCore/platform/audio/HRTFElevation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSessionMaccpp">trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacMediaSessionManagerMaccpp">trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcfSharedBufferCFcpp">trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcfURLCFcpp">trunk/Source/WebCore/platform/cf/URLCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImageh">trunk/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp">trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorh">trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointh">trunk/Source/WebCore/platform/graphics/FloatPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRecth">trunk/Source/WebCore/platform/graphics/FloatRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatSizeh">trunk/Source/WebCore/platform/graphics/FloatSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFonth">trunk/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphscpp">trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphPageh">trunk/Source/WebCore/platform/graphics/GlyphPage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh">trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageh">trunk/Source/WebCore/platform/graphics/Image.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRecth">trunk/Source/WebCore/platform/graphics/IntRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntSizeh">trunk/Source/WebCore/platform/graphics/IntSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSimpleFontDatacpp">trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSimpleFontDatah">trunk/Source/WebCore/platform/graphics/SimpleFontData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaLayerFlushSchedulerh">trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCAAnimationh">trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCAFiltersh">trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgBitmapImageCGcpp">trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextPlatformPrivateCGh">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferDataCGh">trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageSourceCGh">trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPathCGcpp">trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPatternCGcpp">trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgpuDrawingBufferh">trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacKeyEventMacmm">trunk/Source/WebCore/platform/mac/KeyEventMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformEventFactoryMach">trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCredentialh">trunk/Source/WebCore/platform/network/Credential.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStateNotifierh">trunk/Source/WebCore/platform/network/NetworkStateNotifier.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStorageSessionh">trunk/Source/WebCore/platform/network/NetworkStorageSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkingContexth">trunk/Source/WebCore/platform/network/NetworkingContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkProtectionSpacecpp">trunk/Source/WebCore/platform/network/ProtectionSpace.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandlecpp">trunk/Source/WebCore/platform/network/ResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleClientcpp">trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleClienth">trunk/Source/WebCore/platform/network/ResourceHandleClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBasecpp">trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfAuthenticationCFh">trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCookieStorageCFNetcpp">trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCredentialStorageCFNetcpp">trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfFormDataStreamCFNetcpp">trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp">trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceErrorh">trunk/Source/WebCore/platform/network/cf/ResourceError.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFURLConnectionDelegatecpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequesth">trunk/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceResponseh">trunk/Source/WebCore/platform/network/cf/ResourceResponse.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp">trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm">trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformposixFileSystemPOSIXcpp">trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBoundariescpp">trunk/Source/WebCore/platform/text/TextBoundaries.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -1,3 +1,159 @@
</span><ins>+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).
+
</ins><span class="cx"> 2014-02-07 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Revert r154384 and r154674 as they broke selection rect computations for text with ligatures.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -112,6 +112,6 @@
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><del>-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;
</del><ins>+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;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><span class="cx"> 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;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContentFilter.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContentFilter.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/ContentFilter.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSMutableData;
</span><span class="cx"> OBJC_CLASS WebFilterEvaluator;
</span><span class="cx"> #endif
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit ContentFilter(const ResourceResponse&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<WebFilterEvaluator> m_platformContentFilter;
</span><span class="cx"> RetainPtr<NSData> m_replacementData;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenu.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenu.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/ContextMenu.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "PlatformMenuDescription.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include <windows.h>
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><span class="cx"> Vector<ContextMenuItem> m_items;
</span><span class="cx"> #else
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Keep this in sync with the PlatformMenuDescription typedef
</span><span class="cx"> RetainPtr<NSMutableArray> m_platformDescription;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenuItem.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSMenuItem;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> ContextMenuItemTagTextDirectionDefault,
</span><span class="cx"> ContextMenuItemTagTextDirectionLeftToRight,
</span><span class="cx"> ContextMenuItemTagTextDirectionRightToLeft,
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ContextMenuItemTagCorrectSpellingAutomatically,
</span><span class="cx"> ContextMenuItemTagSubstitutionsMenu,
</span><span class="cx"> ContextMenuItemTagShowSubstitutions,
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> typedef NSMenuItem* PlatformMenuItemDescription;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef GtkMenuItem* PlatformMenuItemDescription;
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> bool m_checked;
</span><span class="cx"> Vector<ContextMenuItem> m_subMenuItems;
</span><span class="cx"> #else
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<NSMenuItem> m_platformDescription;
</span><span class="cx"> #else
</span><span class="cx"> PlatformMenuItemDescription m_platformDescription;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Cursor.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Cursor.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/Cursor.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> PlatformCursor Cursor::platformCursor() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Cursor.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Cursor.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/Cursor.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> typedef HICON HCURSOR;
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> #include "GRefPtrGtk.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragData.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragData.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/DragData.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition,
</span><span class="cx"> DragOperation sourceOperationMask, DragApplicationFlags flags)
</span><span class="cx"> : m_clientPosition(clientPosition)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragImage.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragImage.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/DragImage.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> return createDragImageFromSnapshot(snapshotNode(frame, node), &node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && (!PLATFORM(WIN) || OS(WINCE))
</del><ins>+#if !PLATFORM(COCOA) && (!PLATFORM(WIN) || OS(WINCE))
</ins><span class="cx"> DragImageRef createDragImageForLink(URL&, const String&, FontRenderingMode)
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLanguagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Language.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Language.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/Language.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(CF) && !PLATFORM(WIN)
</ins><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> String displayNameForLanguageLocale(const String& localeName)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(CF) && !PLATFORM(WIN)
</ins><span class="cx"> if (!localeName.isNull() && !localeName.isEmpty()) {
</span><span class="cx"> RetainPtr<CFLocaleRef> currentLocale = adoptCF(CFLocaleCopyCurrent());
</span><span class="cx"> return CFLocaleCopyDisplayNameForPropertyValue(currentLocale.get(), kCFLocaleIdentifier, localeName.createCFString().get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> return WEB_UI_STRING("Details", "text to display in <details> tag when it has no <summary> child");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String copyImageUnknownFileLabel()
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("unknown", "Unknown filename");
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> return WEB_UI_STRING("Learn Spelling", "Learn Spelling context menu item");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String contextMenuItemTagSearchInSpotlight()
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("Search in Spotlight", "Search in Spotlight context menu item");
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx">
</span><span class="cx"> String contextMenuItemTagSearchWeb()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFStringRef> searchProviderName = adoptCF(wkCopyDefaultSearchProviderDisplayName());
</span><span class="cx"> return formatLocalizedString(WEB_UI_STRING("Search with %@", "Search with search provider context menu item with provider name inserted"), searchProviderName.get());
</span><span class="cx"> #else
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> return WEB_UI_STRING("Font", "Font context sub-menu item");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String contextMenuItemTagShowFonts()
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("Show Fonts", "Show fonts context menu item");
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> return WEB_UI_STRING("Outline", "Outline context menu item");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String contextMenuItemTagStyles()
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("Styles...", "Styles context menu item");
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> return WEB_UI_STRING("Right to Left", "Right to Left context menu item");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> String contextMenuItemTagCorrectSpellingAutomatically()
</span><span class="cx"> {
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> return replacedString;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> String contextMenuItemTagOpenVideoInNewWindow()
</span><span class="cx"> {
</span><span class="lines">@@ -653,7 +653,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String AXARIAContentGroupText(const String& ariaType)
</span><span class="cx"> {
</span><span class="cx"> if (ariaType == "ARIAApplicationAlert")
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx"> return WEB_UI_STRING("math", "An ARIA accessibility group that contains mathematical symbols.");
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><del>-#endif // PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> String missingPluginText()
</span><span class="cx"> {
</span><span class="lines">@@ -746,7 +746,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String builtInPDFPluginName()
</span><span class="cx"> {
</span><span class="cx"> // Also exposed to DOM.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> String fileButtonNoFilesSelectedLabel();
</span><span class="cx"> String defaultDetailsSummaryText();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String copyImageUnknownFileLabel();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> String contextMenuItemTagDefaultDirection();
</span><span class="cx"> String contextMenuItemTagLeftToRight();
</span><span class="cx"> String contextMenuItemTagRightToLeft();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String contextMenuItemTagSearchInSpotlight();
</span><span class="cx"> String contextMenuItemTagShowFonts();
</span><span class="cx"> String contextMenuItemTagStyles();
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> // technical standard 35, Locale Data Markup Language, e.g. "'Week' ww, yyyy"
</span><span class="cx"> String weekFormatInLDML();
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String AXARIAContentGroupText(const String& ariaType);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> String allFilesText();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String builtInPDFPluginName();
</span><span class="cx"> String pdfDocumentTypeDescription();
</span><span class="cx"> String postScriptDocumentTypeDescription();
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> String textTrackOffMenuItemText();
</span><span class="cx"> String textTrackAutomaticMenuItemText();
</span><span class="cx"> String textTrackNoLabelText();
</span><del>-#if PLATFORM(MAC) || PLATFORM(WIN)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(WIN)
</ins><span class="cx"> String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language);
</span><span class="cx"> String textTrackLanguageMenuItemText(const String& title, const String& language);
</span><span class="cx"> String closedCaptionTrackMenuItemText(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> supportedImageMIMETypesForEncoding = new HashSet<String>;
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFArrayRef> supportedTypes = adoptCF(CGImageDestinationCopyTypeIdentifiers());
</span><span class="cx"> CFIndex count = CFArrayGetCount(supportedTypes.get());
</span><span class="cx"> for (CFIndex i = 0; i < count; i++) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PasteboardStrategy.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PasteboardStrategy.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/PasteboardStrategy.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual URL readURLFromPasteboard(int index, const String& pasteboardType) = 0;
</span><span class="cx"> virtual long changeCount() = 0;
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void getTypes(Vector<String>& types, const String& pasteboardName) = 0;
</span><span class="cx"> virtual PassRefPtr<SharedBuffer> bufferForType(const String& pasteboardType, const String& pasteboardName) = 0;
</span><span class="cx"> virtual void getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -31,18 +31,14 @@
</span><span class="cx"> #include <wtf/WindowsExtras.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSEvent;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#ifdef __OBJC__
-@class WebEvent;
-#else
-class WebEvent;
</del><ins>+OBCJ_CLASS WebEvent;
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> typedef struct _GdkEventKey GdkEventKey;
</span><span class="lines">@@ -119,7 +115,7 @@
</span><span class="cx"> static bool currentCapsLockState();
</span><span class="cx"> static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> NSEvent* macEvent() const { return m_macEvent.get(); }
</span><span class="cx"> #else
</span><span class="lines">@@ -158,7 +154,7 @@
</span><span class="cx"> bool m_isKeypad;
</span><span class="cx"> bool m_isSystemKey;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> RetainPtr<NSEvent> m_macEvent;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformMenuDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformMenuDescription.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformMenuDescription.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/PlatformMenuDescription.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef PlatformMenuDescription_h
</span><span class="cx"> #define PlatformMenuDescription_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSMutableArray;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include <windows.h>
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> typedef NSMutableArray* PlatformMenuDescription;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef GtkMenu* PlatformMenuDescription;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformSpeechSynthesizerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS WebSpeechSynthesisWrapper;
</span><span class="cx"> #endif
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> bool m_voiceListIsInitialized;
</span><span class="cx"> PlatformSpeechSynthesizerClient* m_speechSynthesizerClient;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformWheelEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformWheelEvent.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformWheelEvent.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/PlatformWheelEvent.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> ScrollByPixelWheelEvent,
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> enum PlatformWheelEventPhase {
</span><span class="cx"> PlatformWheelEventPhaseNone = 0,
</span><span class="cx"> PlatformWheelEventPhaseBegan = 1 << 0,
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> , m_wheelTicksY(0)
</span><span class="cx"> , m_granularity(ScrollByPixelWheelEvent)
</span><span class="cx"> , m_directionInvertedFromDevice(false)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_hasPreciseScrollingDeltas(false)
</span><span class="cx"> , m_phase(PlatformWheelEventPhaseNone)
</span><span class="cx"> , m_momentumPhase(PlatformWheelEventPhaseNone)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> , m_wheelTicksY(wheelTicksY)
</span><span class="cx"> , m_granularity(granularity)
</span><span class="cx"> , m_directionInvertedFromDevice(false)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_hasPreciseScrollingDeltas(false)
</span><span class="cx"> , m_phase(PlatformWheelEventPhaseNone)
</span><span class="cx"> , m_momentumPhase(PlatformWheelEventPhaseNone)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> explicit PlatformWheelEvent(const Evas_Event_Mouse_Wheel*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
</span><span class="cx"> void setHasPreciseScrollingDeltas(bool b) { m_hasPreciseScrollingDeltas = b; }
</span><span class="cx"> PlatformWheelEventPhase phase() const { return m_phase; }
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> float m_wheelTicksY;
</span><span class="cx"> PlatformWheelEventGranularity m_granularity;
</span><span class="cx"> bool m_directionInvertedFromDevice;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool m_hasPreciseScrollingDeltas;
</span><span class="cx"> PlatformWheelEventPhase m_phase;
</span><span class="cx"> PlatformWheelEventPhase m_momentumPhase;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSchemeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SchemeRegistry.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SchemeRegistry.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/SchemeRegistry.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> if (localSchemes.isEmpty()) {
</span><span class="cx"> localSchemes.add("file");
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> localSchemes.add("applewebdata");
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (scheme == "file")
</span><span class="cx"> return;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (scheme == "applewebdata")
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx">
</span><span class="cx"> bool SchemeRegistry::shouldCacheResponsesFromURLSchemeIndefinitely(const String& scheme)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (equalIgnoringCase(scheme, "applewebdata"))
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Events in the PlatformWheelEventPhaseMayBegin phase have no deltas, and therefore never passes through the scroll handling logic below.
</span><span class="cx"> // This causes us to return with an 'unhandled' return state, even though this event was successfully processed.
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> virtual bool handleTouchEvent(const PlatformTouchEvent&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -1397,7 +1397,7 @@
</span><span class="cx"> updateScrollbars(scrollOffset());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> void ScrollView::platformAddChild(Widget*)
</span><span class="cx"> {
</span><span class="lines">@@ -1409,7 +1409,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> void ScrollView::platformSetScrollbarsSuppressed(bool)
</span><span class="cx"> {
</span><span class="lines">@@ -1425,7 +1425,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> void ScrollView::platformSetScrollbarModes()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/ScrollView.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && defined __OBJC__
</del><ins>+#if PLATFORM(COCOA) && defined __OBJC__
</ins><span class="cx"> @protocol WebCoreFrameScrollView;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> void calculateOverhangAreasForPainting(IntRect& horizontalOverhangRect, IntRect& verticalOverhangRect);
</span><span class="cx"> void updateOverhangAreas();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && defined __OBJC__
</del><ins>+#if PLATFORM(COCOA) && defined __OBJC__
</ins><span class="cx"> public:
</span><span class="cx"> NSView* documentView() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarThemeCompositeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollbarThemeComposite.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollbarThemeComposite.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/ScrollbarThemeComposite.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ScrollbarTheme.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> typedef id ScrollbarPainter;
</span><span class="cx"> #else
</span><span class="cx"> typedef void* ScrollbarPainter;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include "GUniquePtrSoup.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> OBJC_CLASS NSData;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> ~SharedBuffer();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> // FIXME: This class exists as a temporary workaround so that code that does:
</span><span class="cx"> // [buffer->createNSData() autorelease] will fail to compile.
</span><span class="cx"> // Once both Mac and iOS builds with this change we can change the return type to be RetainPtr<NSData>,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/URL.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include "GUniquePtrSoup.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> OBJC_CLASS NSURL;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> GUniquePtr<SoupURI> createSoupURI() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> URL(NSURL*);
</span><span class="cx"> operator NSURL*() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformWidgetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Widget.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Widget.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/Widget.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> return convertFromRootToContainingWindow(this, localPoint);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> IntRect Widget::convertFromRootToContainingWindow(const Widget*, const IntRect& rect)
</span><span class="cx"> {
</span><span class="cx"> return rect;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformWidgeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Widget.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Widget.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/Widget.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -38,11 +38,11 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSView;
</span><span class="cx"> OBJC_CLASS NSWindow;
</span><span class="cx"> typedef NSView *PlatformWidget;
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> // the frame rects be the same no matter what transforms are applied.
</span><span class="cx"> virtual bool transformsAffectFrameRect() { return true; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> NSView* getOuterView() const;
</span><span class="cx">
</span><span class="cx"> void removeFromSuperview();
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ScrollView* m_parent;
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> PlatformWidget m_widget;
</span><span class="cx"> #else
</span><span class="cx"> RetainPtr<NSView> m_widget;
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> #define WIDGET_TYPE_CASTS(ToValueTypeName, predicate) \
</span><span class="cx"> TYPE_CASTS_BASE(ToValueTypeName, Widget, object, object->predicate, object.predicate)
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> inline PlatformWidget Widget::platformWidget() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioAudioSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/AudioSession.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/AudioSession.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/audio/AudioSession.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> (*i)->endedAudioInterruption();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> class AudioSessionPrivate {
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><del>-#endif // !PLATFORM(IOS)
</del><ins>+#endif // !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioHRTFElevationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/HRTFElevation.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/HRTFElevation.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/audio/HRTFElevation.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> // The impulse responses may be resampled to a different sample-rate (depending on the audio hardware) when they are loaded.
</span><span class="cx"> const float ResponseSampleRate = 44100;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(WEBAUDIO_GSTREAMER)
</del><ins>+#if PLATFORM(COCOA) || USE(WEBAUDIO_GSTREAMER)
</ins><span class="cx"> #define USE_CONCATENATED_IMPULSE_RESPONSES
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void MediaSessionManager::updateSessionState()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSessionMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -164,4 +164,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // USE(AUDIO_SESSION) && PLATFORM(MAC)
</del><ins>+#endif // USE(AUDIO_SESSION) && PLATFORM(MAC) && !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacMediaSessionManagerMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MediaSessionManager.h"
</span><span class="cx">
</span><del>-#if USE(AUDIO_SESSION) && PLATFORM(MAC)
</del><ins>+#if USE(AUDIO_SESSION)
</ins><span class="cx">
</span><span class="cx"> #include "AudioSession.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> static const size_t kWebAudioBufferSize = 128;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) ||__MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> static const size_t kLowPowerVideoBufferSize = 4096;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -54,4 +54,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // USE(AUDIO_SESSION) && PLATFORM(MAC)
</del><ins>+#endif // USE(AUDIO_SESSION)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformcfSharedBufferCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// 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)
</del><ins>+// Using Foundation allows for an even more efficient implementation of this function,
+// so only use this version for non-Foundation.
+#if !USE(FOUNDATION)
</ins><span class="cx"> RetainPtr<CFDataRef> SharedBuffer::createCFData()
</span><span class="cx"> {
</span><span class="cx"> if (m_cfData) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfURLCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/URLCF.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/URLCF.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/cf/URLCF.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> parse(urlBytes.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !USE(FOUNDATION)
</ins><span class="cx"> RetainPtr<CFURLRef> URL::createCFURL() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: What should this return for invalid URLs?
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "ImageSource.h"
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(CG) || USE(APPKIT)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> virtual NSImage* getNSImage() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual CFDataRef getTIFFRepresentation() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> , m_unscheduledFireCount(0)
</span><span class="cx"> , m_displayID(displayID)
</span><span class="cx"> , m_clientsToBeNotified(nullptr)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_displayLink(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsDisplayRefreshMonitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> typedef struct __CVDisplayLink *CVDisplayLinkRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -136,12 +136,10 @@
</span><span class="cx"> operator CGPoint() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> FloatPoint(const NSPoint&);
</span><span class="cx"> operator NSPoint() const;
</span><span class="cx"> #endif
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> FloatPoint matrixTransform(const TransformationMatrix&) const;
</span><span class="cx"> FloatPoint matrixTransform(const AffineTransform&) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -171,12 +171,10 @@
</span><span class="cx"> operator CGRect() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> FloatRect(const NSRect&);
</span><span class="cx"> operator NSRect() const;
</span><span class="cx"> #endif
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> FloatRect(const cairo_rectangle_t&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -113,12 +113,10 @@
</span><span class="cx"> operator CGSize() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
</span><span class="cx"> operator NSSize() const;
</span><span class="cx"> #endif
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> void dump(PrintStream& out) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> return width(run);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> {
</span><span class="cx"> return glyphDataAndPageForCharacter(c, mirror, variant).first;
</span><span class="cx"> }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, size_t length, FontDataVariant) const;
</span><span class="cx"> #endif
</span><span class="cx"> std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32 c, bool mirror, FontDataVariant variant) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> if (familyIndex == familyCount)
</span><span class="cx"> familyIndex = cAllFamiliesScanned;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!result) {
</span><span class="cx"> // We didn't find a font. Try to find a similar font using our own specific knowledge about our platform.
</span><span class="cx"> // For example on OS X, we know to map any families containing the words Arabic, Pashto, or Urdu to the
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> PassRefPtr<SimpleFontData> getSystemFontFallbackForCharacters(const FontDescription&, const SimpleFontData*, const UChar* characters, int length);
</span><span class="cx"> #endif
</span><span class="cx"> PassOwnPtr<FontPlatformData> createFontPlatformData(const FontDescription&, const AtomicString& family);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> PassRefPtr<SimpleFontData> similarFontPlatformData(const FontDescription&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -194,14 +194,11 @@
</span><span class="cx"> // Don't purge if this count is > 0;
</span><span class="cx"> int m_purgePreventCount;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> friend class ComplexTextController;
</span><span class="cx"> #endif
</span><span class="cx"> friend class SimpleFontData; // For getCachedFontData(const FontPlatformData*)
</span><span class="cx"> friend class FontGlyphs;
</span><del>-#if PLATFORM(IOS)
- friend class ComplexTextController;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Get the global fontCache.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> variant = BrokenIdeographVariant;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> else if (data.fontData->platformData().syntheticOblique())
</span><span class="cx"> return glyphDataAndPageForCJKCharacterWithoutSyntheticItalic(c, data, page, pageNumber);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphPage.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphPage.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/GlyphPage.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> // Implemented by the platform.
</span><span class="cx"> bool fill(unsigned offset, unsigned length, UChar* characterBuffer, unsigned bufferLength, const SimpleFontData*);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static bool mayUseMixedFontDataWhenFilling(const UChar* characterBuffer, unsigned bufferLength, const SimpleFontData*);
</span><span class="cx"> #else
</span><span class="cx"> static bool mayUseMixedFontDataWhenFilling(const UChar*, unsigned, const SimpleFontData*) { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #undef VERSION
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include <OpenGLES/ES2/gl.h>
</span><span class="cx"> #ifdef __OBJC__
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> static PassRefPtr<GraphicsContext3D> createForCurrentGLContext();
</span><span class="cx"> ~GraphicsContext3D();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; }
</span><span class="cx"> Platform3DObject platformTexture() const { return m_compositorTexture; }
</span><span class="cx"> CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Image.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(APPKIT)
</ins><span class="cx"> OBJC_CLASS NSImage;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> virtual NSImage* getNSImage() { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual CFDataRef getTIFFRepresentation() { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -193,11 +193,9 @@
</span><span class="cx"> operator CGRect() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> operator NSRect() const;
</span><span class="cx"> #endif
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> void dump(PrintStream& out) const;
</span><span class="cx">
</span><span class="lines">@@ -250,11 +248,9 @@
</span><span class="cx"> IntRect enclosingIntRect(const CGRect&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES))
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> IntRect enclosingIntRect(const NSRect&);
</span><span class="cx"> #endif
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntSize.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -129,12 +129,10 @@
</span><span class="cx"> operator CGSize() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
</ins><span class="cx"> explicit IntSize(const NSSize &); // don't do this implicitly since it's lossy
</span><span class="cx"> operator NSSize() const;
</span><span class="cx"> #endif
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> IntSize(const SIZE&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "MediaPlayerPrivateIOS.h"
</span><span class="cx"> #else
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> if (Settings::isAVFoundationEnabled()) {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> MediaPlayerPrivateMediaSourceAVFObjC::registerMediaEngine(addMediaEngine);
</span><span class="lines">@@ -769,7 +769,7 @@
</span><span class="cx"> if (!engine)
</span><span class="cx"> return IsNotSupported;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // YouTube will ask if the HTMLMediaElement canPlayType video/webm, then
</span><span class="cx"> // video/x-flv, then finally video/mp4, and will then load a URL of the first type
</span><span class="cx"> // in that list which returns "probably". When Perian is installed,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSimpleFontDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> m_derivedFontData = DerivedFontData::create(isCustomFont());
</span><span class="cx"> if (!m_derivedFontData->nonSyntheticItalic) {
</span><span class="cx"> FontPlatformData nonSyntheticItalicFontPlatformData(m_platformData);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> nonSyntheticItalicFontPlatformData.m_syntheticOblique = false;
</span><span class="cx"> #endif
</span><span class="cx"> m_derivedFontData->nonSyntheticItalic = create(nonSyntheticItalicFontPlatformData, isCustomFont(), false, true);
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> GlyphPageTreeNode::pruneTreeCustomFontData(verticalRightOrientation.get());
</span><span class="cx"> if (uprightOrientation)
</span><span class="cx"> GlyphPageTreeNode::pruneTreeCustomFontData(uprightOrientation.get());
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (compositeFontReferences) {
</span><span class="cx"> CFDictionaryRef dictionary = CFDictionaryRef(compositeFontReferences.get());
</span><span class="cx"> CFIndex count = CFDictionaryGetCount(dictionary);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSimpleFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -40,11 +40,8 @@
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><del>-#endif
-
-#if PLATFORM(MAC)
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -189,11 +186,11 @@
</span><span class="cx"> CTFontRef getCTFont() const { return m_platformData.font(); }
</span><span class="cx"> bool shouldNotBeUsedForArabic() const { return m_shouldNotBeUsedForArabic; };
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(HARFBUZZ)
</del><ins>+#if PLATFORM(COCOA) || USE(HARFBUZZ)
</ins><span class="cx"> bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -287,7 +284,7 @@
</span><span class="cx"> RefPtr<SimpleFontData> verticalRightOrientation;
</span><span class="cx"> RefPtr<SimpleFontData> uprightOrientation;
</span><span class="cx"> RefPtr<SimpleFontData> nonSyntheticItalic;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -304,11 +301,11 @@
</span><span class="cx"> float m_syntheticBoldOffset;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> mutable HashMap<unsigned, RetainPtr<CFDictionaryRef>> m_CFStringAttributes;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(HARFBUZZ)
</del><ins>+#if PLATFORM(COCOA) || USE(HARFBUZZ)
</ins><span class="cx"> mutable OwnPtr<HashMap<String, bool>> m_combiningCharacterSequenceSupport;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> static const int defaultTileHeight = 512;
</span><span class="cx">
</span><span class="cx"> class IntRect;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> class PlatformCALayer;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> virtual IntRect tileGridExtent() const = 0;
</span><span class="cx"> virtual void setScrollingModeIndication(ScrollingModeIndication) = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual PlatformCALayer* tiledScrollingIndicatorLayer() = 0;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #include "WebCoreThread.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "PlatformCALayerMac.h"
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> bool GraphicsLayerCA::filtersCanBeComposited(const FilterOperations& filters)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return PlatformCALayerMac::filtersCanBeComposited(filters);
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> return PlatformCALayerWin::filtersCanBeComposited(filters);
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return PlatformCALayerMac::create(layerType, owner);
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> return PlatformCALayerWin::create(layerType, owner);
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformLayer* platformLayer, PlatformCALayerClient* owner)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return PlatformCALayerMac::create(platformLayer, owner);
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> return PlatformCALayerWin::create(platformLayer, owner);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaLayerFlushSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> bool m_isSuspended;
</span><span class="cx"> LayerFlushSchedulerClient* m_client;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFRunLoopObserverRef> m_runLoopObserver;
</span><span class="cx"> static void runLoopObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity, void* context);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCAAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS CAPropertyAnimation;
</span><span class="cx"> typedef CAPropertyAnimation* PlatformAnimationRef;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> class PlatformCAAnimation : public RefCounted<PlatformCAAnimation> {
</span><span class="cx"> public:
</span><span class="cx"> friend class PlatformCALayer;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> friend class PlatformCALayerMac;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> friend class PlatformCALayerWin;
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> private:
</span><span class="cx"> AnimationType m_type;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CAPropertyAnimation> m_animation;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> RetainPtr<CACFAnimationRef> m_animation;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCAFiltersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> static int numAnimatedFilterProperties(FilterOperation::OperationType);
</span><span class="cx"> static const char* animatedFilterPropertyName(FilterOperation::OperationType, int internalFilterPropertyIndex);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static RetainPtr<NSValue> filterValueForOperation(const FilterOperation*, int internalFilterPropertyIndex);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> typedef Vector<RefPtr<PlatformCALayer>> PlatformCALayerList;
</span><span class="cx">
</span><span class="cx"> class PlatformCALayer : public RefCounted<PlatformCALayer> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> friend class PlatformCALayerMac;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> friend class PlatformCALayerWin;
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<PlatformCALayer> createCompatibleLayer(LayerType, PlatformCALayerClient*) const = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual void enumerateRectsBeingDrawn(CGContextRef, void (^block)(CGRect)) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgBitmapImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include <CoreGraphics/CGContextPrivate.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1615,7 +1615,7 @@
</span><span class="cx"> void GraphicsContext::setAllowsFontSmoothing(bool allowsFontSmoothing)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(allowsFontSmoothing);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> CGContextRef context = platformContext();
</span><span class="cx"> CGContextSetAllowsFontSmoothing(context, allowsFontSmoothing);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextPlatformPrivateCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // These methods do nothing on Mac.
</span><span class="cx"> void save() {}
</span><span class="cx"> void restore() {}
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && USE(CA)
</del><ins>+#if PLATFORM(COCOA) && USE(CA)
</ins><span class="cx"> #if !PLATFORM(IOS_SIMULATOR)
</span><span class="cx"> #define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
</span><span class="cx"> #endif // !PLATFORM(IOS_SIMULATOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> bool ImageSource::s_acceleratedImageDecoding;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> size_t sharedBufferGetBytesAtPosition(void* info, void* buffer, off_t position, size_t count)
</span><span class="cx"> {
</span><span class="cx"> SharedBuffer* sharedBuffer = static_cast<SharedBuffer*>(info);
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!m_decoder)
</span><span class="cx"> m_decoder = CGImageSourceCreateIncremental(0);
</span><span class="cx"> // On Mac the NSData inside the SharedBuffer can be secretly appended to without the SharedBuffer's knowledge. We use SharedBuffer's ability
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageSourceCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> String MIMETypeForImageSourceType(const String& type);
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> size_t sharedBufferGetBytesAtPosition(void* info, void* buffer, off_t position, size_t count);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPathCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> void Path::platformAddPathForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool equalWidths = (topLeftRadius.width() == topRightRadius.width() && topRightRadius.width() == bottomLeftRadius.width() && bottomLeftRadius.width() == bottomRightRadius.width());
</span><span class="cx"> bool equalHeights = (topLeftRadius.height() == bottomLeftRadius.height() && bottomLeftRadius.height() == topRightRadius.height() && topRightRadius.height() == bottomRightRadius.height());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPatternCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgpuDrawingBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> // True if our contents have been modified since the last presentation of this buffer.
</span><span class="cx"> bool m_contentsChanged;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<WebGLLayer> m_platformLayer;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -432,10 +432,8 @@
</span><span class="cx"> m_qtMovieView = adoptNS([[QTMovieView alloc] init]);
</span><span class="cx"> setSize(m_player->size());
</span><span class="cx"> NSView* parentView = 0;
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> parentView = m_player->frameView()->documentView();
</span><span class="cx"> [parentView addSubview:m_qtMovieView.get()];
</span><del>-#endif
</del><span class="cx"> [m_qtMovieView.get() setDelegate:m_objcObserver.get()];
</span><span class="cx"> [m_objcObserver.get() setView:m_qtMovieView.get()];
</span><span class="cx"> [m_qtMovieView.get() setMovie:m_qtMovie.get()];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> return m_availableExtensions.contains("GL_EXT_texture_filter_anisotropic");
</span><span class="cx">
</span><span class="cx"> if (name == "GL_EXT_draw_buffers") {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> return m_availableExtensions.contains("GL_ARB_draw_buffers");
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: implement support for other platforms.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(mode);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacKeyEventMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/KeyEventMac.mm (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/KeyEventMac.mm 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/mac/KeyEventMac.mm 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "PlatformKeyboardEvent.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> #import "KeyEventCocoa.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="lines">@@ -78,4 +78,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(MAC) && !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformEventFactoryMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> static PlatformKeyboardEvent createPlatformKeyboardEvent(NSEvent *);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && defined(__OBJC__)
</del><ins>+#if PLATFORM(COCOA) && defined(__OBJC__)
</ins><span class="cx"> // FIXME: This doesn't really belong here.
</span><span class="cx"> IntPoint globalPoint(const NSPoint& windowPoint, NSWindow *);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> typedef UInt16 ATSGlyphRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && USE(CA)
</del><ins>+#if PLATFORM(COCOA) && USE(CA)
</ins><span class="cx"> #if !PLATFORM(IOS_SIMULATOR)
</span><span class="cx"> typedef struct __IOSurface *IOSurfaceRef;
</span><span class="cx"> #endif // !PLATFORM(IOS_SIMULATOR)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx">
</span><span class="cx"> extern CGSize (*wkCTRunGetInitialAdvance)(CTRunRef);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
</del><ins>+#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
</ins><span class="cx"> extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
</span><span class="cx"> extern CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
</span><span class="cx"> #endif
</span><span class="lines">@@ -280,10 +280,8 @@
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> extern NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
</span><span class="cx"> extern NSString *(*wkSpeechSynthesisGetDefaultVoiceIdentifierForLocale)(NSLocale *);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> extern void (*wkUnregisterUniqueIdForElement)(id element);
</span><span class="cx"> extern void (*wkAccessibilityHandleFocusChanged)(void);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -151,10 +151,8 @@
</span><span class="cx">
</span><span class="cx"> NSCursor *(*wkCursor)(const char*);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
</span><span class="cx"> NSString *(*wkSpeechSynthesisGetDefaultVoiceIdentifierForLocale)(NSLocale *);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void (*wkUnregisterUniqueIdForElement)(id element);
</span><span class="cx"> void (*wkAccessibilityHandleFocusChanged)(void);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/Credential.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/Credential.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/Credential.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#define CERTIFICATE_CREDENTIALS_SUPPORTED (PLATFORM(IOS) || PLATFORM(MAC))
</del><ins>+#define CERTIFICATE_CREDENTIALS_SUPPORTED (PLATFORM(COCOA))
</ins><span class="cx">
</span><span class="cx"> #if CERTIFICATE_CREDENTIALS_SUPPORTED
</span><span class="cx"> #include <Security/SecBase.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStateNotifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(EFL)
</del><ins>+#if !PLATFORM(COCOA) && !PLATFORM(WIN) && !PLATFORM(EFL)
</ins><span class="cx">
</span><span class="cx"> inline NetworkStateNotifier::NetworkStateNotifier()
</span><span class="cx"> : m_isOnLine(true)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStorageSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
</span><span class="cx"> typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
</span><span class="cx"> #endif
</span><span class="lines">@@ -47,11 +47,11 @@
</span><span class="cx">
</span><span class="cx"> static void switchToNewTestingSession();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</ins><span class="cx"> bool isPrivateBrowsingSession() const { return m_isPrivate; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> NetworkStorageSession(RetainPtr<CFURLStorageSessionRef>);
</span><span class="cx"> // May be null, in which case a Foundation default should be used.
</span><span class="cx"> CFURLStorageSessionRef platformSession() { return m_platformSession.get(); }
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> NetworkStorageSession();
</span><span class="cx"> RetainPtr<CFURLStorageSessionRef> m_platformSession;
</span><span class="cx"> #elif USE(SOUP)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> RefPtr<NetworkingContext> m_context;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</ins><span class="cx"> bool m_isPrivate;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkingContext.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkingContext.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/NetworkingContext.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -24,11 +24,11 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include <wtf/SchedulePair.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSOperationQueue;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> virtual bool needsSiteSpecificQuirks() const = 0;
</span><span class="cx"> virtual bool localFileContentSniffingEnabled() const = 0; // FIXME: Reconcile with ResourceHandle::forceContentSniffing().
</span><span class="cx"> virtual SchedulePairHashSet* scheduledRunLoopPairs() const { return 0; }
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> virtual ResourceError blockedError(const ResourceRequest&) const = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</ins><span class="cx"> virtual NetworkStorageSession& storageSession() const = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkProtectionSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ProtectionSpace.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ProtectionSpace.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/ProtectionSpace.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ProtectionSpace.h"
</span><span class="cx">
</span><del>-#if USE(CFNETWORK) && !PLATFORM(MAC)
</del><ins>+#if USE(CFNETWORK) && !PLATFORM(COCOA)
</ins><span class="cx"> #include "AuthenticationCF.h"
</span><span class="cx"> #include <CFNetwork/CFURLProtectionSpacePriv.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> bool ProtectionSpace::receivesCredentialSecurely() const
</span><span class="cx"> {
</span><del>-#if USE(CFNETWORK) && !PLATFORM(MAC)
</del><ins>+#if USE(CFNETWORK) && !PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFURLProtectionSpaceRef> cfSpace = adoptCF(createCF(*this));
</span><span class="cx"> return cfSpace && CFURLProtectionSpaceReceivesCredentialSecurely(cfSpace.get());
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> d->m_client = client;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
</del><ins>+#if !PLATFORM(COCOA) && !USE(CFNETWORK) && !USE(SOUP)
</ins><span class="cx"> // ResourceHandle never uses async client calls on these platforms yet.
</span><span class="cx"> void ResourceHandle::continueWillSendRequest(const ResourceRequest&)
</span><span class="cx"> {
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::clearAuthentication()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> d->m_currentMacChallenge = nil;
</span><span class="cx"> #endif
</span><span class="cx"> d->m_currentWebChallenge.nullify();
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> bool ResourceHandle::shouldContentSniffURL(const URL& url)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (shouldForceContentSniffing)
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -54,11 +54,11 @@
</span><span class="cx"> typedef LPVOID HINTERNET;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSCachedURLResponse;
</span><span class="cx"> OBJC_CLASS NSData;
</span><span class="cx"> OBJC_CLASS NSError;
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> template <typename T> class Timer;
</span><span class="cx">
</span><span class="cx"> class ResourceHandle : public RefCounted<ResourceHandle>
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
</ins><span class="cx"> , public AuthenticationClient
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -110,10 +110,10 @@
</span><span class="cx">
</span><span class="cx"> virtual ~ResourceHandle();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
</ins><span class="cx"> bool shouldUseCredentialStorage();
</span><span class="cx"> void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
</span><span class="cx"> virtual void receivedCredential(const AuthenticationChallenge&, const Credential&) override;
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> virtual void receivedCancellation(const AuthenticationChallenge&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> // Called in response to ResourceHandleClient::willCacheResponseAsync().
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> void continueWillCacheResponse(CFCachedURLResponseRef);
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> void continueWillCacheResponse(NSCachedURLResponse *);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> using RefCounted<ResourceHandle>::ref;
</span><span class="cx"> using RefCounted<ResourceHandle>::deref;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> static CFStringRef synchronousLoadRunLoopMode();
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS) && USE(CFNETWORK)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> virtual void refAuthenticationClient() override { ref(); }
</span><span class="cx"> virtual void derefAuthenticationClient() override { deref(); }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> enum class SchedulingBehavior {
</span><span class="cx"> Asynchronous,
</span><span class="cx"> Synchronous
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> {
</span><span class="cx"> handle->continueWillCacheResponse(response);
</span><span class="cx"> }
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> void ResourceHandleClient::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *response)
</span><span class="cx"> {
</span><span class="cx"> handle->continueWillCacheResponse(response);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSCachedURLResponse;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> // Client will pass an updated request using ResourceHandle::continueWillCacheResponse() when ready.
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> virtual void willCacheResponseAsync(ResourceHandle*, CFCachedURLResponseRef);
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> virtual void willCacheResponseAsync(ResourceHandle*, NSCachedURLResponse *);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) { return true; }
</span><span class="cx"> #endif // PLATFORM(WIN)
</span><span class="cx">
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; }
</span><span class="cx"> virtual void willStopBufferingData(ResourceHandle*, const char*, unsigned) { }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -55,12 +55,12 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSURLAuthenticationChallenge;
</span><span class="cx"> OBJC_CLASS NSURLConnection;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> , m_redirectCount(0)
</span><span class="cx"> , m_previousPosition(0)
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_startWhenScheduled(false)
</span><span class="cx"> , m_needsSiteSpecificQuirks(false)
</span><span class="cx"> , m_currentMacChallenge(nil)
</span><span class="lines">@@ -150,15 +150,15 @@
</span><span class="cx"> ResourceRequest m_currentRequest;
</span><span class="cx"> RefPtr<ResourceHandleCFURLConnectionDelegate> m_connectionDelegate;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) && !USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
</ins><span class="cx"> RetainPtr<NSURLConnection> m_connection;
</span><span class="cx"> RetainPtr<id> m_delegate;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool m_startWhenScheduled;
</span><span class="cx"> bool m_needsSiteSpecificQuirks;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> RetainPtr<CFURLStorageSessionRef> m_storageSession;
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(WININET)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> } m_credentialDataToSaveInPersistentStore;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // We need to keep a reference to the original challenge to be able to cancel it.
</span><span class="cx"> // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender.
</span><span class="cx"> NSURLAuthenticationChallenge *m_currentMacChallenge;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if !USE(SOUP) && (!PLATFORM(MAC) || USE(CFNETWORK))
</del><ins>+#if !USE(SOUP) && (!PLATFORM(COCOA) || USE(CFNETWORK))
</ins><span class="cx"> double ResourceRequestBase::s_defaultTimeoutInterval = INT_MAX;
</span><span class="cx"> #else
</span><span class="cx"> // Will use NSURLRequest default timeout unless set to a non-zero value with setDefaultTimeoutInterval().
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
</del><ins>+#if !PLATFORM(COCOA) && !USE(CFNETWORK) && !USE(SOUP)
</ins><span class="cx"> unsigned initializeMaximumHTTPConnectionCountPerHost()
</span><span class="cx"> {
</span><span class="cx"> // This is used by the loader to control the number of issued parallel load requests.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfAuthenticationCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> CFURLCredentialRef createCF(const Credential&);
</span><span class="cx"> CFURLProtectionSpaceRef createCF(const ProtectionSpace&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> AuthenticationChallenge core(CFURLAuthChallengeRef);
</span><span class="cx"> #endif
</span><span class="cx"> Credential core(CFURLCredentialRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieStorageCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "NetworkStorageSession.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include "LoaderRunLoopCF.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCredentialStorageCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "ProtectionSpace.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfFormDataStreamCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> #include <CoreServices/CoreServices.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> extern "C" void CFURLRequestSetHTTPRequestBody(CFMutableURLRequestRef mutableHTTPRequest, CFDataRef httpBody);
</span><span class="cx"> extern "C" void CFURLRequestSetHTTPHeaderFieldValue(CFMutableURLRequestRef mutableHTTPRequest, CFStringRef httpHeaderField, CFStringRef httpHeaderFieldValue);
</span><span class="cx"> extern "C" void CFURLRequestSetHTTPRequestBodyStream(CFMutableURLRequestRef req, CFReadStreamRef bodyStream);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #else
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Set a private session for testing to avoid interfering with global cookies. This should be different from private browsing session.
</span><span class="cx"> // 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>.
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR("Private WebKit Session")))));
</span><span class="cx"> #else
</span><span class="cx"> defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR("Private WebKit Session"), defaultNetworkStorageSession()->platformSession()))));
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFStringRef> cfIdentifier = String(identifierBase + ".PrivateBrowsing").createCFString();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> auto session = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(cfIdentifier.get())));
</span><span class="cx"> #else
</span><span class="cx"> auto session = std::make_unique<NetworkStorageSession>(adoptCF(wkCreatePrivateStorageSession(cfIdentifier.get(), defaultNetworkStorageSession()->platformSession())));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceError.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceError.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/ResourceError.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <wincrypt.h> // windows.h must be included before wincrypt.h.
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSError;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> operator CFStreamError() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ResourceError(NSError *);
</span><span class="cx"> NSError *nsError() const;
</span><span class="cx"> operator NSError *() const;
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> bool m_dataIsUpToDate;
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> mutable RetainPtr<CFErrorRef> m_platformError;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> mutable RetainPtr<NSError> m_platformNSError;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(WIN)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "ResourceHandleCFURLConnectionDelegateWithOperationQueue.h"
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> CFDictionaryAddValue(propertiesDictionary.get(), kCFURLConnectionSocketStreamProperties, streamProperties);
</span><span class="cx"> CFRelease(streamProperties);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (client() && client()->usesAsyncCallbacks())
</span><span class="cx"> d->m_connectionDelegate = adoptRef(new ResourceHandleCFURLConnectionDelegateWithOperationQueue(this));
</span><span class="cx"> else
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void ResourceHandle::schedule(SchedulePair* pair)
</span><span class="cx"> {
</span><span class="cx"> CFRunLoopRef runLoop = pair->runLoop();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFURLConnectionDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "NetworkingContext.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS NSURLRequest;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> typedef const struct _CFURLRequest* CFURLRequestRef;
</span><span class="cx"> typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
</span><span class="cx"> #endif
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ResourceRequest(NSURLRequest *);
</span><span class="cx"> void updateNSURLRequest();
</span><span class="cx"> #endif
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_cfRequest(cfRequest)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> updateNSURLRequest();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> void updateFromDelegatePreservingOldHTTPBody(const ResourceRequest&);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void applyWebArchiveHackForMail();
</span><span class="cx"> NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> void setCachePartition(const String& cachePartition) { m_cachePartition = partitionName(cachePartition); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> CFURLRequestRef cfURLRequest(HTTPBodyUpdatePolicy) const;
</span><span class="cx"> void setStorageSession(CFURLStorageSessionRef);
</span><span class="cx"> #endif
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> static bool httpPipeliningEnabled();
</span><span class="cx"> static void setHTTPPipeliningEnabled(bool);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static bool useQuickLookResourceCachingQuirks();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> RetainPtr<CFURLRequestRef> m_cfRequest;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<NSURLRequest> m_nsRequest;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "ResourceLoadPriority.h"
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #include <dlfcn.h>
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> {
</span><span class="cx"> return reinterpret_cast<CFURLRequestCopyContentDispositionEncodingFallbackArrayFunction>(GetProcAddress(findCFNetworkModule(), "_CFURLRequestCopyContentDispositionEncodingFallbackArray"));
</span><span class="cx"> }
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> static CFURLRequestSetContentDispositionEncodingFallbackArrayFunction findCFURLRequestSetContentDispositionEncodingFallbackArrayFunction()
</span><span class="cx"> {
</span><span class="cx"> return reinterpret_cast<CFURLRequestSetContentDispositionEncodingFallbackArrayFunction>(dlsym(RTLD_DEFAULT, "_CFURLRequestSetContentDispositionEncodingFallbackArray"));
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> updateNSURLRequest();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> updateNSURLRequest();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -332,12 +332,12 @@
</span><span class="cx"> CFMutableURLRequestRef cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
</span><span class="cx"> wkSetRequestStorageSession(storageSession, cfRequest);
</span><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> updateNSURLRequest();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void ResourceRequest::applyWebArchiveHackForMail()
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponse.h (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_isNull = !cfResponse;
</span><span class="cx"> }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ResourceResponse(NSURLResponse *);
</span><span class="cx"> #endif
</span><span class="cx"> #else
</span><span class="lines">@@ -88,11 +88,11 @@
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> CFURLResponseRef cfURLResponse() const;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> NSURLResponse *nsURLResponse() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> void setCertificateChain(CFArrayRef);
</span><span class="cx"> RetainPtr<CFArrayRef> certificateChain() const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> void platformLazyInit(InitLevel);
</span><span class="cx"> PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; }
</span><span class="cx"> void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void initNSURLResponse() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -117,10 +117,10 @@
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> mutable RetainPtr<CFURLResponseRef> m_cfResponse;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> mutable RetainPtr<NSURLResponse> m_nsResponse;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> // Certificate chain is normally part of NS/CFURLResponse, but there is no way to re-add it to a deserialized response after IPC.
</span><span class="cx"> RetainPtr<CFArrayRef> m_externalCertificateChain;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #include "WebCoreURLResponse.h"
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "WebCoreThread.h"
</span><span class="lines">@@ -102,14 +102,14 @@
</span><span class="cx"> return cfRequest;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> static void setDefaultMIMEType(CFURLResponseRef response)
</span><span class="cx"> {
</span><span class="cx"> static CFStringRef defaultMIMETypeString = defaultMIMEType().createCFString().leakRef();
</span><span class="cx">
</span><span class="cx"> CFURLResponseSetMIMEType(response, defaultMIMETypeString);
</span><span class="cx"> }
</span><del>-#endif // !PLATFORM(MAC)
</del><ins>+#endif // !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(CFURLResponseRef cfResponse)
</span><span class="cx"> {
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> if (!m_handle->client())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
</span><span class="cx"> CFHTTPMessageRef msg = wkGetCFURLResponseHTTPResponse(cfResponse);
</span><span class="cx"> int statusCode = msg ? CFHTTPMessageGetResponseStatusCode(msg) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">
</span><span class="cx"> #endif // USE(CFNETWORK)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx">
</span><span class="cx"> void ResourceResponse::setCertificateChain(CFArrayRef certificateChain)
</span><span class="cx"> {
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> return adoptCF(wkCopyNSURLResponseCertificateChain(nsURLResponse()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#endif // PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformposixFileSystemPOSIXcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
</ins><span class="cx"> String openTemporaryFile(const String& prefix, PlatformFileHandle& handle)
</span><span class="cx"> {
</span><span class="cx"> char buffer[PATH_MAX];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBoundariescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBoundaries.cpp (163656 => 163657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2014-02-07 23:26:25 UTC (rev 163656)
+++ trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2014-02-07 23:37:54 UTC (rev 163657)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
</span><span class="cx"> {
</span><span class="lines">@@ -104,6 +104,6 @@
</span><span class="cx"> *end = textBreakLast(it);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !PLATFORM(MAC)
</del><ins>+#endif // !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>