Changeset 190841 in webkit


Ignore:
Timestamp:
Oct 10, 2015 1:05:53 PM (8 years ago)
Author:
mitz@apple.com
Message:

[iOS] Remove unnecessary iOS version checks
https://bugs.webkit.org/show_bug.cgi?id=150002

Reviewed by Alexey Proskuryakov.

Source/JavaScriptCore:

  • llvm/library/LLVMExports.cpp:

(initializeAndGetJSCLLVMAPI):

Source/WebCore:

  • loader/cache/CachedFont.cpp:

(WebCore::CachedFont::ensureCustomFontData):

  • loader/cocoa/DiskCacheMonitorCocoa.h:

(WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation):

  • page/mac/SettingsMac.mm:

(WebCore::sansSerifTraditionalHanFontFamily):
(WebCore::sansSerifSimplifiedHanFontFamily):

  • platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::appendOpenTypeFeature):

  • platform/graphics/ios/FontCacheIOS.mm:

(WebCore::getSystemFontFallbackForCharacters):
(WebCore::platformLookupFallbackFont):

  • platform/ios/PlatformSpeechSynthesizerIOS.mm:

(WebCore::PlatformSpeechSynthesizer::initializeVoiceList):

  • platform/ios/WebCoreSystemInterfaceIOS.h:
  • platform/ios/WebVideoFullscreenControllerAVKit.mm:
  • platform/ios/WebVideoFullscreenInterfaceAVKit.h:
  • platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
  • platform/ios/wak/WAKWindow.mm:

(+[WAKWindow hasLandscapeOrientation]):
(-[WAKWindow hostLayer]):

  • platform/network/cf/CookieJarCFNet.cpp:

(WebCore::copyCookiesForURLWithFirstPartyURL):
(WebCore::createCookies):

  • platform/network/mac/CertificateInfoMac.mm:

(WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):

  • platform/spi/cf/CFNetworkSPI.h:
  • platform/spi/cocoa/AVKitSPI.h:
  • platform/spi/cocoa/CoreTextSPI.h:
  • platform/spi/cocoa/NEFilterSourceSPI.h:
  • platform/spi/cocoa/QuartzCoreSPI.h:
  • platform/spi/cocoa/SecuritySPI.h:
  • platform/spi/ios/LaunchServicesSPI.h:
  • platform/spi/mac/AVFoundationSPI.h:
  • platform/text/TextBreakIterator.cpp:
  • platform/text/TextFlags.h:
  • platform/text/ios/LocalizedDateCache.mm:

(WebCore::LocalizedDateCache::calculateMaximumWidth):

  • platform/text/mac/LocaleMac.mm:

(WebCore::LocaleMac::LocaleMac):

  • rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::cachedSystemFontDescription):
(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):

  • svg/SVGToOTFFontConversion.cpp:

(WebCore::SVGToOTFFontConverter::appendKERNTable):
(WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):

Source/WebKit/mac:

  • Plugins/WebPluginController.h:
  • Plugins/WebPluginController.mm:

(-[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
(+[WebPluginController addPlugInView:]):
(+[WebPluginController plugInViewWithArguments:fromPluginPackage:]): Deleted.

  • WebCoreSupport/WebFrameLoaderClient.mm:

(pluginView):

  • WebView/WebPreferences.mm:

(-[WebPreferences isDNSPrefetchingEnabled]):
(-[WebPreferences setWebInspectorServerEnabled:]): Deleted.
(-[WebPreferences _setAllowCompositingLayerVisualDegradation:]): Deleted.

  • WebView/WebPreferencesPrivate.h:
  • WebView/WebView.mm:

(shouldAllowPictureInPictureMediaPlayback):

Source/WebKit2:

  • NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):

  • Platform/IPC/mac/ConnectionMac.mm:

(IPC::AccessibilityProcessSuspendedNotification):

  • Platform/spi/ios/SafariServicesSPI.h:
  • Platform/spi/ios/UIKitSPI.h:
  • Shared/Network/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):

  • Shared/Network/NetworkProcessCreationParameters.h:
  • Shared/Plugins/PluginProcessCreationParameters.cpp:

(WebKit::PluginProcessCreationParameters::encode):
(WebKit::PluginProcessCreationParameters::decode):

  • Shared/Plugins/PluginProcessCreationParameters.h:
  • Shared/WebEventConversion.cpp:

(WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint):

  • Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

  • Shared/WebProcessCreationParameters.h:
  • Shared/ios/NativeWebTouchEventIOS.mm:

(WebKit::NativeWebTouchEvent::extractWebTouchPoint):
(WebKit::NativeWebTouchEvent::NativeWebTouchEvent):

  • Shared/ios/WebPlatformTouchPointIOS.cpp:

(WebKit::WebPlatformTouchPoint::encode):
(WebKit::WebPlatformTouchPoint::decode):

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
(shouldAllowPictureInPictureMediaPlayback):
(-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]):

  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):

  • UIProcess/Plugins/mac/PluginProcessProxyMac.mm:

(WebKit::PluginProcessProxy::platformInitializePluginProcess):

  • UIProcess/ios/ViewGestureControllerIOS.mm:

(-[WKSwipeTransitionController gestureRecognizerForInteractiveTransition:WithTarget:action:]):

  • UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView setupInteraction]):
(-[WKContentView _ensureFormAccessoryView]):
(-[WKContentView webSelectionAssistant]):
(-[WKContentView selectionInteractionAssistant]):

  • UIProcess/ios/WebVideoFullscreenManagerProxy.mm:

