Changeset 179364 in webkit


Ignore:
Timestamp:
Jan 29, 2015 1:57:04 PM (9 years ago)
Author:
Beth Dakin
Message:

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):

Location:
trunk/Source/WebCore
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r179362 r179364  
     12015-01-28  Beth Dakin  <bdakin@apple.com>
     2
     3        Remove more Mountain Lion code from WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=141014
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebCore.exp.in:
     9        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     10        (AXAttributeStringSetSpelling):
     11        (AXAttributedStringAppendText):
     12        * crypto/CommonCryptoUtilities.h:
     13        * crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
     14        (WebCore::transformAES_CBC):
     15        * editing/cocoa/HTMLConverter.mm:
     16        (_dateForString):
     17        * html/canvas/ANGLEInstancedArrays.cpp:
     18        (WebCore::ANGLEInstancedArrays::supported):
     19        * loader/cocoa/DiskCacheMonitorCocoa.mm:
     20        * page/mac/SettingsMac.mm:
     21        (WebCore::Settings::shouldEnableScreenFontSubstitutionByDefault):
     22        (WebCore::Settings::initializeDefaultFontFamilies):
     23        * platform/audio/mac/MediaSessionManagerMac.cpp:
     24        (MediaSessionManager::updateSessionState):
     25        * platform/cocoa/MemoryPressureHandlerCocoa.mm:
     26        (WebCore::MemoryPressureHandler::install):
     27        (WebCore::MemoryPressureHandler::ReliefLogger::platformLog):
     28        (WebCore::MemoryPressureHandler::ReliefLogger::platformMemoryUsage): Deleted.
     29        * platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm:
     30        (WebCore::AVTrackPrivateAVFObjCImpl::languageForAVMediaSelectionOption):
     31        * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
     32        * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
     33        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     34        (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
     35        (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoOutput):
     36        * platform/graphics/cocoa/IOSurface.mm:
     37        (IOSurface::state):
     38        (IOSurface::isVolatile):
     39        (IOSurface::setIsVolatile):
     40        * platform/graphics/mac/SimpleFontDataMac.mm:
     41        (WebCore::Font::platformInit):
     42        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
     43        (WebCore::Extensions3DOpenGL::drawArraysInstanced):
     44        (WebCore::Extensions3DOpenGL::drawElementsInstanced):
     45        (WebCore::Extensions3DOpenGL::vertexAttribDivisor):
     46        * platform/mac/WebCoreSystemInterface.h:
     47        * platform/mac/WebCoreSystemInterface.mm:
     48        * platform/network/cf/ResourceHandleCFNet.cpp:
     49        (WebCore::ResourceHandle::createCFURLConnection):
     50        * platform/network/cocoa/ProtectionSpaceCocoa.h:
     51        (WebCore::ProtectionSpace::encodingRequiresPlatformData):
     52        * platform/network/cocoa/ProtectionSpaceCocoa.mm:
     53        (WebCore::ProtectionSpace::encodingRequiresPlatformData):
     54        * platform/network/mac/ResourceHandleMac.mm:
     55        (WebCore::ResourceHandle::createNSURLConnection):
     56        * platform/network/mac/WebCoreURLResponse.mm:
     57        (WebCore::synthesizeRedirectResponseIfNecessary):
     58        * platform/spi/cf/CFNetworkSPI.h:
     59        * platform/text/mac/LocaleMac.mm:
     60        (WebCore::LocaleMac::LocaleMac):
     61
    1622015-01-29  Benjamin Poulain  <bpoulain@apple.com>
    263

  • trunk/Source/WebCore/WebCore.exp.in

    r179347 r179364  
    636636__ZN7WebCore15PlatformCALayerC2ENS0_9LayerTypeEPNS_21PlatformCALayerClientE
    637637__ZN7WebCore15PlatformCALayerD2Ev
     638__ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace
    638639__ZN7WebCore15ProtectionSpaceC1EP20NSURLProtectionSpace
    639640__ZN7WebCore15ResourceRequest21httpPipeliningEnabledEv
    … …  
    700701__ZN7WebCore16DeviceMotionData12RotationRate6createEbdbdbd
    701702__ZN7WebCore16DeviceMotionData6createEN3WTF10PassRefPtrINS0_12AccelerationEEES4_NS2_INS0_12RotationRateEEEbd
     703__ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse
    702704__ZN7WebCore16FilterOperationsC1Ev
    703705__ZN7WebCore16FilterOperationsaSERKS0_
    … …  
    10671069__ZN7WebCore23getHostnamesWithCookiesERKNS_21NetworkStorageSessionERN3WTF7HashSetINS3_6StringENS3_10StringHashENS3_10HashTraitsIS5_EEEE
    10681070__ZN7WebCore23toCAMediaTimingFunctionEPKNS_14TimingFunctionEb
     1071__ZN7WebCore23wrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
    10691072__ZN7WebCore24CachedResourceHandleBase11setResourceEPNS_14CachedResourceE
    10701073__ZN7WebCore24DocumentMarkerController10markersForEPNS_4NodeENS_14DocumentMarker11MarkerTypesE
    … …  
    10941097__ZN7WebCore25directionOfEnclosingBlockERKNS_8PositionE
    10951098__ZN7WebCore25getOutOfLineCachedWrapperEPNS_17JSDOMGlobalObjectEPNS_4NodeE
     1099__ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
    10961100__ZN7WebCore25updateRedirectChainStatusERNS_24RedirectChainCacheStatusERKNS_16ResourceResponseE
    10971101__ZN7WebCore26ContextDestructionObserver16contextDestroyedEv
    … …  
    11491153__ZN7WebCore28UserMessageHandlerDescriptorD1Ev
    11501154__ZN7WebCore28encodeWithURLEscapeSequencesERKN3WTF6StringE
     1155__ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEE
    11511156__ZN7WebCore28removeLanguageChangeObserverEPv
    11521157__ZN7WebCore28throwArgumentMustBeEnumErrorERN3JSC9ExecStateEjPKcS4_S4_S4_
    … …  
    21792184__ZTVN7WebCore16BlobRegistryImplE
    21802185__ZTVN7WebCore16DatabaseProviderE
     2186__ZTVN7WebCore16DiskCacheMonitorE
    21812187__ZTVN7WebCore16IconDatabaseBaseE
    21822188__ZTVN7WebCore17FrameLoaderClientE
    … …  
    25052511_wkCreateMediaUIBackgroundView
    25062512_wkCreateMediaUIControl
     2513_wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
    25072514_wkCreateURLNPasteboardFlavorTypeName
    25082515_wkCreateURLPasteboardFlavorTypeName
    … …  
    25672574__ZN7WebCore32shouldRegisterInsertionUndoGroupEP18NSAttributedString
    25682575__ZN7WebCore44registerInsertionUndoGroupingWithUndoManagerEP13NSUndoManager
    2569 #endif
    2570 
    2571 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    2572 _wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
    25732576#endif
    25742577
    … …  
    29292932#endif
    29302933
    2931 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    2932 __ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace
    2933 __ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse
    2934 __ZN7WebCore23wrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
    2935 __ZN7WebCore25unwrapSerializedCryptoKeyERKN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEES5_RS3_
    2936 __ZN7WebCore28getDefaultWebCryptoMasterKeyERN3WTF6VectorIhLm0ENS0_15CrashOnOverflowEEE
    2937 __ZTVN7WebCore16DiskCacheMonitorE
    2938 #endif
    2939 
    29402934#if ENABLE(3D_RENDERING)
    29412935_WebCoreHas3DRendering

  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r179228 r179364  
    935935            const TextCheckingResult& result = results[i];
    936936            AXAttributeStringSetNumber(attrString, NSAccessibilityMisspelledTextAttribute, trueValue, NSMakeRange(result.location + range.location, result.length));
    937 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     937#if PLATFORM(MAC)
    938938            AXAttributeStringSetNumber(attrString, NSAccessibilityMarkedMisspelledTextAttribute, trueValue, NSMakeRange(result.location + range.location, result.length));
    939939#endif
    … …  
    951951        NSRange spellRange = NSMakeRange(range.location + currentPosition + misspellingLocation, misspellingLength);
    952952        AXAttributeStringSetNumber(attrString, NSAccessibilityMisspelledTextAttribute, [NSNumber numberWithBool:YES], spellRange);
    953 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     953#if PLATFORM(MAC)
    954954        AXAttributeStringSetNumber(attrString, NSAccessibilityMarkedMisspelledTextAttribute, [NSNumber numberWithBool:YES], spellRange);
    955955#endif
    … …  
    10391039    // remove inherited attachment from prior AXAttributedStringAppendReplaced
    10401040    [attrString removeAttribute:NSAccessibilityAttachmentTextAttribute range:attrStringRange];
    1041 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     1041#if PLATFORM(MAC)
    10421042    [attrString removeAttribute:NSAccessibilityMarkedMisspelledTextAttribute range:attrStringRange];
    10431043#endif

  • trunk/Source/WebCore/crypto/CommonCryptoUtilities.h

    r163976 r179364  
    3939#endif
    4040
    41 #if defined(__has_include) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
     41#if defined(__has_include) && PLATFORM(COCOA)
    4242#if __has_include(<CommonCrypto/CommonRandomSPI.h>)
    4343#include <CommonCrypto/CommonRandomSPI.h>

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp

    r170774 r179364  
    4747
    4848    CCCryptorRef cryptor;
    49 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     49#if PLATFORM(COCOA)
    5050    CCAlgorithm aesAlgorithm = kCCAlgorithmAES;
    5151#else

  • trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm

    r179143 r179364  
    17231723    [dateComponents setSecond:component];
    17241724   
    1725 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
    1726     NSString *calendarIdentifier = NSCalendarIdentifierGregorian;
    1727 #else
    1728     NSString *calendarIdentifier = NSGregorianCalendar;
    1729 #endif
    1730 
    1731     return [[[[NSCalendar alloc] initWithCalendarIdentifier:calendarIdentifier] autorelease] dateFromComponents:dateComponents.get()];
     1725    return [[[[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian] autorelease] dateFromComponents:dateComponents.get()];
    17321726}
    17331727

  • trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp

    r178674 r179364  
    5151bool ANGLEInstancedArrays::supported(WebGLRenderingContextBase* context)
    5252{
    53 #if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     53#if PLATFORM(COCOA)
    5454    UNUSED_PARAM(context);
    5555    return true;

  • trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm

    r176450 r179364  
    4141#include "WebCoreThreadRun.h"
    4242#endif
    43 
    44 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
    4543
    4644namespace WebCore {
    … …  
    124122
    125123} // namespace WebCore
    126 
    127 #endif // (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)

  • trunk/Source/WebCore/page/mac/SettingsMac.mm

    r179283 r179364  
    3131bool Settings::shouldEnableScreenFontSubstitutionByDefault()
    3232{
    33 #if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     33#if PLATFORM(MAC)
    3434    return false;
    3535#else
    … …  
    4141{
    4242#if !PLATFORM(IOS)
    43 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    4443    setStandardFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
    4544    setSerifFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
    46 #else
    47     setStandardFontFamily("Apple LiSung", USCRIPT_TRADITIONAL_HAN);
    48     setSerifFontFamily("Apple LiSung", USCRIPT_TRADITIONAL_HAN);
    49 #endif
    5045#else
    5146    // There is no serif Chinese font in default iOS installation.
    … …  
    5752
    5853#if !PLATFORM(IOS)
    59 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    6054    setStandardFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
    6155    setSerifFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
    62 #else
    63     setStandardFontFamily("STSong", USCRIPT_SIMPLIFIED_HAN);
    64     setSerifFontFamily("STSong", USCRIPT_SIMPLIFIED_HAN);
    65 #endif
    6656#else
    6757    // There is no serif Chinese font in default iOS installation.

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

    r171299 r179364  
    3636
    3737static const size_t kWebAudioBufferSize = 128;
    38 
    39 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    4038static const size_t kLowPowerVideoBufferSize = 4096;
    41 #endif
    4239
    4340void MediaSessionManager::updateSessionState()
    … …  
    4744    if (has(MediaSession::WebAudio))
    4845        AudioSession::sharedSession().setPreferredBufferSize(kWebAudioBufferSize);
    49 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    5046    else if ((has(MediaSession::Video) || has(MediaSession::Audio)) && Settings::lowPowerVideoAudioBufferSizeEnabled()) {
    5147        // FIXME: <http://webkit.org/b/116725> Figure out why enabling the code below
    … …  
    6056        AudioSession::sharedSession().setPreferredBufferSize(bufferSize);
    6157    }
    62 #endif
    6358
    6459#if PLATFORM(IOS)

  • trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm

    r179211 r179364  
    8585#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
    8686        _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());
    87 #elif PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     87#elif PLATFORM(MAC)
    8888        _cache_event_source = wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue();
    8989#else
    … …  
    190190}
    191191
    192 #if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
    193192size_t MemoryPressureHandler::ReliefLogger::platformMemoryUsage()
    194193{
    … …  
    223222        NSLog(@"Pressure relief: %s: =dirty (at %ld bytes)\n", m_logString, currentMemory);
    224223}
    225 #else
    226 void MemoryPressureHandler::ReliefLogger::platformLog() { }
    227 size_t MemoryPressureHandler::ReliefLogger::platformMemoryUsage() { return 0; }
    228 #endif
    229224
    230225#if PLATFORM(IOS)

  • trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm

    r174825 r179364  
    235235String AVTrackPrivateAVFObjCImpl::languageForAVMediaSelectionOption(AVMediaSelectionOption* option)
    236236{
    237 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    238237    NSString *language = [option extendedLanguageTag];
    239 #else
    240     NSString *language = nil;
    241 #endif
    242238
    243239    // If the language code is stored as a QuickTime 5-bit packed code there aren't enough bits for a full

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h

    r173197 r179364  
    3131#include <wtf/RetainPtr.h>
    3232
    33 #if ENABLE(ENCRYPTED_MEDIA_V2) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     33#if ENABLE(ENCRYPTED_MEDIA_V2)
    3434
    3535OBJC_CLASS AVAssetResourceLoadingRequest;

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm

    r176924 r179364  
    2727#import "CDMSessionAVFoundationObjC.h"
    2828
    29 #if ENABLE(ENCRYPTED_MEDIA_V2) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     29#if ENABLE(ENCRYPTED_MEDIA_V2)
    3030
    3131#import "CDM.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r179283 r179364  
    596596            createAVPlayerLayer();
    597597
    598 #if USE(VIDEOTOOLBOX) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     598#if USE(VIDEOTOOLBOX)
    599599        if (!m_videoOutput)
    600600            createVideoOutput();
    … …  
    20122012
    20132013#if USE(VIDEOTOOLBOX)
    2014 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    20152014    NSDictionary* attributes = nil;
    2016 #else
    2017     NSDictionary* attributes = @{ (NSString*)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_422YpCbCr8) };
    2018 #endif
    20192015#else
    20202016    NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:kCVPixelFormatType_32BGRA], kCVPixelBufferPixelFormatTypeKey,

  • trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

    r178927 r179364  
    154154IOSurface::SurfaceState IOSurface::state() const
    155155{
    156 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    157156    uint32_t previousState = 0;
    158157    IOReturn ret = IOSurfaceSetPurgeable(m_surface.get(), kIOSurfacePurgeableKeepCurrent, &previousState);
    159158    ASSERT_UNUSED(ret, ret == kIOReturnSuccess);
    160159    return previousState == kIOSurfacePurgeableEmpty ? IOSurface::SurfaceState::Empty : IOSurface::SurfaceState::Valid;
    161 #else
    162     return SurfaceState::Valid;
    163 #endif
    164160}
    165161
    166162bool IOSurface::isVolatile() const
    167163{
    168 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    169164    uint32_t previousState = 0;
    170165    IOReturn ret = IOSurfaceSetPurgeable(m_surface.get(), kIOSurfacePurgeableKeepCurrent, &previousState);
    171166    ASSERT_UNUSED(ret, ret == kIOReturnSuccess);
    172167    return previousState != kIOSurfacePurgeableNonVolatile;
    173 #else
    174     return false;
    175 #endif
    176168}
    177169
    178170IOSurface::SurfaceState IOSurface::setIsVolatile(bool isVolatile)
    179171{
    180 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    181172    uint32_t previousState = 0;
    182173    IOReturn ret = IOSurfaceSetPurgeable(m_surface.get(), isVolatile ? kIOSurfacePurgeableVolatile : kIOSurfacePurgeableNonVolatile, &previousState);
    … …  
    185176    if (previousState == kIOSurfacePurgeableEmpty)
    186177        return IOSurface::SurfaceState::Empty;
    187 #else
    188     UNUSED_PARAM(isVolatile);
    189 #endif
    190178
    191179    return IOSurface::SurfaceState::Valid;

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

    r178940 r179364  
    167167    }
    168168
    169 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     169#if PLATFORM(MAC)
    170170    // Work around <rdar://problem/19433490>
    171171    CGGlyph dummyGlyphs[] = {0, 0};

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

    r178166 r179364  
    255255#if PLATFORM(GTK)
    256256    ::glDrawArraysInstanced(mode, first, count, primcount);
    257 #elif PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     257#elif PLATFORM(COCOA)
    258258    ::glDrawArraysInstancedARB(mode, first, count, primcount);
    259259#else
    … …  
    270270#if PLATFORM(GTK)
    271271    ::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
    272 #elif PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     272#elif PLATFORM(COCOA)
    273273    ::glDrawElementsInstancedARB(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
    274274#else
    … …  
    286286#if PLATFORM(GTK)
    287287    ::glVertexAttribDivisor(index, divisor);
    288 #elif PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     288#elif PLATFORM(COCOA)
    289289    ::glVertexAttribDivisorARB(index, divisor);
    290290#else

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

    r179283 r179364  
    298298#endif
    299299
    300 #if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     300#if PLATFORM(MAC)
    301301extern dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
    302302#endif

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

    r179283 r179364  
    152152dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
    153153
    154 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     154#if PLATFORM(MAC)
    155155dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
    156156#endif

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

    r176949 r179364  
    195195    }
    196196
    197 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
     197#if PLATFORM(COCOA)
    198198    RetainPtr<CFDataRef> sourceApplicationAuditData = d->m_context->sourceApplicationAuditData();
    199199    if (sourceApplicationAuditData)

  • trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.h

    r172862 r179364  
    5555    static bool platformCompare(const ProtectionSpace& a, const ProtectionSpace& b);
    5656
    57 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    5857    WEBCORE_EXPORT bool encodingRequiresPlatformData() const { return m_nsSpace && encodingRequiresPlatformData(m_nsSpace.get()); }
    59 #endif
    6058
    6159    WEBCORE_EXPORT bool receivesCredentialSecurely() const;
    … …  
    6765
    6866private:
    69 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    7067    WEBCORE_EXPORT static bool encodingRequiresPlatformData(NSURLProtectionSpace *);
    71 #endif
    7268
    7369    mutable RetainPtr<NSURLProtectionSpace> m_nsSpace;

  • trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm

    r171599 r179364  
    201201}
    202202
    203 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    204203bool ProtectionSpace::encodingRequiresPlatformData(NSURLProtectionSpace *space)
    205204{
    206205    return space.distinguishedNames || space.serverTrust;
    207206}
    208 #endif
    209207
    210208} // namespace WebCore

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

    r178612 r179364  
    207207    }
    208208
    209 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    210209    RetainPtr<CFDataRef> sourceApplicationAuditData = d->m_context->sourceApplicationAuditData();
    211210    if (sourceApplicationAuditData)
    212211        [streamProperties setObject:(NSData *)sourceApplicationAuditData.get() forKey:@"kCFStreamPropertySourceApplication"];
    213 #endif
    214212
    215213#if PLATFORM(IOS)

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

    r173192 r179364  
    329329NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLConnection *connection, NSURLRequest *newRequest, NSURLResponse *redirectResponse)
    330330{
    331 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    332331    if (redirectResponse)
    333332        return redirectResponse;
    … …  
    340339    NSDictionary *synthesizedResponseHeaderFields = @{ @"Location": [[newRequest URL] absoluteString], @"Cache-Control": @"no-store" };
    341340    return [[[NSHTTPURLResponse alloc] initWithURL:[[connection currentRequest] URL] statusCode:302 HTTPVersion:(NSString *)kCFHTTPVersion1_1 headerFields:synthesizedResponseHeaderFields] autorelease];
    342 #else
    343     UNUSED_PARAM(connection);
    344     UNUSED_PARAM(newRequest);
    345     return redirectResponse;
    346 #endif
    347341}
    348342#endif

  • trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

    r176451 r179364  
    6969EXTERN_C void CFURLCacheSetMemoryCapacity(CFURLCacheRef, CFIndex memoryCapacity);
    7070EXTERN_C void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
    71 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     71#if PLATFORM(COCOA)
    7272EXTERN_C CFBooleanRef _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
    7373EXTERN_C void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
    … …  
    7979EXTERN_C void CFHTTPCookieStorageDeleteAllCookies(CFHTTPCookieStorageRef);
    8080
    81 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     81#if PLATFORM(COCOA)
    8282EXTERN_C CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
    8383#ifdef __BLOCKS__
    8484EXTERN_C void _CFCachedURLResponseSetBecameFileBackedCallBackBlock(CFCachedURLResponseRef, CFCachedURLResponseCallBackBlock, dispatch_queue_t);
    8585#endif
    86 #endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     86#endif // PLATFORM(COCOA)
    8787
    8888EXTERN_C void CFURLConnectionInvalidateConnectionCache();

  • trunk/Source/WebCore/platform/text/mac/LocaleMac.mm

    r177280 r179364  
    8585LocaleMac::LocaleMac(NSLocale* locale)
    8686    : m_locale(locale)
    87 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
     87#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || PLATFORM(MAC)
    8888    , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]))
    8989#else
Note: See TracChangeset for help on using the changeset viewer.