<!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>[179364] 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/179364">179364</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-29 13:57:04 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove more Mountain Lion code from WebCore
https://bugs.webkit.org/show_bug.cgi?id=141014
Reviewed by Anders Carlsson.
* WebCore.exp.in:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(AXAttributeStringSetSpelling):
(AXAttributedStringAppendText):
* crypto/CommonCryptoUtilities.h:
* crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
(WebCore::transformAES_CBC):
* editing/cocoa/HTMLConverter.mm:
(_dateForString):
* html/canvas/ANGLEInstancedArrays.cpp:
(WebCore::ANGLEInstancedArrays::supported):
* loader/cocoa/DiskCacheMonitorCocoa.mm:
* page/mac/SettingsMac.mm:
(WebCore::Settings::shouldEnableScreenFontSubstitutionByDefault):
(WebCore::Settings::initializeDefaultFontFamilies):
* platform/audio/mac/MediaSessionManagerMac.cpp:
(MediaSessionManager::updateSessionState):
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
(WebCore::MemoryPressureHandler::install):
(WebCore::MemoryPressureHandler::ReliefLogger::platformLog):
(WebCore::MemoryPressureHandler::ReliefLogger::platformMemoryUsage): Deleted.
* platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm:
(WebCore::AVTrackPrivateAVFObjCImpl::languageForAVMediaSelectionOption):
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoOutput):
* platform/graphics/cocoa/IOSurface.mm:
(IOSurface::state):
(IOSurface::isVolatile):
(IOSurface::setIsVolatile):
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::Font::platformInit):
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::drawArraysInstanced):
(WebCore::Extensions3DOpenGL::drawElementsInstanced):
(WebCore::Extensions3DOpenGL::vertexAttribDivisor):
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::createCFURLConnection):
* platform/network/cocoa/ProtectionSpaceCocoa.h:
(WebCore::ProtectionSpace::encodingRequiresPlatformData):
* platform/network/cocoa/ProtectionSpaceCocoa.mm:
(WebCore::ProtectionSpace::encodingRequiresPlatformData):
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::createNSURLConnection):
* platform/network/mac/WebCoreURLResponse.mm:
(WebCore::synthesizeRedirectResponseIfNecessary):
* platform/spi/cf/CFNetworkSPI.h:
* platform/text/mac/LocaleMac.mm:
(WebCore::LocaleMac::LocaleMac):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCorecryptoCommonCryptoUtilitiesh">trunk/Source/WebCore/crypto/CommonCryptoUtilities.h</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoAlgorithmAES_CBCMaccpp">trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasANGLEInstancedArrayscpp">trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm</a></li>
<li><a href="#trunkSourceWebCorepagemacSettingsMacmm">trunk/Source/WebCore/page/mac/SettingsMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacMediaSessionManagerMaccpp">trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationAVTrackPrivateAVFObjCImplmm">trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm">trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp</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="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaProtectionSpaceCocoah">trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaProtectionSpaceCocoamm">trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreURLResponsemm">trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextmacLocaleMacmm">trunk/Source/WebCore/platform/text/mac/LocaleMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/ChangeLog 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -1,3 +1,64 @@
</span><ins>+2015-01-28 Beth Dakin <bdakin@apple.com>
+
+ Remove more Mountain Lion code from WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=141014
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.exp.in:
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (AXAttributeStringSetSpelling):
+ (AXAttributedStringAppendText):
+ * crypto/CommonCryptoUtilities.h:
+ * crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
+ (WebCore::transformAES_CBC):
+ * editing/cocoa/HTMLConverter.mm:
+ (_dateForString):
+ * html/canvas/ANGLEInstancedArrays.cpp:
+ (WebCore::ANGLEInstancedArrays::supported):
+ * loader/cocoa/DiskCacheMonitorCocoa.mm:
+ * page/mac/SettingsMac.mm:
+ (WebCore::Settings::shouldEnableScreenFontSubstitutionByDefault):
+ (WebCore::Settings::initializeDefaultFontFamilies):
+ * platform/audio/mac/MediaSessionManagerMac.cpp:
+ (MediaSessionManager::updateSessionState):
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ (WebCore::MemoryPressureHandler::install):
+ (WebCore::MemoryPressureHandler::ReliefLogger::platformLog):
+ (WebCore::MemoryPressureHandler::ReliefLogger::platformMemoryUsage): Deleted.
+ * platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm:
+ (WebCore::AVTrackPrivateAVFObjCImpl::languageForAVMediaSelectionOption):
+ * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoOutput):
+ * platform/graphics/cocoa/IOSurface.mm:
+ (IOSurface::state):
+ (IOSurface::isVolatile):
+ (IOSurface::setIsVolatile):
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore::Font::platformInit):
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::drawArraysInstanced):
+ (WebCore::Extensions3DOpenGL::drawElementsInstanced):
+ (WebCore::Extensions3DOpenGL::vertexAttribDivisor):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::createCFURLConnection):
+ * platform/network/cocoa/ProtectionSpaceCocoa.h:
+ (WebCore::ProtectionSpace::encodingRequiresPlatformData):
+ * platform/network/cocoa/ProtectionSpaceCocoa.mm:
+ (WebCore::ProtectionSpace::encodingRequiresPlatformData):
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::createNSURLConnection):
+ * platform/network/mac/WebCoreURLResponse.mm:
+ (WebCore::synthesizeRedirectResponseIfNecessary):
+ * platform/spi/cf/CFNetworkSPI.h:
+ * platform/text/mac/LocaleMac.mm:
+ (WebCore::LocaleMac::LocaleMac):
+
</ins><span class="cx"> 2015-01-29 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove an extraneous check from the parser of :not()
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -635,6 +635,7 @@
</span><span class="cx"> __ZN7WebCore15PlatformCALayer17drawLayerContentsEP9CGContextPS0_RN3WTF6VectorINS_9FloatRectELm5ENS4_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore15PlatformCALayerC2ENS0_9LayerTypeEPNS_21PlatformCALayerClientE
</span><span class="cx"> __ZN7WebCore15PlatformCALayerD2Ev
</span><ins>+__ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace
</ins><span class="cx"> __ZN7WebCore15ProtectionSpaceC1EP20NSURLProtectionSpace
</span><span class="cx"> __ZN7WebCore15ResourceRequest21httpPipeliningEnabledEv
</span><span class="cx"> __ZN7WebCore15ResourceRequest24setHTTPPipeliningEnabledEb
</span><span class="lines">@@ -699,6 +700,7 @@
</span><span class="cx"> __ZN7WebCore16DeviceMotionData12Acceleration6createEbdbdbd
</span><span class="cx"> __ZN7WebCore16DeviceMotionData12RotationRate6createEbdbdbd
</span><span class="cx"> __ZN7WebCore16DeviceMotionData6createEN3WTF10PassRefPtrINS0_12AccelerationEEES4_NS2_INS0_12RotationRateEEEbd
</span><ins>+__ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse
</ins><span class="cx"> __ZN7WebCore16FilterOperationsC1Ev
</span><span class="cx"> __ZN7WebCore16FilterOperationsaSERKS0_
</span><span class="cx"> __ZN7WebCore16FloatRoundedRectC1ERKNS_9FloatRectERKNS0_5RadiiE
</span><span class="lines">@@ -1066,6 +1068,7 @@
</span><span class="cx"> __ZN7WebCore23getFileModificationTimeERKN3WTF6StringERl
</span><span class="cx"> __ZN7WebCore23getHostnamesWithCookiesERKNS_21NetworkStorageSessionERN3WTF7HashSetINS3_6StringENS3_10StringHashENS3_10HashTraitsIS5_EEEE
</span><span class="cx"> __ZN7WebCore23toCAMediaTimingFunctionEPKNS_14TimingFunctionEb
</span><ins>+__ZN7WebCore23wrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
</ins><span class="cx"> __ZN7WebCore24CachedResourceHandleBase11setResourceEPNS_14CachedResourceE
</span><span class="cx"> __ZN7WebCore24DocumentMarkerController10markersForEPNS_4NodeENS_14DocumentMarker11MarkerTypesE
</span><span class="cx"> __ZN7WebCore24DocumentMarkerController13removeMarkersENS_14DocumentMarker11MarkerTypesE
</span><span class="lines">@@ -1093,6 +1096,7 @@
</span><span class="cx"> __ZN7WebCore25createCanonicalUUIDStringEv
</span><span class="cx"> __ZN7WebCore25directionOfEnclosingBlockERKNS_8PositionE
</span><span class="cx"> __ZN7WebCore25getOutOfLineCachedWrapperEPNS_17JSDOMGlobalObjectEPNS_4NodeE
</span><ins>+__ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
</ins><span class="cx"> __ZN7WebCore25updateRedirectChainStatusERNS_24RedirectChainCacheStatusERKNS_16ResourceResponseE
</span><span class="cx"> __ZN7WebCore26ContextDestructionObserver16contextDestroyedEv
</span><span class="cx"> __ZN7WebCore26ContextDestructionObserverC2EPNS_22ScriptExecutionContextE
</span><span class="lines">@@ -1148,6 +1152,7 @@
</span><span class="cx"> __ZN7WebCore28UserMessageHandlerDescriptorC1ERKN3WTF12AtomicStringERNS_15DOMWrapperWorldERNS0_6ClientE
</span><span class="cx"> __ZN7WebCore28UserMessageHandlerDescriptorD1Ev
</span><span class="cx"> __ZN7WebCore28encodeWithURLEscapeSequencesERKN3WTF6StringE
</span><ins>+__ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEE
</ins><span class="cx"> __ZN7WebCore28removeLanguageChangeObserverEPv
</span><span class="cx"> __ZN7WebCore28throwArgumentMustBeEnumErrorERN3JSC9ExecStateEjPKcS4_S4_S4_
</span><span class="cx"> __ZN7WebCore29cookieRequestHeaderFieldValueERKNS_21NetworkStorageSessionERKNS_3URLES5_
</span><span class="lines">@@ -2178,6 +2183,7 @@
</span><span class="cx"> __ZTVN7WebCore15PlatformCALayerE
</span><span class="cx"> __ZTVN7WebCore16BlobRegistryImplE
</span><span class="cx"> __ZTVN7WebCore16DatabaseProviderE
</span><ins>+__ZTVN7WebCore16DiskCacheMonitorE
</ins><span class="cx"> __ZTVN7WebCore16IconDatabaseBaseE
</span><span class="cx"> __ZTVN7WebCore17FrameLoaderClientE
</span><span class="cx"> __ZTVN7WebCore17PageConsoleClientE
</span><span class="lines">@@ -2504,6 +2510,7 @@
</span><span class="cx"> _wkCreateAXUIElementRef
</span><span class="cx"> _wkCreateMediaUIBackgroundView
</span><span class="cx"> _wkCreateMediaUIControl
</span><ins>+_wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
</ins><span class="cx"> _wkCreateURLNPasteboardFlavorTypeName
</span><span class="cx"> _wkCreateURLPasteboardFlavorTypeName
</span><span class="cx"> _wkCreateVMPressureDispatchOnMainQueue
</span><span class="lines">@@ -2568,10 +2575,6 @@
</span><span class="cx"> __ZN7WebCore44registerInsertionUndoGroupingWithUndoManagerEP13NSUndoManager
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-_wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> .objc_class_name_NSCursor
</span><span class="cx"> .objc_class_name_WAKClipView
</span><span class="lines">@@ -2928,15 +2931,6 @@
</span><span class="cx"> __ZN7WebCore20ResourceHandleClient22willCacheResponseAsyncEPNS_14ResourceHandleEPK20_CFCachedURLResponse
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-__ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace
-__ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse
-__ZN7WebCore23wrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
-__ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
-__ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEE
-__ZTVN7WebCore16DiskCacheMonitorE
-#endif
-
</del><span class="cx"> #if ENABLE(3D_RENDERING)
</span><span class="cx"> _WebCoreHas3DRendering
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -934,7 +934,7 @@
</span><span class="cx"> for (unsigned i = 0; i < size; i++) {
</span><span class="cx"> const TextCheckingResult& result = results[i];
</span><span class="cx"> AXAttributeStringSetNumber(attrString, NSAccessibilityMisspelledTextAttribute, trueValue, NSMakeRange(result.location + range.location, result.length));
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> AXAttributeStringSetNumber(attrString, NSAccessibilityMarkedMisspelledTextAttribute, trueValue, NSMakeRange(result.location + range.location, result.length));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx">
</span><span class="cx"> NSRange spellRange = NSMakeRange(range.location + currentPosition + misspellingLocation, misspellingLength);
</span><span class="cx"> AXAttributeStringSetNumber(attrString, NSAccessibilityMisspelledTextAttribute, [NSNumber numberWithBool:YES], spellRange);
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> AXAttributeStringSetNumber(attrString, NSAccessibilityMarkedMisspelledTextAttribute, [NSNumber numberWithBool:YES], spellRange);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1038,7 +1038,7 @@
</span><span class="cx">
</span><span class="cx"> // remove inherited attachment from prior AXAttributedStringAppendReplaced
</span><span class="cx"> [attrString removeAttribute:NSAccessibilityAttachmentTextAttribute range:attrStringRange];
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> [attrString removeAttribute:NSAccessibilityMarkedMisspelledTextAttribute range:attrStringRange];
</span><span class="cx"> #endif
</span><span class="cx"> [attrString removeAttribute:NSAccessibilityMisspelledTextAttribute range:attrStringRange];
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCommonCryptoUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CommonCryptoUtilities.h (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CommonCryptoUtilities.h 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/crypto/CommonCryptoUtilities.h 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if defined(__has_include) && PLATFORM(COCOA)
</ins><span class="cx"> #if __has_include(<CommonCrypto/CommonRandomSPI.h>)
</span><span class="cx"> #include <CommonCrypto/CommonRandomSPI.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoAlgorithmAES_CBCMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CCCryptorRef cryptor;
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> CCAlgorithm aesAlgorithm = kCCAlgorithmAES;
</span><span class="cx"> #else
</span><span class="cx"> CCAlgorithm aesAlgorithm = kCCAlgorithmAES128;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -1722,13 +1722,7 @@
</span><span class="cx"> return nil;
</span><span class="cx"> [dateComponents setSecond:component];
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
- NSString *calendarIdentifier = NSCalendarIdentifierGregorian;
-#else
- NSString *calendarIdentifier = NSGregorianCalendar;
-#endif
-
- return [[[[NSCalendar alloc] initWithCalendarIdentifier:calendarIdentifier] autorelease] dateFromComponents:dateComponents.get()];
</del><ins>+ return [[[[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian] autorelease] dateFromComponents:dateComponents.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSInteger _colCompare(id block1, id block2, void *)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasANGLEInstancedArrayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> bool ANGLEInstancedArrays::supported(WebGLRenderingContextBase* context)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> return true;
</span><span class="cx"> #elif PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> #include "WebCoreThreadRun.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // The maximum number of seconds we'll try to wait for a resource to be disk cached before we forget the request.
</span><span class="lines">@@ -123,5 +121,3 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del></span></pre></div>
<a id="trunkSourceWebCorepagemacSettingsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/SettingsMac.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> bool Settings::shouldEnableScreenFontSubstitutionByDefault()
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> return false;
</span><span class="cx"> #else
</span><span class="cx"> return true;
</span><span class="lines">@@ -40,14 +40,9 @@
</span><span class="cx"> void Settings::initializeDefaultFontFamilies()
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> setStandardFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
</span><span class="cx"> setSerifFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
</span><span class="cx"> #else
</span><del>- setStandardFontFamily("Apple LiSung", USCRIPT_TRADITIONAL_HAN);
- setSerifFontFamily("Apple LiSung", USCRIPT_TRADITIONAL_HAN);
-#endif
-#else
</del><span class="cx"> // There is no serif Chinese font in default iOS installation.
</span><span class="cx"> setStandardFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
</span><span class="cx"> setSerifFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
</span><span class="lines">@@ -56,14 +51,9 @@
</span><span class="cx"> setSansSerifFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> setStandardFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
</span><span class="cx"> setSerifFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
</span><span class="cx"> #else
</span><del>- setStandardFontFamily("STSong", USCRIPT_SIMPLIFIED_HAN);
- setSerifFontFamily("STSong", USCRIPT_SIMPLIFIED_HAN);
-#endif
-#else
</del><span class="cx"> // There is no serif Chinese font in default iOS installation.
</span><span class="cx"> setStandardFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
</span><span class="cx"> setSerifFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacMediaSessionManagerMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -35,10 +35,7 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> static const size_t kWebAudioBufferSize = 128;
</span><del>-
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> static const size_t kLowPowerVideoBufferSize = 4096;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void MediaSessionManager::updateSessionState()
</span><span class="cx"> {
</span><span class="lines">@@ -46,7 +43,6 @@
</span><span class="cx">
</span><span class="cx"> if (has(MediaSession::WebAudio))
</span><span class="cx"> AudioSession::sharedSession().setPreferredBufferSize(kWebAudioBufferSize);
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> else if ((has(MediaSession::Video) || has(MediaSession::Audio)) && Settings::lowPowerVideoAudioBufferSizeEnabled()) {
</span><span class="cx"> // FIXME: <http://webkit.org/b/116725> Figure out why enabling the code below
</span><span class="cx"> // causes media LayoutTests to fail on 10.8.
</span><span class="lines">@@ -59,7 +55,6 @@
</span><span class="cx">
</span><span class="cx"> AudioSession::sharedSession().setPreferredBufferSize(bufferSize);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (activeAudioSessionRequired())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</span><span class="cx"> _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL | DISPATCH_MEMORYSTATUS_PRESSURE_WARN | DISPATCH_MEMORYSTATUS_PRESSURE_CRITICAL, dispatch_get_main_queue());
</span><del>-#elif PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#elif PLATFORM(MAC)
</ins><span class="cx"> _cache_event_source = wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue();
</span><span class="cx"> #else
</span><span class="cx"> _cache_event_source = wkCreateVMPressureDispatchOnMainQueue();
</span><span class="lines">@@ -189,7 +189,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><span class="cx"> size_t MemoryPressureHandler::ReliefLogger::platformMemoryUsage()
</span><span class="cx"> {
</span><span class="cx"> // Flush free memory back to the OS before every measurement.
</span><span class="lines">@@ -222,10 +221,6 @@
</span><span class="cx"> else
</span><span class="cx"> NSLog(@"Pressure relief: %s: =dirty (at %ld bytes)\n", m_logString, currentMemory);
</span><span class="cx"> }
</span><del>-#else
-void MemoryPressureHandler::ReliefLogger::platformLog() { }
-size_t MemoryPressureHandler::ReliefLogger::platformMemoryUsage() { return 0; }
-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static void respondToMemoryPressureCallback(CFRunLoopObserverRef observer, CFRunLoopActivity /*activity*/, void* /*info*/)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationAVTrackPrivateAVFObjCImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -234,11 +234,7 @@
</span><span class="cx">
</span><span class="cx"> String AVTrackPrivateAVFObjCImpl::languageForAVMediaSelectionOption(AVMediaSelectionOption* option)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> NSString *language = [option extendedLanguageTag];
</span><del>-#else
- NSString *language = nil;
-#endif
</del><span class="cx">
</span><span class="cx"> // If the language code is stored as a QuickTime 5-bit packed code there aren't enough bits for a full
</span><span class="cx"> // RFC 4646 language tag so extendedLanguageTag returns NULL. In this case languageCode will return the
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx">
</span><span class="cx"> OBJC_CLASS AVAssetResourceLoadingRequest;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CDMSessionAVFoundationObjC.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx">
</span><span class="cx"> #import "CDM.h"
</span><span class="cx"> #import "CDMSession.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx"> if (!m_videoLayer)
</span><span class="cx"> createAVPlayerLayer();
</span><span class="cx">
</span><del>-#if USE(VIDEOTOOLBOX) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if USE(VIDEOTOOLBOX)
</ins><span class="cx"> if (!m_videoOutput)
</span><span class="cx"> createVideoOutput();
</span><span class="cx"> #endif
</span><span class="lines">@@ -2011,12 +2011,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if USE(VIDEOTOOLBOX)
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> NSDictionary* attributes = nil;
</span><span class="cx"> #else
</span><del>- NSDictionary* attributes = @{ (NSString*)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_422YpCbCr8) };
-#endif
-#else
</del><span class="cx"> NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:kCVPixelFormatType_32BGRA], kCVPixelBufferPixelFormatTypeKey,
</span><span class="cx"> nil];
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -153,40 +153,28 @@
</span><span class="cx">
</span><span class="cx"> IOSurface::SurfaceState IOSurface::state() const
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> uint32_t previousState = 0;
</span><span class="cx"> IOReturn ret = IOSurfaceSetPurgeable(m_surface.get(), kIOSurfacePurgeableKeepCurrent, &previousState);
</span><span class="cx"> ASSERT_UNUSED(ret, ret == kIOReturnSuccess);
</span><span class="cx"> return previousState == kIOSurfacePurgeableEmpty ? IOSurface::SurfaceState::Empty : IOSurface::SurfaceState::Valid;
</span><del>-#else
- return SurfaceState::Valid;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool IOSurface::isVolatile() const
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> uint32_t previousState = 0;
</span><span class="cx"> IOReturn ret = IOSurfaceSetPurgeable(m_surface.get(), kIOSurfacePurgeableKeepCurrent, &previousState);
</span><span class="cx"> ASSERT_UNUSED(ret, ret == kIOReturnSuccess);
</span><span class="cx"> return previousState != kIOSurfacePurgeableNonVolatile;
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IOSurface::SurfaceState IOSurface::setIsVolatile(bool isVolatile)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> uint32_t previousState = 0;
</span><span class="cx"> IOReturn ret = IOSurfaceSetPurgeable(m_surface.get(), isVolatile ? kIOSurfacePurgeableVolatile : kIOSurfacePurgeableNonVolatile, &previousState);
</span><span class="cx"> ASSERT_UNUSED(ret, ret == kIOReturnSuccess);
</span><span class="cx">
</span><span class="cx"> if (previousState == kIOSurfacePurgeableEmpty)
</span><span class="cx"> return IOSurface::SurfaceState::Empty;
</span><del>-#else
- UNUSED_PARAM(isVolatile);
-#endif
</del><span class="cx">
</span><span class="cx"> return IOSurface::SurfaceState::Valid;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> initFontData(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> // Work around <rdar://problem/19433490>
</span><span class="cx"> CGGlyph dummyGlyphs[] = {0, 0};
</span><span class="cx"> CGSize dummySize[] = {CGSizeMake(0, 0), CGSizeMake(0, 0)};
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> m_context->makeContextCurrent();
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> ::glDrawArraysInstanced(mode, first, count, primcount);
</span><del>-#elif PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> ::glDrawArraysInstancedARB(mode, first, count, primcount);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(mode);
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> m_context->makeContextCurrent();
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> ::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
</span><del>-#elif PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> ::glDrawElementsInstancedARB(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(mode);
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> m_context->makeContextCurrent();
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> ::glVertexAttribDivisor(index, divisor);
</span><del>-#elif PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> ::glVertexAttribDivisorARB(index, divisor);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(index);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> extern dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> extern dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> CFDictionarySetValue(streamProperties, CFSTR("_WebKitSynchronousRequest"), kCFBooleanTrue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<CFDataRef> sourceApplicationAuditData = d->m_context->sourceApplicationAuditData();
</span><span class="cx"> if (sourceApplicationAuditData)
</span><span class="cx"> CFDictionarySetValue(streamProperties, CFSTR("kCFStreamPropertySourceApplication"), sourceApplicationAuditData.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaProtectionSpaceCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.h (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.h 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.h 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -54,9 +54,7 @@
</span><span class="cx">
</span><span class="cx"> static bool platformCompare(const ProtectionSpace& a, const ProtectionSpace& b);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> WEBCORE_EXPORT bool encodingRequiresPlatformData() const { return m_nsSpace && encodingRequiresPlatformData(m_nsSpace.get()); }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool receivesCredentialSecurely() const;
</span><span class="cx">
</span><span class="lines">@@ -66,9 +64,7 @@
</span><span class="cx"> WEBCORE_EXPORT NSURLProtectionSpace *nsSpace() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> WEBCORE_EXPORT static bool encodingRequiresPlatformData(NSURLProtectionSpace *);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> mutable RetainPtr<NSURLProtectionSpace> m_nsSpace;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaProtectionSpaceCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -200,11 +200,9 @@
</span><span class="cx"> return nsSpace().receivesCredentialSecurely;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> bool ProtectionSpace::encodingRequiresPlatformData(NSURLProtectionSpace *space)
</span><span class="cx"> {
</span><span class="cx"> return space.distinguishedNames || space.serverTrust;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -206,11 +206,9 @@
</span><span class="cx"> [streamProperties setObject:@TRUE forKey:@"_WebKitSynchronousRequest"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> RetainPtr<CFDataRef> sourceApplicationAuditData = d->m_context->sourceApplicationAuditData();
</span><span class="cx"> if (sourceApplicationAuditData)
</span><span class="cx"> [streamProperties setObject:(NSData *)sourceApplicationAuditData.get() forKey:@"kCFStreamPropertySourceApplication"];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> NSMutableDictionary *propertyDictionary = [NSMutableDictionary dictionaryWithDictionary:connectionProperties];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreURLResponsemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -328,7 +328,6 @@
</span><span class="cx"> #if !USE(CFNETWORK)
</span><span class="cx"> NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLConnection *connection, NSURLRequest *newRequest, NSURLResponse *redirectResponse)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> if (redirectResponse)
</span><span class="cx"> return redirectResponse;
</span><span class="cx">
</span><span class="lines">@@ -339,11 +338,6 @@
</span><span class="cx"> // This is critical for HSTS (<rdar://problem/14241270>).
</span><span class="cx"> NSDictionary *synthesizedResponseHeaderFields = @{ @"Location": [[newRequest URL] absoluteString], @"Cache-Control": @"no-store" };
</span><span class="cx"> return [[[NSHTTPURLResponse alloc] initWithURL:[[connection currentRequest] URL] statusCode:302 HTTPVersion:(NSString *)kCFHTTPVersion1_1 headerFields:synthesizedResponseHeaderFields] autorelease];
</span><del>-#else
- UNUSED_PARAM(connection);
- UNUSED_PARAM(newRequest);
- return redirectResponse;
-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> EXTERN_C CFURLCacheRef CFURLCacheCopySharedURLCache();
</span><span class="cx"> EXTERN_C void CFURLCacheSetMemoryCapacity(CFURLCacheRef, CFIndex memoryCapacity);
</span><span class="cx"> EXTERN_C void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> EXTERN_C CFBooleanRef _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
</span><span class="cx"> EXTERN_C void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
</span><span class="cx">
</span><span class="lines">@@ -78,12 +78,12 @@
</span><span class="cx">
</span><span class="cx"> EXTERN_C void CFHTTPCookieStorageDeleteAllCookies(CFHTTPCookieStorageRef);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> EXTERN_C CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
</span><span class="cx"> #ifdef __BLOCKS__
</span><span class="cx"> EXTERN_C void _CFCachedURLResponseSetBecameFileBackedCallBackBlock(CFCachedURLResponseRef, CFCachedURLResponseCallBackBlock, dispatch_queue_t);
</span><span class="cx"> #endif
</span><del>-#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> EXTERN_C void CFURLConnectionInvalidateConnectionCache();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextmacLocaleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/mac/LocaleMac.mm (179363 => 179364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/mac/LocaleMac.mm 2015-01-29 21:43:35 UTC (rev 179363)
+++ trunk/Source/WebCore/platform/text/mac/LocaleMac.mm 2015-01-29 21:57:04 UTC (rev 179364)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> LocaleMac::LocaleMac(NSLocale* locale)
</span><span class="cx"> : m_locale(locale)
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || PLATFORM(MAC)
</ins><span class="cx"> , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]))
</span><span class="cx"> #else
</span><span class="cx"> , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]))
</span></span></pre>
</div>
</div>
</body>
</html>