(WebKit::WebVideoFullscreenManagerProxy::create):

  • UIProcess/ios/forms/WKFileUploadPanel.mm:

(photoLibraryIcon):
(cameraIcon):
(fallbackIconForFile):
(iconForImageFile):

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::flushLayers):

  • WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::flushLayers):

  • WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Source/WTF:

  • wtf/Platform.h:

Tools:

  • WebKitTestRunner/ios/HIDEventGenerator.mm:

(-[HIDEventGenerator _createIOHIDEventType:]):
(-[HIDEventGenerator _sendHIDEvent:]):
(-[HIDEventGenerator _sendMarkerHIDEventWithCompletionBlock:]):

  • WebKitTestRunner/ios/UIKitSPI.h:
Location:
trunk
Files:
66 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r190837 r190841  
     12015-10-10  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove unnecessary iOS version checks
     4        https://bugs.webkit.org/show_bug.cgi?id=150002
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * llvm/library/LLVMExports.cpp:
     9        (initializeAndGetJSCLLVMAPI):
     10
    1112015-10-10  Dan Bernstein  <mitz@apple.com>
    212
  • trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp

    r186923 r190841  
    9494    LLVMInitializeX86Disassembler();
    9595#elif CPU(ARM64)
    96 #if (__IPHONE_OS_VERSION_MIN_REQUIRED > 80200) || OS(LINUX)
     96#if PLATFORM(IOS) || OS(LINUX)
    9797    LLVMInitializeAArch64TargetInfo();
    9898    LLVMInitializeAArch64Target();
  • trunk/Source/WTF/ChangeLog

    r190837 r190841  
     12015-10-10  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove unnecessary iOS version checks
     4        https://bugs.webkit.org/show_bug.cgi?id=150002
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * wtf/Platform.h:
     9
    1102015-10-10  Dan Bernstein  <mitz@apple.com>
    211
  • trunk/Source/WTF/wtf/Platform.h

    r190182 r190841  
    556556#endif
    557557
    558 #if defined(TARGET_OS_IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     558#if TARGET_OS_IOS
    559559#define HAVE_APP_LINKS 1
    560560#endif
     
    987987#endif
    988988
    989 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
     989#if PLATFORM(IOS) || PLATFORM(MAC)
    990990#define USE_COREMEDIA 1
    991991#define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
    992992#endif
    993993
    994 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
     994#if PLATFORM(IOS) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
    995995#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
    996996#endif
    997997
    998 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
     998#if PLATFORM(IOS) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
    999999#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
    10001000#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
    10011001#endif
    10021002
    1003 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
     1003#if PLATFORM(IOS) || PLATFORM(MAC)
    10041004#define HAVE_AVFOUNDATION_LOADER_DELEGATE 1
    10051005#endif
     
    10601060#endif
    10611061
    1062 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
     1062#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
    10631063#define HAVE_TIMINGDATAOPTIONS 1
    10641064#endif
     
    11181118#endif
    11191119
    1120 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     1120#if PLATFORM(IOS)
    11211121#define ENABLE_VIDEO_PRESENTATION_MODE 1
    11221122#endif
  • trunk/Source/WebCore/ChangeLog

    r190840 r190841  
     12015-10-10  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove unnecessary iOS version checks
     4        https://bugs.webkit.org/show_bug.cgi?id=150002
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * loader/cache/CachedFont.cpp:
     9        (WebCore::CachedFont::ensureCustomFontData):
     10        * loader/cocoa/DiskCacheMonitorCocoa.h:
     11        (WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation):
     12        * page/mac/SettingsMac.mm:
     13        (WebCore::sansSerifTraditionalHanFontFamily):
     14        (WebCore::sansSerifSimplifiedHanFontFamily):
     15        * platform/graphics/cocoa/FontCacheCoreText.cpp:
     16        (WebCore::appendOpenTypeFeature):
     17        * platform/graphics/ios/FontCacheIOS.mm:
     18        (WebCore::getSystemFontFallbackForCharacters):
     19        (WebCore::platformLookupFallbackFont):
     20        * platform/ios/PlatformSpeechSynthesizerIOS.mm:
     21        (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
     22        * platform/ios/WebCoreSystemInterfaceIOS.h:
     23        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
     24        * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
     25        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
     26        * platform/ios/wak/WAKWindow.mm:
     27        (+[WAKWindow hasLandscapeOrientation]):
     28        (-[WAKWindow hostLayer]):
     29        * platform/network/cf/CookieJarCFNet.cpp:
     30        (WebCore::copyCookiesForURLWithFirstPartyURL):
     31        (WebCore::createCookies):
     32        * platform/network/mac/CertificateInfoMac.mm:
     33        (WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):
     34        * platform/spi/cf/CFNetworkSPI.h:
     35        * platform/spi/cocoa/AVKitSPI.h:
     36        * platform/spi/cocoa/CoreTextSPI.h:
     37        * platform/spi/cocoa/NEFilterSourceSPI.h:
     38        * platform/spi/cocoa/QuartzCoreSPI.h:
     39        * platform/spi/cocoa/SecuritySPI.h:
     40        * platform/spi/ios/LaunchServicesSPI.h:
     41        * platform/spi/mac/AVFoundationSPI.h:
     42        * platform/text/TextBreakIterator.cpp:
     43        * platform/text/TextFlags.h:
     44        * platform/text/ios/LocalizedDateCache.mm:
     45        (WebCore::LocalizedDateCache::calculateMaximumWidth):
     46        * platform/text/mac/LocaleMac.mm:
     47        (WebCore::LocaleMac::LocaleMac):
     48        * rendering/RenderThemeIOS.mm:
     49        (WebCore::RenderThemeIOS::cachedSystemFontDescription):
     50        (WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
     51        * svg/SVGToOTFFontConversion.cpp:
     52        (WebCore::SVGToOTFFontConverter::appendKERNTable):
     53        (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
     54
    1552015-10-10  Antti Koivisto  <antti@apple.com>
    256
  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r188130 r190841  
    103103        RefPtr<SharedBuffer> buffer(data);
    104104
    105 #if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)
     105#if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && !PLATFORM(IOS)
    106106        if (isWOFF(buffer.get())) {
    107107            Vector<char> convertedFont;
  • trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h

    r175549 r190841  
    5656};
    5757
    58 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090)
     58#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
    5959
    6060inline void DiskCacheMonitor::monitorFileBackingStoreCreation(const ResourceRequest&, SessionID, CFCachedURLResponseRef)
  • trunk/Source/WebCore/page/mac/SettingsMac.mm

    r186021 r190841  
    3131static inline const char* sansSerifTraditionalHanFontFamily()
    3232{
    33 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
     33#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
    3434    return "PingFang TC";
    3535#else
     
    4040static inline const char* sansSerifSimplifiedHanFontFamily()
    4141{
    42 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
     42#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
    4343    return "PingFang SC";
    4444#else
  • trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

    r190754 r190841  
    134134static inline void appendOpenTypeFeature(CFMutableArrayRef features, const FontFeature& feature)
    135135{
    136 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
     136#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
    137137    RetainPtr<CFStringRef> featureKey = adoptCF(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(feature.tag().data()), feature.tag().size() * sizeof(FontFeatureTag::value_type), kCFStringEncodingASCII, false));
    138138    int rawFeatureValue = feature.value();
  • trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm

    r189951 r190841  
    8383    // FIXME: Unify this with platformLookupFallbackFont()
    8484    RetainPtr<CFStringRef> localeString;
    85 #if __IPHONE_OS_VERSION_MIN_REQUIRED > 90000
    8685    if (!locale.isNull())
    8786        localeString = locale.string().createCFString();
    88 #else
    89     UNUSED_PARAM(locale);
    90 #endif
    9187
    9288    CFIndex coveredLength = 0;
     
    10096        return getSystemFontFallbackForCharacters(font, locale, characters, length);
    10197
    102 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    10398    RetainPtr<CFStringRef> localeString;
    10499#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     
    107102#endif
    108103    RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(font, characters, length, localeString.get(), nullptr));
    109 #else
    110     RetainPtr<CTFontRef> fallbackFont = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, nullptr, nullptr));
    111     RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCopyFontDescriptor(fallbackFont.get()));
    112 #endif
    113104    UChar32 c = *characters;
    114105    if (length > 1 && U16_IS_LEAD(c) && U16_IS_TRAIL(characters[1]))
  • trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm

    r186279 r190841  
    250250        NSString *language = [voice language];
    251251        bool isDefault = true;
    252 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    253252        NSString *voiceURI = [voice identifier];
    254253        NSString *name = [voice name];
    255 #else
    256         NSString *voiceURI = language;
    257         NSString *name = language;
    258 #endif
    259254        m_voiceList.append(PlatformSpeechSynthesisVoice::create(voiceURI, name, language, true, isDefault));
    260255    }
  • trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h

    r185472 r190841  
    3434    wkIOSSystemVersion_5_0 = __IPHONE_5_0,
    3535    wkIOSSystemVersion_6_0 = __IPHONE_6_0,
    36 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    3736    wkIOSSystemVersion_9_0 = __IPHONE_9_0,
    38 #endif
    3937} wkIOSSystemVersion;
    4038
  • trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm

    r187491 r190841  
    4747using namespace WebCore;
    4848
    49 #if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
     49#if !HAVE(AVKIT)
    5050
    5151@implementation WebVideoFullscreenController
     
    639639@end
    640640
    641 #endif // __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
     641#endif // !HAVE(AVKIT)
    642642
    643643#endif // PLATFORM(IOS)
  • trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h

    r187617 r190841  
    2828#define WebVideoFullscreenInterfaceAVKit_h
    2929
    30 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
     30#if PLATFORM(IOS)
    3131
    3232#include <WebCore/EventListener.h>
  • trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm

    r190336 r190841  
    2727#import "config.h"
    2828
    29 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 80200 && HAVE(AVKIT)
     29#if PLATFORM(IOS) && HAVE(AVKIT)
    3030
    3131#import "WebVideoFullscreenInterfaceAVKit.h"
  • trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm

    r188169 r190841  
    4545
    4646@protocol OrientationProvider
    47 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
    4847- (BOOL)hasLandscapeOrientation;
    49 #else
    50 - (int)orientation;
    51 #endif
    5248@end
    5349
     
    622618{
    623619    // this should be perfectly thread safe
    624 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
    625620    return [gOrientationProvider hasLandscapeOrientation];
    626 #else
    627     int orientation = [gOrientationProvider orientation];
    628     return orientation == 90 || orientation == -90;
    629 #endif
    630621}
    631622
  • trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp

    r187490 r190841  
    4343#endif
    4444
    45 #if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)
     45#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
    4646enum {
    4747    CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3
     
    106106    bool secure = url.protocolIs("https");
    107107
    108 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
     108#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
    109109    return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));
    110110#else
     
    117117static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
    118118{
    119 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
     119#if PLATFORM(IOS)
    120120    CFArrayRef parsedCookies = _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
    121121#else
  • trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm

    r181455 r190841  
    3434bool CertificateInfo::containsNonRootSHA1SignedCertificate() const
    3535{
    36 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
     36#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
    3737    if (!m_certificateChain)
    3838        return false;
  • trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

    r189101 r190841  
    113113#endif
    114114
    115 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     115#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    116116EXTERN_C CFDataRef _CFNetworkCopyATSContext(void);
    117117EXTERN_C Boolean _CFNetworkSetATSContext(CFDataRef);
     
    122122#endif
    123123
    124 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     124#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    125125EXTERN_C CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage);
    126126EXTERN_C CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
     
    146146
    147147// FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon).
    148 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     148#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    149149@interface NSHTTPCookieStorage ()
    150150+ (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
  • trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h

    r190336 r190841  
    7575@end
    7676
    77 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
    78 @protocol AVPlayerViewControllerDelegate <NSObject>
    79 - (void)playerViewController:(AVPlayerViewController *)playerViewController restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:(void (^)(BOOL restored))completionHandler;
    80 @end
    81 #endif
    82 
    8377@protocol AVPlayerViewControllerDelegate_WebKitOnly <AVPlayerViewControllerDelegate>
    8478@optional
     
    10296- (void)stopPictureInPicture;
    10397
    104 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
    105 @property (nonatomic) BOOL allowsPictureInPicturePlayback;
    106 @property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;
    107 #endif
    10898@property (nonatomic, strong) AVPlayerController *playerController;
    10999@end
    110100
    111101#endif // USE(APPLE_INTERNAL_SDK)
    112 
    113 #if USE(APPLE_INTERNAL_SDK) && __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
    114 
    115 #import <AVKit/AVValueTiming.h>
    116 
    117 #else
    118102
    119103@interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying>
     
    124108@property (NS_NONATOMIC_IOSONLY, readonly) double currentValue;
    125109@end
    126 
    127 #endif
    128110
    129111#endif // PLATFORM(IOS)
  • trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h

    r188609 r190841  
    110110#endif
    111111
    112 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     112#if PLATFORM(IOS)
    113113extern const CFStringRef kCTUIFontTextStyleTitle1;
    114114extern const CFStringRef kCTUIFontTextStyleTitle2;
  • trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h

    r182637 r190841  
    2424 */
    2525
    26 #define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
     26#define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
    2727
    2828#if USE(APPLE_INTERNAL_SDK)
  • trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

    r188610 r190841  
    132132@end
    133133
    134 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     134#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    135135typedef enum {
    136136    kCATransactionPhasePreLayout,
     
    164164// FIXME: Move this into the APPLE_INTERNAL_SDK block once it's in an SDK.
    165165@interface CAContext (AdditionalDetails)
    166 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     166#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    167167- (void)invalidateFences;
    168168#endif
  • trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h

    r185951 r190841  
    4242#endif
    4343
    44 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
     44#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
    4545typedef uint32_t SecSignatureHashAlgorithm;
    4646enum {
  • trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h

    r190336 r190841  
    3131#if USE(APPLE_INTERNAL_SDK)
    3232
    33 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    3433#import <MobileCoreServices/LSAppLinkPriv.h>
    35 #endif
    3634
    3735#endif
     
    4341#if !USE(APPLE_INTERNAL_SDK)
    4442
    45 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    4643@interface LSResourceProxy : NSObject <NSCopying, NSSecureCoding>
    4744@end
     
    6360@property (readonly, strong) LSApplicationProxy *targetApplicationProxy;
    6461@end
    65 #endif
    6662
    6763#endif
  • trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h

    r185727 r190841  
    6565#endif
    6666
    67 #if !HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK) || __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
     67#if !HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK)
    6868
    6969@interface AVPlayerLayer (AVPlayerLayerPictureInPictureModeSupportPrivate)
  • trunk/Source/WebCore/platform/text/TextBreakIterator.cpp

    r190103 r190841  
    3131
    3232// FIXME: This needs a better name
    33 #define ADDITIONAL_EMOJI_SUPPORT ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))
     33#define ADDITIONAL_EMOJI_SUPPORT (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))
    3434
    3535namespace WebCore {
  • trunk/Source/WebCore/platform/text/TextFlags.h

    r190192 r190841  
    3030// FIXME: When we have moved entirely to CORETEXT_WEB_FONTS, remove the isCustomFont member variable from Font, since it will no longer be used.
    3131// See https://bug-145873-attachments.webkit.org/attachment.cgi?id=254710
    32 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000)
     32#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
    3333#define CORETEXT_WEB_FONTS 0
    3434#else
  • trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm

    r184555 r190841  
    156156    // date doesn't adjust for the current timezone. This is an arbitrary date
    157157    // (x-27-2007) and time (10:45 PM).
    158 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
    159158    RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]);
    160 #else
    161     RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]);
    162 #endif
    163159    [gregorian.get() setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
    164160    RetainPtr<NSDateComponents> components = adoptNS([[NSDateComponents alloc] init]);
  • trunk/Source/WebCore/platform/text/mac/LocaleMac.mm

    r179364 r190841  
    8585LocaleMac::LocaleMac(NSLocale* locale)
    8686    : m_locale(locale)
    87 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || PLATFORM(MAC)
    8887    , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]))
    89 #else
    90     , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]))
    91 #endif
    9288    , m_didInitializeNumberData(false)
    9389{
  • trunk/Source/WebCore/rendering/RenderThemeIOS.mm

    r190192 r190841  
    10941094    static NeverDestroyed<FontCascadeDescription> shortCaption1Font;
    10951095    static NeverDestroyed<FontCascadeDescription> tallBodyFont;
    1096 #if __IPHONE_OS_VERSION_MIN_REQUIRED > 80200
    10971096    static NeverDestroyed<FontCascadeDescription> title1Font;
    10981097    static NeverDestroyed<FontCascadeDescription> title2Font;
    10991098    static NeverDestroyed<FontCascadeDescription> title3Font;
    1100 #endif
    11011099
    11021100    static CFStringRef userTextSize = contentSizeCategory();
     
    11241122    case CSSValueAppleSystemBody:
    11251123        return bodyFont;
    1126 #if __IPHONE_OS_VERSION_MIN_REQUIRED > 80200
    11271124    case CSSValueAppleSystemTitle1:
    11281125        return title1Font;
     
    11311128    case CSSValueAppleSystemTitle3:
    11321129        return title3Font;
    1133 #endif
    11341130    case CSSValueAppleSystemSubheadline:
    11351131        return subheadlineFont;
     
    11721168        fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
    11731169        break;
    1174 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    11751170    case CSSValueAppleSystemTitle1:
    11761171        textStyle = kCTUIFontTextStyleTitle1;
     
    11851180        fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
    11861181        break;
    1187 #endif
    11881182    case CSSValueAppleSystemSubheadline:
    11891183        textStyle = kCTUIFontTextStyleSubhead;
  • trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp

    r190375 r190841  
    11071107    ASSERT_UNUSED(sizeOfVerticalSubtable, subtablesOffset + sizeOfHorizontalSubtable + sizeOfVerticalSubtable == m_result.size());
    11081108
    1109 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)
     1109#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    11101110    // Work around a bug in Apple's font parser by adding some padding bytes. <rdar://problem/18401901>
    11111111    for (int i = 0; i < 6; ++i)
     
    14051405    }
    14061406
    1407 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)
     1407#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    14081408    // <rdar://problem/20086223> Cocoa has a bug where glyph bounding boxes are not correctly respected for frustum culling. Work around this by
    14091409    // inflating the font's bounding box
  • trunk/Source/WebKit/mac/ChangeLog

    r190837 r190841  
     12015-10-10  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove unnecessary iOS version checks
     4        https://bugs.webkit.org/show_bug.cgi?id=150002
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * Plugins/WebPluginController.h:
     9        * Plugins/WebPluginController.mm:
     10        (-[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
     11        (+[WebPluginController addPlugInView:]):
     12        (+[WebPluginController plugInViewWithArguments:fromPluginPackage:]): Deleted.
     13        * WebCoreSupport/WebFrameLoaderClient.mm:
     14        (pluginView):
     15        * WebView/WebPreferences.mm:
     16        (-[WebPreferences isDNSPrefetchingEnabled]):
     17        (-[WebPreferences setWebInspectorServerEnabled:]): Deleted.
     18        (-[WebPreferences _setAllowCompositingLayerVisualDegradation:]): Deleted.
     19        * WebView/WebPreferencesPrivate.h:
     20        * WebView/WebView.mm:
     21        (shouldAllowPictureInPictureMediaPlayback):
     22
    1232015-10-10  Dan Bernstein  <mitz@apple.com>
    224
  • trunk/Source/WebKit/mac/Plugins/WebPluginController.h

    r168079 r190841  
    4848}
    4949
    50 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
    51 + (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
    52 #else
    5350- (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
    54 #endif
    5551+ (BOOL)isPlugInView:(NSView *)view;
    5652
  • trunk/Source/WebKit/mac/Plugins/WebPluginController.mm

    r185111 r190841  
    120120@implementation WebPluginController
    121121
    122 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
    123 + (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
    124 {
    125     initializeAudioSession();
    126     [pluginPackage load];
    127     Class viewFactory = [pluginPackage viewFactory];
    128 
    129     id view = nil;
    130 
    131     if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
    132         JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());
    133         view = [viewFactory plugInViewWithArguments:arguments];
    134     }
    135 
    136     return view;
    137 }
    138 #else
    139122- (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
    140123{
     
    175158    return view;
    176159}
    177 #endif
    178160
    179161#if PLATFORM(IOS)
  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r190611 r190841  
    17711771    }
    17721772
    1773 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
    1774     view = [WebPluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
    1775     [attributes release];
    1776 #else
    17771773    view = [pluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
    17781774    [attributes release];
    1779 #endif
    17801775
    17811776    return view;
  • trunk/Source/WebKit/mac/WebView/WebPreferences.mm

    r190578 r190841  
    11841184@implementation WebPreferences (WebPrivate)
    11851185
    1186 #if PLATFORM(IOS) && !(__IPHONE_OS_VERSION_MIN_REQUIRED >= 60000)
    1187 - (void) setWebInspectorServerEnabled:(BOOL)flag
    1188 {
    1189 }
    1190 #endif
    1191 
    1192 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
    1193 - (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag
    1194 {
    1195 }
    1196 #endif
    1197 
    11981186- (BOOL)isDNSPrefetchingEnabled
    11991187{
  • trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

    r189129 r190841  
    456456@property (nonatomic) BOOL mediaDataLoadsAutomatically;
    457457
    458 #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
    459 - (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag;
    460 #endif
    461 
    462458@end
  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r190156 r190841  
    852852static bool shouldAllowPictureInPictureMediaPlayback()
    853853{
    854 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     854#if PLATFORM(IOS)
    855855    static bool shouldAllowPictureInPictureMediaPlayback = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
    856856    return shouldAllowPictureInPictureMediaPlayback;
  • trunk/Source/WebKit2/ChangeLog

    r190837 r190841  
     12015-10-10  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove unnecessary iOS version checks
     4        https://bugs.webkit.org/show_bug.cgi?id=150002
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     9        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
     10        * Platform/IPC/mac/ConnectionMac.mm:
     11        (IPC::AccessibilityProcessSuspendedNotification):
     12        * Platform/spi/ios/SafariServicesSPI.h:
     13        * Platform/spi/ios/UIKitSPI.h:
     14        * Shared/Network/NetworkProcessCreationParameters.cpp:
     15        (WebKit::NetworkProcessCreationParameters::encode):
     16        (WebKit::NetworkProcessCreationParameters::decode):
     17        * Shared/Network/NetworkProcessCreationParameters.h:
     18        * Shared/Plugins/PluginProcessCreationParameters.cpp:
     19        (WebKit::PluginProcessCreationParameters::encode):
     20        (WebKit::PluginProcessCreationParameters::decode):
     21        * Shared/Plugins/PluginProcessCreationParameters.h:
     22        * Shared/WebEventConversion.cpp:
     23        (WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint):
     24        * Shared/WebProcessCreationParameters.cpp:
     25        (WebKit::WebProcessCreationParameters::encode):
     26        (WebKit::WebProcessCreationParameters::decode):
     27        * Shared/WebProcessCreationParameters.h:
     28        * Shared/ios/NativeWebTouchEventIOS.mm:
     29        (WebKit::NativeWebTouchEvent::extractWebTouchPoint):
     30        (WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
     31        * Shared/ios/WebPlatformTouchPointIOS.cpp:
     32        (WebKit::WebPlatformTouchPoint::encode):
     33        (WebKit::WebPlatformTouchPoint::decode):
     34        * UIProcess/API/Cocoa/WKWebView.mm:
     35        (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
     36        (shouldAllowPictureInPictureMediaPlayback):
     37        (-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]):
     38        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     39        (WebKit::WebProcessPool::platformInitializeWebProcess):
     40        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     41        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
     42        (WebKit::PluginProcessProxy::platformInitializePluginProcess):
     43        * UIProcess/ios/ViewGestureControllerIOS.mm:
     44        (-[WKSwipeTransitionController gestureRecognizerForInteractiveTransition:WithTarget:action:]):
     45        * UIProcess/ios/WKContentViewInteraction.mm:
     46        (-[WKContentView setupInteraction]):
     47        (-[WKContentView _ensureFormAccessoryView]):
     48        (-[WKContentView webSelectionAssistant]):
     49        (-[WKContentView selectionInteractionAssistant]):
     50        * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
     51        (WebKit::WebVideoFullscreenManagerProxy::create):
     52        * UIProcess/ios/forms/WKFileUploadPanel.mm:
     53        (photoLibraryIcon):
     54        (cameraIcon):
     55        (fallbackIconForFile):
     56        (iconForImageFile):
     57        * WebKit2.xcodeproj/project.pbxproj:
     58        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
     59        (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
     60        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
     61        (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
     62        * WebProcess/cocoa/WebProcessCocoa.mm:
     63        (WebKit::WebProcess::platformInitializeWebProcess):
     64
    1652015-10-10  Dan Bernstein  <mitz@apple.com>
    266
  • trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r189313 r190841  
    7676    m_diskCacheDirectory = parameters.diskCacheDirectory;
    7777
    78 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     78#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    7979    _CFNetworkSetATSContext(parameters.networkATSContext.get());
    8080#endif
  • trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm

    r187563 r190841  
    614614#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
    615615    _AXUIElementNotifyProcessSuspendStatus(suspended ? AXSuspendStatusSuspended : AXSuspendStatusRunning);
    616 #elif PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     616#elif PLATFORM(IOS)
    617617    UIAccessibilityPostNotification(kAXPidStatusChangedNotification, @{ @"pid" : @(getpid()), @"suspended" : @(suspended) });
    618618#else
  • trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h

    r190336 r190841  
    2424 */
    2525
    26 #if HAVE(SAFARI_SERVICES_FRAMEWORK) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     26#if HAVE(SAFARI_SERVICES_FRAMEWORK)
    2727
    2828#import <WebCore/SoftLinking.h>
  • trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

    r190336 r190841  
    596596@property (nonatomic, assign, getter=isNextEnabled) BOOL nextEnabled;
    597597@property (nonatomic, assign, getter=isPreviousEnabled) BOOL previousEnabled;
    598 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    599598- (id)initWithInputAssistantItem:(UITextInputAssistantItem *)inputAssistantItem;
    600 #endif
    601599@end
    602600
     
    644642    unsigned touchPointCount;
    645643
    646 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    647644    bool isPotentialTap;
    648 #endif
    649645};
    650646
  • trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp

    r184211 r190841  
    7373    encoder << httpProxy;
    7474    encoder << httpsProxy;
    75 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     75#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    7676    IPC::encode(encoder, networkATSContext.get());
    7777#endif
     
    139139    if (!decoder.decode(result.httpsProxy))
    140140        return false;
    141 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     141#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    142142    if (!IPC::decode(decoder, result.networkATSContext))
    143143        return false;
  • trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h

    r184211 r190841  
    8585    String httpProxy;
    8686    String httpsProxy;
    87 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     87#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    8888    RetainPtr<CFDataRef> networkATSContext;
    8989#endif
  • trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp

    r182073 r190841  
    4848#if PLATFORM(COCOA)
    4949    encoder << acceleratedCompositingPort;
    50 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     50#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    5151    IPC::encode(encoder, networkATSContext.get());
    5252#endif
     
    6767    if (!decoder.decode(result.acceleratedCompositingPort))
    6868        return false;
    69 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     69#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    7070    if (!IPC::decode(decoder, result.networkATSContext))
    7171        return false;
  • trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h

    r182073 r190841  
    5656#if PLATFORM(COCOA)
    5757    WebCore::MachSendRight acceleratedCompositingPort;
    58 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     58#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    5959    RetainPtr<CFDataRef> networkATSContext;
    6060#endif
  • trunk/Source/WebKit2/Shared/WebEventConversion.cpp

    r189868 r190841  
    244244WebKit2PlatformTouchPoint(const WebPlatformTouchPoint& webTouchPoint)
    245245    : PlatformTouchPoint(webTouchPoint.identifier(), webTouchPoint.location(), touchEventType(webTouchPoint)
    246 #if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     246#if ENABLE(IOS_TOUCH_EVENTS)
    247247    , webTouchPoint.force()
    248248#endif
  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

    r185317 r190841  
    153153#endif
    154154
    155 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     155#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    156156    IPC::encode(encoder, networkATSContext.get());
    157157#endif
     
    319319#endif
    320320
    321 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     321#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    322322    if (!IPC::decode(decoder, parameters.networkATSContext))
    323323        return false;
  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

    r185317 r190841  
    174174#endif
    175175
    176 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     176#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    177177    RetainPtr<CFDataRef> networkATSContext;
    178178#endif
  • trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm

    r189753 r190841  
    8888        WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase(touchPoint.phase);
    8989        WebPlatformTouchPoint platformTouchPoint = WebPlatformTouchPoint(identifier, location, phase);
    90 #if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     90#if ENABLE(IOS_TOUCH_EVENTS)
    9191        platformTouchPoint.setForce(touchPoint.force);
    9292#endif
     
    103103        extractWebTouchPoint(event),
    104104        positionForCGPoint(event->locationInDocumentCoordinates),
    105 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP && UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP
     105#if defined UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP && UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP
    106106        event->isPotentialTap,
    107107#else
  • trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp

    r189753 r190841  
    4141    encoder << m_location;
    4242    encoder << m_phase;
    43 #if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     43#if ENABLE(IOS_TOUCH_EVENTS)
    4444    encoder << m_force;
    4545#endif
     
    5454    if (!decoder.decode(result.m_phase))
    5555        return false;
    56 #if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     56#if ENABLE(IOS_TOUCH_EVENTS)
    5757    if (!decoder.decode(result.m_force))
    5858        return false;
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r190823 r190841  
    256256- (BOOL)_mayAutomaticallyShowVideoPictureInPicture
    257257{
    258 #if (__IPHONE_OS_VERSION_MIN_REQUIRED <= 80200) || !HAVE(AVKIT)
     258#if !HAVE(AVKIT)
    259259    return false;
    260260#else
     
    268268static bool shouldAllowPictureInPictureMediaPlayback()
    269269{
    270 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    271270    static bool shouldAllowPictureInPictureMediaPlayback = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
    272271    return shouldAllowPictureInPictureMediaPlayback;
    273 #else
    274     return false;
    275 #endif
    276272}
    277273
     
    29382934#if USE(IOSURFACE)
    29392935    // If we are parented and thus won't incur a significant penalty from paging in tiles, snapshot the view hierarchy directly.
    2940 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    29412936    if (CADisplay *display = self.window.screen._display) {
    2942 #else
    2943     if (self.window) {
    2944 #endif
    29452937        auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::ColorSpaceDeviceRGB);
    29462938        CGFloat imageScaleInViewCoordinates = imageWidth / rectInViewCoordinates.size.width;
    29472939        CATransform3D transform = CATransform3DMakeScale(imageScaleInViewCoordinates, imageScaleInViewCoordinates, 1);
    29482940        transform = CATransform3DTranslate(transform, -rectInViewCoordinates.origin.x, -rectInViewCoordinates.origin.y, 0);
    2949 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    29502941        CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(MACH_PORT_NULL, (CFStringRef)display.name, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform, 0);
    2951 #else
    2952         CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
    2953 #endif
    29542942        completionHandler(surface->createImage().get());
    29552943        return;
  • trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r188627 r190841  
    221221        }, data.leakRef());
    222222    }
    223 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     223#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    224224    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    225225#endif
     
    249249    parameters.httpProxy = [defaults stringForKey:WebKit2HTTPProxyDefaultsKey];
    250250    parameters.httpsProxy = [defaults stringForKey:WebKit2HTTPSProxyDefaultsKey];
    251 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     251#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    252252    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    253253#endif
  • trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

    r186125 r190841  
    170170    parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
    171171#endif
    172 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     172#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    173173    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    174174#endif
  • trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm

    r188521 r190841  
    117117    UIScreenEdgePanGestureRecognizer *recognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:target action:action];
    118118
    119 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    120119    bool isLTR = [UIView userInterfaceLayoutDirectionForSemanticContentAttribute:[_gestureRecognizerView.get() semanticContentAttribute]] == UIUserInterfaceLayoutDirectionLeftToRight;
    121 #else
    122     bool isLTR = true;
    123 #endif
    124120
    125121    switch ([self directionForTransition:transition]) {
  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

    r190568 r190841  
    216216@end
    217217
    218 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    219218@protocol UISelectionInteractionAssistant;
    220219#if HAVE(LINK_PREVIEW)
     
    224223#endif
    225224
    226 #endif
    227 
    228225@interface WKFormInputSession : NSObject <_WKFormInputSession>
    229226
     
    343340    [_longPressGestureRecognizer setDelay:tapAndHoldDelay];
    344341    [_longPressGestureRecognizer setDelegate:self];
    345 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    346342    [_longPressGestureRecognizer _setRequiresQuietImpulse:YES];
    347 #endif
    348343    [self addGestureRecognizer:_longPressGestureRecognizer.get()];
    349344
     
    12721267        return;
    12731268
    1274 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    12751269    _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] initWithInputAssistantItem:self.inputAssistantItem]);
    1276 #else
    1277     _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
    1278 #endif
    12791270    [_formAccessoryView setDelegate:self];
    12801271}
     
    25642555}
    25652556
    2566 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    25672557- (id<UISelectionInteractionAssistant>)selectionInteractionAssistant
    25682558{
     
    25712561    return nil;
    25722562}
    2573 #endif
    25742563
    25752564// NSRange support.  Would like to deprecate to the extent possible, although some support
  • trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm

    r187491 r190841  
    6868namespace WebKit {
    6969
    70 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 || !HAVE(AVKIT)
     70#if !HAVE(AVKIT)
    7171
    7272RefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy&)
  • trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm

    r186678 r190841  
    7272{
    7373    // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
    74 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
     74#if defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
    7575    return _UIImageGetWebKitPhotoLibraryIcon();
    7676#else
     
    8282{
    8383    // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
    84 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
     84#if defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
    8585    return _UIImageGetWebKitTakePhotoOrVideoIcon();
    8686#else
     
    140140
    141141    UIDocumentInteractionController *interactionController = [UIDocumentInteractionController interactionControllerWithURL:file];
    142 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
    143     return thumbnailSizedImageForImage(((UIImage *)interactionController.icons[0]).CGImage);
    144 #else
    145142    return thumbnailSizedImageForImage(interactionController.icons[0].CGImage);
    146 #endif
    147143}
    148144
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

    r190064 r190841  
    358358    visibleRect.intersect(m_scrolledExposedRect);
    359359
    360 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     360#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    361361    RefPtr<WebPage> retainedPage = &m_webPage;
    362362    [CATransaction addCommitHandler:[retainedPage] {
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

    r189105 r190841  
    420420            m_viewOverlayRootLayer->flushCompositingState(visibleRect, m_webPage.mainFrameView()->viewportIsStable());
    421421
    422 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     422#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    423423        RefPtr<WebPage> retainedPage = &m_webPage;
    424424        [CATransaction addCommitHandler:[retainedPage] {
  • trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

    r190336 r190841  
    168168    method_setImplementation(methodToPatch, (IMP)NSApplicationAccessibilityFocusedUIElement);
    169169#endif
    170 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     170#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
    171171    _CFNetworkSetATSContext(parameters.networkATSContext.get());
    172172#endif
    173173
    174 #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     174#if TARGET_OS_IPHONE
    175175    // Priority decay on iOS 9 is impacting page load time so we fix the priority of the WebProcess' main thread (rdar://problem/22003112).
    176176    pthread_set_fixedpriority_self();
  • trunk/Tools/ChangeLog

    r190836 r190841  
     12015-10-10  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove unnecessary iOS version checks
     4        https://bugs.webkit.org/show_bug.cgi?id=150002
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebKitTestRunner/ios/HIDEventGenerator.mm:
     9        (-[HIDEventGenerator _createIOHIDEventType:]):
     10        (-[HIDEventGenerator _sendHIDEvent:]):
     11        (-[HIDEventGenerator _sendMarkerHIDEventWithCompletionBlock:]):
     12        * WebKitTestRunner/ios/UIKitSPI.h:
     13
    1142015-10-09  Myles C. Maxfield  <mmaxfield@apple.com>
    215
  • trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm

    r190652 r190841  
    206206    }
    207207
    208 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    209208    if (_activePointCount) {
    210209        IOHIDFloat progress = _activePoints[0].pathPressure;
     
    218217        IOHIDEventAppendEvent(eventRef.get(), forceEvent.get(), 0);
    219218    }
    220 #endif
    221219
    222220    return eventRef.leakRef();
     
    234232            ASSERT(contextID);
    235233            BKSHIDEventSetDigitizerInfo(strongEvent.get(), contextID, false, false, NULL, 0, 0);
    236 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    237234            [[UIApplication sharedApplication] _enqueueHIDEvent:strongEvent.get()];
    238 #endif
    239235        });
    240236    }
     
    264260            ASSERT(contextID);
    265261            BKSHIDEventSetDigitizerInfo(markerEvent.get(), contextID, false, false, NULL, 0, 0);
    266 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    267262            [[UIApplication sharedApplication] _enqueueHIDEvent:markerEvent.get()];
    268 #endif
    269263        });
    270264    }
  • trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h

    r190565 r190841  
    4343
    4444@interface UIApplication ()
    45 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
    4645- (void)_enqueueHIDEvent:(IOHIDEventRef)event;
    47 #endif
    4846- (void)_handleHIDEvent:(IOHIDEventRef)event;
    4947@end
Note: See TracChangeset for help on using the changeset viewer.