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