<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190841] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190841">190841</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-10-10 13:05:53 -0700 (Sat, 10 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellvmlibraryLLVMExportscpp">trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFontcpp">trunk/Source/WebCore/loader/cache/CachedFont.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoah">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h</a></li>
<li><a href="#trunkSourceWebCorepagemacSettingsMacmm">trunk/Source/WebCore/page/mac/SettingsMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm">trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformSpeechSynthesizerIOSmm">trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSh">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKWindowmm">trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp">trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCertificateInfoMacmm">trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaAVKitSPIh">trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaCoreTextSPIh">trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNEFilterSourceSPIh">trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaSecuritySPIh">trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspiiosLaunchServicesSPIh">trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacAVFoundationSPIh">trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBreakIteratorcpp">trunk/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextFlagsh">trunk/Source/WebCore/platform/text/TextFlags.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextiosLocalizedDateCachemm">trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformtextmacLocaleMacmm">trunk/Source/WebCore/platform/text/mac/LocaleMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginControllerh">trunk/Source/WebKit/mac/Plugins/WebPluginController.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginControllermm">trunk/Source/WebKit/mac/Plugins/WebPluginController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosSafariServicesSPIh">trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginProcessCreationParametersh">trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventConversioncpp">trunk/Source/WebKit2/Shared/WebEventConversion.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharediosNativeWebTouchEventIOSmm">trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2SharediosWebPlatformTouchPointIOScpp">trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm">trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm">trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosformsWKFileUploadPanelmm">trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosHIDEventGeneratormm">trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosUIKitSPIh">trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-10-10 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Remove unnecessary iOS version checks
+ https://bugs.webkit.org/show_bug.cgi?id=150002
+
+ Reviewed by Alexey Proskuryakov.
+
+ * llvm/library/LLVMExports.cpp:
+ (initializeAndGetJSCLLVMAPI):
+
+2015-10-10 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> [iOS] Remove project support for iOS 8
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149993
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellvmlibraryLLVMExportscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> LLVMInitializeX86AsmPrinter();
</span><span class="cx"> LLVMInitializeX86Disassembler();
</span><span class="cx"> #elif CPU(ARM64)
</span><del>-#if (__IPHONE_OS_VERSION_MIN_REQUIRED > 80200) || OS(LINUX)
</del><ins>+#if PLATFORM(IOS) || OS(LINUX)
</ins><span class="cx"> LLVMInitializeAArch64TargetInfo();
</span><span class="cx"> LLVMInitializeAArch64Target();
</span><span class="cx"> LLVMInitializeAArch64TargetMC();
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WTF/ChangeLog 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-10-10 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Remove unnecessary iOS version checks
+ https://bugs.webkit.org/show_bug.cgi?id=150002
+
+ Reviewed by Alexey Proskuryakov.
+
+ * wtf/Platform.h:
+
+2015-10-10 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> [iOS] Remove project support for iOS 8
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149993
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WTF/wtf/Platform.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> #define USE_QUICK_LOOK 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(TARGET_OS_IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if TARGET_OS_IOS
</ins><span class="cx"> #define HAVE_APP_LINKS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -986,21 +986,21 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC)
</ins><span class="cx"> #define USE_COREMEDIA 1
</span><span class="cx"> #define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</ins><span class="cx"> #define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</del><ins>+#if PLATFORM(IOS) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</ins><span class="cx"> #define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
</span><span class="cx"> #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC)
</ins><span class="cx"> #define HAVE_AVFOUNDATION_LOADER_DELEGATE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1059,7 +1059,7 @@
</span><span class="cx"> #define USE_INSERTION_UNDO_GROUPING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
</del><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
</ins><span class="cx"> #define HAVE_TIMINGDATAOPTIONS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1117,7 +1117,7 @@
</span><span class="cx"> #define USE_MEDIATOOLBOX 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> #define ENABLE_VIDEO_PRESENTATION_MODE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/ChangeLog 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2015-10-10 Dan Bernstein <mitz@apple.com>
+
+ [iOS] Remove unnecessary iOS version checks
+ https://bugs.webkit.org/show_bug.cgi?id=150002
+
+ Reviewed by Alexey Proskuryakov.
+
+ * 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):
+
</ins><span class="cx"> 2015-10-10 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Rewrite HTMLDetailsElement using HTMLSlotElement
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> if (!m_fontCustomPlatformData && !errorOccurred() && !isLoading() && data) {
</span><span class="cx"> RefPtr<SharedBuffer> buffer(data);
</span><span class="cx">
</span><del>-#if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)
</del><ins>+#if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && !PLATFORM(IOS)
</ins><span class="cx"> if (isWOFF(buffer.get())) {
</span><span class="cx"> Vector<char> convertedFont;
</span><span class="cx"> if (!convertWOFFToSfnt(buffer.get(), convertedFont))
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> SessionID m_sessionID;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090)
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</ins><span class="cx">
</span><span class="cx"> inline void DiskCacheMonitor::monitorFileBackingStoreCreation(const ResourceRequest&, SessionID, CFCachedURLResponseRef)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacSettingsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/SettingsMac.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> static inline const char* sansSerifTraditionalHanFontFamily()
</span><span class="cx"> {
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
</del><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
</ins><span class="cx"> return "PingFang TC";
</span><span class="cx"> #else
</span><span class="cx"> return "Heiti TC";
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> static inline const char* sansSerifSimplifiedHanFontFamily()
</span><span class="cx"> {
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
</del><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
</ins><span class="cx"> return "PingFang SC";
</span><span class="cx"> #else
</span><span class="cx"> return "Heiti SC";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> static inline void appendOpenTypeFeature(CFMutableArrayRef features, const FontFeature& feature)
</span><span class="cx"> {
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
</del><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
</ins><span class="cx"> RetainPtr<CFStringRef> featureKey = adoptCF(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(feature.tag().data()), feature.tag().size() * sizeof(FontFeatureTag::value_type), kCFStringEncodingASCII, false));
</span><span class="cx"> int rawFeatureValue = feature.value();
</span><span class="cx"> RetainPtr<CFNumberRef> featureValue = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &rawFeatureValue));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -82,12 +82,8 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Unify this with platformLookupFallbackFont()
</span><span class="cx"> RetainPtr<CFStringRef> localeString;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 90000
</del><span class="cx"> if (!locale.isNull())
</span><span class="cx"> localeString = locale.string().createCFString();
</span><del>-#else
- UNUSED_PARAM(locale);
-#endif
</del><span class="cx">
</span><span class="cx"> CFIndex coveredLength = 0;
</span><span class="cx"> return adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, (const UTF16Char*)characters, (CFIndex)length, localeString.get(), &coveredLength));
</span><span class="lines">@@ -99,17 +95,12 @@
</span><span class="cx"> if (length && CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(font)).get()))
</span><span class="cx"> return getSystemFontFallbackForCharacters(font, locale, characters, length);
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> RetainPtr<CFStringRef> localeString;
</span><span class="cx"> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</span><span class="cx"> if (!locale.isNull())
</span><span class="cx"> localeString = locale.string().createCFString();
</span><span class="cx"> #endif
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(font, characters, length, localeString.get(), nullptr));
</span><del>-#else
- RetainPtr<CTFontRef> fallbackFont = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, nullptr, nullptr));
- RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCopyFontDescriptor(fallbackFont.get()));
-#endif
</del><span class="cx"> UChar32 c = *characters;
</span><span class="cx"> if (length > 1 && U16_IS_LEAD(c) && U16_IS_TRAIL(characters[1]))
</span><span class="cx"> c = U16_GET_SUPPLEMENTARY(c, characters[1]);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformSpeechSynthesizerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -249,13 +249,8 @@
</span><span class="cx"> for (AVSpeechSynthesisVoice *voice in [AVSpeechSynthesisVoiceClass speechVoices]) {
</span><span class="cx"> NSString *language = [voice language];
</span><span class="cx"> bool isDefault = true;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> NSString *voiceURI = [voice identifier];
</span><span class="cx"> NSString *name = [voice name];
</span><del>-#else
- NSString *voiceURI = language;
- NSString *name = language;
-#endif
</del><span class="cx"> m_voiceList.append(PlatformSpeechSynthesisVoice::create(voiceURI, name, language, true, isDefault));
</span><span class="cx"> }
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -33,9 +33,7 @@
</span><span class="cx"> wkIOSSystemVersion_4_2 = __IPHONE_4_2,
</span><span class="cx"> wkIOSSystemVersion_5_0 = __IPHONE_5_0,
</span><span class="cx"> wkIOSSystemVersion_6_0 = __IPHONE_6_0,
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> wkIOSSystemVersion_9_0 = __IPHONE_9_0,
</span><del>-#endif
</del><span class="cx"> } wkIOSSystemVersion;
</span><span class="cx">
</span><span class="cx"> bool iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
</del><ins>+#if !HAVE(AVKIT)
</ins><span class="cx">
</span><span class="cx"> @implementation WebVideoFullscreenController
</span><span class="cx"> - (void)setVideoElement:(WebCore::HTMLVideoElement*)videoElement
</span><span class="lines">@@ -638,6 +638,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
</del><ins>+#endif // !HAVE(AVKIT)
</ins><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef WebVideoFullscreenInterfaceAVKit_h
</span><span class="cx"> #define WebVideoFullscreenInterfaceAVKit_h
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/EventListener.h>
</span><span class="cx"> #include <WebCore/HTMLMediaElementEnums.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 80200 && HAVE(AVKIT)
</del><ins>+#if PLATFORM(IOS) && HAVE(AVKIT)
</ins><span class="cx">
</span><span class="cx"> #import "WebVideoFullscreenInterfaceAVKit.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKWindowmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -44,11 +44,7 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @protocol OrientationProvider
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
</del><span class="cx"> - (BOOL)hasLandscapeOrientation;
</span><del>-#else
-- (int)orientation;
-#endif
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> static WAKWindow *_WAKKeyWindow = nil; // weak
</span><span class="lines">@@ -621,12 +617,7 @@
</span><span class="cx"> + (BOOL)hasLandscapeOrientation
</span><span class="cx"> {
</span><span class="cx"> // this should be perfectly thread safe
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
</del><span class="cx"> return [gOrientationProvider hasLandscapeOrientation];
</span><del>-#else
- int orientation = [gOrientationProvider orientation];
- return orientation == 90 || orientation == -90;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CALayer*)hostLayer
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)
</del><ins>+#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
</ins><span class="cx"> enum {
</span><span class="cx"> CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3
</span><span class="cx"> };
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool secure = url.protocolIs("https");
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));
</span><span class="cx"> #else
</span><span class="cx"> // _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL is not available on other platforms.
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
</span><span class="cx"> {
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> CFArrayRef parsedCookies = _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
</span><span class="cx"> #else
</span><span class="cx"> CFArrayRef parsedCookies = CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCertificateInfoMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> bool CertificateInfo::containsNonRootSHA1SignedCertificate() const
</span><span class="cx"> {
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
</del><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
</ins><span class="cx"> if (!m_certificateChain)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> EXTERN_C CFDataRef _CFNetworkCopyATSContext(void);
</span><span class="cx"> EXTERN_C Boolean _CFNetworkSetATSContext(CFDataRef);
</span><span class="cx"> #endif
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> EXTERN_C void _CFNetworkResetHSTSHostsSinceDate(CFURLStorageSessionRef, CFDateRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> EXTERN_C CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage);
</span><span class="cx"> EXTERN_C CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
</span><span class="cx"> EXTERN_C CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef inAllocator, CFDictionaryRef headerFields, CFURLRef inURL);
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon).
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> @interface NSHTTPCookieStorage ()
</span><span class="cx"> + (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaAVKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -74,12 +74,6 @@
</span><span class="cx"> - (void)stopRoutingVideoToPictureInPicturePlayerLayerView;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-@protocol AVPlayerViewControllerDelegate <NSObject>
-- (void)playerViewController:(AVPlayerViewController *)playerViewController restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:(void (^)(BOOL restored))completionHandler;
-@end
-#endif
-
</del><span class="cx"> @protocol AVPlayerViewControllerDelegate_WebKitOnly <AVPlayerViewControllerDelegate>
</span><span class="cx"> @optional
</span><span class="cx"> typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
</span><span class="lines">@@ -101,21 +95,11 @@
</span><span class="cx"> - (void)startPictureInPicture;
</span><span class="cx"> - (void)stopPictureInPicture;
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-@property (nonatomic) BOOL allowsPictureInPicturePlayback;
-@property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;
-#endif
</del><span class="cx"> @property (nonatomic, strong) AVPlayerController *playerController;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-
-#import <AVKit/AVValueTiming.h>
-
-#else
-
</del><span class="cx"> @interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying>
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -124,8 +108,6 @@
</span><span class="cx"> @property (NS_NONATOMIC_IOSONLY, readonly) double currentValue;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCoreTextSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> extern const CFStringRef kCTFontDescriptorTextStyleEmphasized;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> extern const CFStringRef kCTUIFontTextStyleTitle1;
</span><span class="cx"> extern const CFStringRef kCTUIFontTextStyleTitle2;
</span><span class="cx"> extern const CFStringRef kCTUIFontTextStyleTitle3;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNEFilterSourceSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
</del><ins>+#define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> @property (copy) NSString *name;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> typedef enum {
</span><span class="cx"> kCATransactionPhasePreLayout,
</span><span class="cx"> kCATransactionPhasePreCommit,
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Move this into the APPLE_INTERNAL_SDK block once it's in an SDK.
</span><span class="cx"> @interface CAContext (AdditionalDetails)
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> - (void)invalidateFences;
</span><span class="cx"> #endif
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaSecuritySPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> EXTERN_C CFTypeRef SecTaskCopyValueForEntitlement(SecTaskRef, CFStringRef entitlement, CFErrorRef *);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
</del><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
</ins><span class="cx"> typedef uint32_t SecSignatureHashAlgorithm;
</span><span class="cx"> enum {
</span><span class="cx"> kSecSignatureHashAlgorithmUnknown = 0,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosLaunchServicesSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -30,9 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> #import <MobileCoreServices/LSAppLinkPriv.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -42,7 +40,6 @@
</span><span class="cx">
</span><span class="cx"> #if !USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> @interface LSResourceProxy : NSObject <NSCopying, NSSecureCoding>
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -62,7 +59,6 @@
</span><span class="cx"> - (void)openInWebBrowser:(BOOL)inWebBrowser setAppropriateOpenStrategyAndWebBrowserState:(NSDictionary<NSString *, id> *)state completionHandler:(LSAppLinkOpenCompletionHandler)completionHandler;
</span><span class="cx"> @property (readonly, strong) LSApplicationProxy *targetApplicationProxy;
</span><span class="cx"> @end
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacAVFoundationSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK) || __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
</del><ins>+#if !HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK)
</ins><span class="cx">
</span><span class="cx"> @interface AVPlayerLayer (AVPlayerLayerPictureInPictureModeSupportPrivate)
</span><span class="cx"> - (void)setPIPModeEnabled:(BOOL)flag;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx">
</span><span class="cx"> // FIXME: This needs a better name
</span><del>-#define ADDITIONAL_EMOJI_SUPPORT ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))
</del><ins>+#define ADDITIONAL_EMOJI_SUPPORT (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextFlagsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextFlags.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextFlags.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/text/TextFlags.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> // <rdar://problem/16980736>: Web fonts crash on certain OSes when using CTFontManagerCreateFontDescriptorFromData()
</span><span class="cx"> // FIXME: When we have moved entirely to CORETEXT_WEB_FONTS, remove the isCustomFont member variable from Font, since it will no longer be used.
</span><span class="cx"> // See https://bug-145873-attachments.webkit.org/attachment.cgi?id=254710
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000)
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</ins><span class="cx"> #define CORETEXT_WEB_FONTS 0
</span><span class="cx"> #else
</span><span class="cx"> #define CORETEXT_WEB_FONTS 1
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextiosLocalizedDateCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -155,11 +155,7 @@
</span><span class="cx"> // typically all equally wide. Force UTC timezone for the test date below so the
</span><span class="cx"> // date doesn't adjust for the current timezone. This is an arbitrary date
</span><span class="cx"> // (x-27-2007) and time (10:45 PM).
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</del><span class="cx"> RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]);
</span><del>-#else
- RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]);
-#endif
</del><span class="cx"> [gregorian.get() setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
</span><span class="cx"> RetainPtr<NSDateComponents> components = adoptNS([[NSDateComponents alloc] init]);
</span><span class="cx"> [components.get() setDay:27];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextmacLocaleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/mac/LocaleMac.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/mac/LocaleMac.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/platform/text/mac/LocaleMac.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -84,11 +84,7 @@
</span><span class="cx">
</span><span class="cx"> LocaleMac::LocaleMac(NSLocale* locale)
</span><span class="cx"> : m_locale(locale)
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || PLATFORM(MAC)
</del><span class="cx"> , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]))
</span><del>-#else
- , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]))
-#endif
</del><span class="cx"> , m_didInitializeNumberData(false)
</span><span class="cx"> {
</span><span class="cx"> NSArray* availableLanguages = [NSLocale ISOLanguageCodes];
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1093,11 +1093,9 @@
</span><span class="cx"> static NeverDestroyed<FontCascadeDescription> shortFootnoteFont;
</span><span class="cx"> static NeverDestroyed<FontCascadeDescription> shortCaption1Font;
</span><span class="cx"> static NeverDestroyed<FontCascadeDescription> tallBodyFont;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 80200
</del><span class="cx"> static NeverDestroyed<FontCascadeDescription> title1Font;
</span><span class="cx"> static NeverDestroyed<FontCascadeDescription> title2Font;
</span><span class="cx"> static NeverDestroyed<FontCascadeDescription> title3Font;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static CFStringRef userTextSize = contentSizeCategory();
</span><span class="cx">
</span><span class="lines">@@ -1123,14 +1121,12 @@
</span><span class="cx"> return headlineFont;
</span><span class="cx"> case CSSValueAppleSystemBody:
</span><span class="cx"> return bodyFont;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 80200
</del><span class="cx"> case CSSValueAppleSystemTitle1:
</span><span class="cx"> return title1Font;
</span><span class="cx"> case CSSValueAppleSystemTitle2:
</span><span class="cx"> return title2Font;
</span><span class="cx"> case CSSValueAppleSystemTitle3:
</span><span class="cx"> return title3Font;
</span><del>-#endif
</del><span class="cx"> case CSSValueAppleSystemSubheadline:
</span><span class="cx"> return subheadlineFont;
</span><span class="cx"> case CSSValueAppleSystemFootnote:
</span><span class="lines">@@ -1171,7 +1167,6 @@
</span><span class="cx"> textStyle = kCTUIFontTextStyleBody;
</span><span class="cx"> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
</span><span class="cx"> break;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> case CSSValueAppleSystemTitle1:
</span><span class="cx"> textStyle = kCTUIFontTextStyleTitle1;
</span><span class="cx"> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
</span><span class="lines">@@ -1184,7 +1179,6 @@
</span><span class="cx"> textStyle = kCTUIFontTextStyleTitle3;
</span><span class="cx"> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> case CSSValueAppleSystemSubheadline:
</span><span class="cx"> textStyle = kCTUIFontTextStyleSubhead;
</span><span class="cx"> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1106,7 +1106,7 @@
</span><span class="cx"> size_t sizeOfVerticalSubtable = appendKERNSubtable<SVGVKernElement>(&SVGVKernElement::buildVerticalKerningPair, 0);
</span><span class="cx"> ASSERT_UNUSED(sizeOfVerticalSubtable, subtablesOffset + sizeOfHorizontalSubtable + sizeOfVerticalSubtable == m_result.size());
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> // Work around a bug in Apple's font parser by adding some padding bytes. <rdar://problem/18401901>
</span><span class="cx"> for (int i = 0; i < 6; ++i)
</span><span class="cx"> m_result.append(0);
</span><span class="lines">@@ -1404,7 +1404,7 @@
</span><span class="cx"> processGlyphElement(glyphElement, &glyphElement, defaultHorizontalAdvance, defaultVerticalAdvance, unicodeAttribute, initialGlyph);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> // <rdar://problem/20086223> Cocoa has a bug where glyph bounding boxes are not correctly respected for frustum culling. Work around this by
</span><span class="cx"> // inflating the font's bounding box
</span><span class="cx"> m_boundingBox.extend(FloatPoint(0, 0));
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-10-10 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Remove unnecessary iOS version checks
+ https://bugs.webkit.org/show_bug.cgi?id=150002
+
+ Reviewed by Alexey Proskuryakov.
+
+ * 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):
+
+2015-10-10 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> [iOS] Remove project support for iOS 8
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149993
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -47,11 +47,7 @@
</span><span class="cx"> NSMutableSet *_checksInProgress;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-+ (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
-#else
</del><span class="cx"> - (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
</span><del>-#endif
</del><span class="cx"> + (BOOL)isPlugInView:(NSView *)view;
</span><span class="cx">
</span><span class="cx"> - (id)initWithDocumentView:(NSView *)view;
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -119,23 +119,6 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebPluginController
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-+ (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
-{
- initializeAudioSession();
- [pluginPackage load];
- Class viewFactory = [pluginPackage viewFactory];
-
- id view = nil;
-
- if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
- JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());
- view = [viewFactory plugInViewWithArguments:arguments];
- }
-
- return view;
-}
-#else
</del><span class="cx"> - (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -174,7 +157,6 @@
</span><span class="cx">
</span><span class="cx"> return view;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> + (void)addPlugInView:(NSView *)view
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1770,13 +1770,8 @@
</span><span class="cx"> LOG(Plugins, "arguments:\n%@", arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
- view = [WebPluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
- [attributes release];
-#else
</del><span class="cx"> view = [pluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
</span><span class="cx"> [attributes release];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return view;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1183,18 +1183,6 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebPreferences (WebPrivate)
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && !(__IPHONE_OS_VERSION_MIN_REQUIRED >= 60000)
-- (void) setWebInspectorServerEnabled:(BOOL)flag
-{
-}
-#endif
-
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-- (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag
-{
-}
-#endif
-
</del><span class="cx"> - (BOOL)isDNSPrefetchingEnabled
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitDNSPrefetchingEnabledPreferenceKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -455,8 +455,4 @@
</span><span class="cx"> @property (nonatomic) BOOL javaScriptMarkupEnabled;
</span><span class="cx"> @property (nonatomic) BOOL mediaDataLoadsAutomatically;
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-- (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag;
-#endif
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -851,7 +851,7 @@
</span><span class="cx">
</span><span class="cx"> static bool shouldAllowPictureInPictureMediaPlayback()
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> static bool shouldAllowPictureInPictureMediaPlayback = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
</span><span class="cx"> return shouldAllowPictureInPictureMediaPlayback;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1,5 +1,69 @@
</span><span class="cx"> 2015-10-10 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Remove unnecessary iOS version checks
+ https://bugs.webkit.org/show_bug.cgi?id=150002
+
+ Reviewed by Alexey Proskuryakov.
+
+ * 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):
+
+2015-10-10 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> [iOS] Remove project support for iOS 8
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149993
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> m_diskCacheDirectory = parameters.diskCacheDirectory;
</span><span class="cx">
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> _CFNetworkSetATSContext(parameters.networkATSContext.get());
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -613,7 +613,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> _AXUIElementNotifyProcessSuspendStatus(suspended ? AXSuspendStatusSuspended : AXSuspendStatusRunning);
</span><del>-#elif PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#elif PLATFORM(IOS)
</ins><span class="cx"> UIAccessibilityPostNotification(kAXPidStatusChangedNotification, @{ @"pid" : @(getpid()), @"suspended" : @(suspended) });
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(suspended);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosSafariServicesSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if HAVE(SAFARI_SERVICES_FRAMEWORK) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
</ins><span class="cx">
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <SafariServices/SFSafariViewController.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -595,9 +595,7 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, assign, getter=isNextEnabled) BOOL nextEnabled;
</span><span class="cx"> @property (nonatomic, assign, getter=isPreviousEnabled) BOOL previousEnabled;
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> - (id)initWithInputAssistantItem:(UITextInputAssistantItem *)inputAssistantItem;
</span><del>-#endif
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol UIWebFormAccessoryDelegate
</span><span class="lines">@@ -643,9 +641,7 @@
</span><span class="cx"> struct _UIWebTouchPoint* touchPoints;
</span><span class="cx"> unsigned touchPointCount;
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> bool isPotentialTap;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> @protocol UIWebTouchEventsGestureRecognizerDelegate
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> encoder << nsURLCacheDiskCapacity;
</span><span class="cx"> encoder << httpProxy;
</span><span class="cx"> encoder << httpsProxy;
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> IPC::encode(encoder, networkATSContext.get());
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.httpsProxy))
</span><span class="cx"> return false;
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> if (!IPC::decode(decoder, result.networkATSContext))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> String httpProxy;
</span><span class="cx"> String httpsProxy;
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> RetainPtr<CFDataRef> networkATSContext;
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> encoder << terminationTimeout;
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> encoder << acceleratedCompositingPort;
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> IPC::encode(encoder, networkATSContext.get());
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> if (!decoder.decode(result.acceleratedCompositingPort))
</span><span class="cx"> return false;
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> if (!IPC::decode(decoder, result.networkATSContext))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> WebCore::MachSendRight acceleratedCompositingPort;
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> RetainPtr<CFDataRef> networkATSContext;
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEventConversion.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WebKit2PlatformTouchPoint(const WebPlatformTouchPoint& webTouchPoint)
</span><span class="cx"> : PlatformTouchPoint(webTouchPoint.identifier(), webTouchPoint.location(), touchEventType(webTouchPoint)
</span><del>-#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> , webTouchPoint.force()
</span><span class="cx"> #endif
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> encoder << pluginLoadClientPolicies;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> IPC::encode(encoder, networkATSContext.get());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> if (!IPC::decode(decoder, parameters.networkATSContext))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> HashMap<String, HashMap<String, HashMap<String, uint8_t>>> pluginLoadClientPolicies;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> RetainPtr<CFDataRef> networkATSContext;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosNativeWebTouchEventIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> WebCore::IntPoint location = positionForCGPoint(touchPoint.locationInDocumentCoordinates);
</span><span class="cx"> WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase(touchPoint.phase);
</span><span class="cx"> WebPlatformTouchPoint platformTouchPoint = WebPlatformTouchPoint(identifier, location, phase);
</span><del>-#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> platformTouchPoint.setForce(touchPoint.force);
</span><span class="cx"> #endif
</span><span class="cx"> touchPointList.uncheckedAppend(platformTouchPoint);
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> event->timestamp,
</span><span class="cx"> extractWebTouchPoint(event),
</span><span class="cx"> positionForCGPoint(event->locationInDocumentCoordinates),
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP && UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP
</del><ins>+#if defined UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP && UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP
</ins><span class="cx"> event->isPotentialTap,
</span><span class="cx"> #else
</span><span class="cx"> true,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosWebPlatformTouchPointIOScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> encoder << m_identifier;
</span><span class="cx"> encoder << m_location;
</span><span class="cx"> encoder << m_phase;
</span><del>-#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> encoder << m_force;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_phase))
</span><span class="cx"> return false;
</span><del>-#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> if (!decoder.decode(result.m_force))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_mayAutomaticallyShowVideoPictureInPicture
</span><span class="cx"> {
</span><del>-#if (__IPHONE_OS_VERSION_MIN_REQUIRED <= 80200) || !HAVE(AVKIT)
</del><ins>+#if !HAVE(AVKIT)
</ins><span class="cx"> return false;
</span><span class="cx"> #else
</span><span class="cx"> if (!_page || !_page->videoFullscreenManager())
</span><span class="lines">@@ -267,12 +267,8 @@
</span><span class="cx">
</span><span class="cx"> static bool shouldAllowPictureInPictureMediaPlayback()
</span><span class="cx"> {
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> static bool shouldAllowPictureInPictureMediaPlayback = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
</span><span class="cx"> return shouldAllowPictureInPictureMediaPlayback;
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -2937,20 +2933,12 @@
</span><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> // If we are parented and thus won't incur a significant penalty from paging in tiles, snapshot the view hierarchy directly.
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> if (CADisplay *display = self.window.screen._display) {
</span><del>-#else
- if (self.window) {
-#endif
</del><span class="cx"> auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::ColorSpaceDeviceRGB);
</span><span class="cx"> CGFloat imageScaleInViewCoordinates = imageWidth / rectInViewCoordinates.size.width;
</span><span class="cx"> CATransform3D transform = CATransform3DMakeScale(imageScaleInViewCoordinates, imageScaleInViewCoordinates, 1);
</span><span class="cx"> transform = CATransform3DTranslate(transform, -rectInViewCoordinates.origin.x, -rectInViewCoordinates.origin.y, 0);
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(MACH_PORT_NULL, (CFStringRef)display.name, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform, 0);
</span><del>-#else
- CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
-#endif
</del><span class="cx"> completionHandler(surface->createImage().get());
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> [(NSData *)data release];
</span><span class="cx"> }, data.leakRef());
</span><span class="cx"> }
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx">
</span><span class="cx"> parameters.httpProxy = [defaults stringForKey:WebKit2HTTPProxyDefaultsKey];
</span><span class="cx"> parameters.httpsProxy = [defaults stringForKey:WebKit2HTTPSProxyDefaultsKey];
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> #if HAVE(HOSTED_CORE_ANIMATION)
</span><span class="cx"> parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
</span><span class="cx"> #endif
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -116,11 +116,7 @@
</span><span class="cx"> {
</span><span class="cx"> UIScreenEdgePanGestureRecognizer *recognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:target action:action];
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> bool isLTR = [UIView userInterfaceLayoutDirectionForSemanticContentAttribute:[_gestureRecognizerView.get() semanticContentAttribute]] == UIUserInterfaceLayoutDirectionLeftToRight;
</span><del>-#else
- bool isLTR = true;
-#endif
</del><span class="cx">
</span><span class="cx"> switch ([self directionForTransition:transition]) {
</span><span class="cx"> case WebKit::ViewGestureController::SwipeDirection::Back:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx"> + (BOOL)_addCompletion:(void(^)(BOOL))completion;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> @protocol UISelectionInteractionAssistant;
</span><span class="cx"> #if HAVE(LINK_PREVIEW)
</span><span class="cx"> @interface UIPreviewItemController (StagingToRemove)
</span><span class="lines">@@ -223,8 +222,6 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> @interface WKFormInputSession : NSObject <_WKFormInputSession>
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithContentView:(WKContentView *)view userObject:(NSObject <NSSecureCoding> *)userObject;
</span><span class="lines">@@ -342,9 +339,7 @@
</span><span class="cx"> _longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
</span><span class="cx"> [_longPressGestureRecognizer setDelay:tapAndHoldDelay];
</span><span class="cx"> [_longPressGestureRecognizer setDelegate:self];
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> [_longPressGestureRecognizer _setRequiresQuietImpulse:YES];
</span><del>-#endif
</del><span class="cx"> [self addGestureRecognizer:_longPressGestureRecognizer.get()];
</span><span class="cx">
</span><span class="cx"> #if HAVE(LINK_PREVIEW)
</span><span class="lines">@@ -1271,11 +1266,7 @@
</span><span class="cx"> if (_formAccessoryView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] initWithInputAssistantItem:self.inputAssistantItem]);
</span><del>-#else
- _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
-#endif
</del><span class="cx"> [_formAccessoryView setDelegate:self];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2563,14 +2554,12 @@
</span><span class="cx"> return _webSelectionAssistant.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> - (id<UISelectionInteractionAssistant>)selectionInteractionAssistant
</span><span class="cx"> {
</span><span class="cx"> if ([_webSelectionAssistant conformsToProtocol:@protocol(UISelectionInteractionAssistant)])
</span><span class="cx"> return (id<UISelectionInteractionAssistant>)_webSelectionAssistant.get();
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // NSRange support. Would like to deprecate to the extent possible, although some support
</span><span class="cx"> // (i.e. selectionRange) has shipped as API.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 || !HAVE(AVKIT)
</del><ins>+#if !HAVE(AVKIT)
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy&)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosformsWKFileUploadPanelmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> static inline UIImage *photoLibraryIcon()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
</del><ins>+#if defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
</ins><span class="cx"> return _UIImageGetWebKitPhotoLibraryIcon();
</span><span class="cx"> #else
</span><span class="cx"> return nil;
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> static inline UIImage *cameraIcon()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
</del><ins>+#if defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
</ins><span class="cx"> return _UIImageGetWebKitTakePhotoOrVideoIcon();
</span><span class="cx"> #else
</span><span class="cx"> return nil;
</span><span class="lines">@@ -139,11 +139,7 @@
</span><span class="cx"> ASSERT_ARG(file, [file isFileURL]);
</span><span class="cx">
</span><span class="cx"> UIDocumentInteractionController *interactionController = [UIDocumentInteractionController interactionControllerWithURL:file];
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
- return thumbnailSizedImageForImage(((UIImage *)interactionController.icons[0]).CGImage);
-#else
</del><span class="cx"> return thumbnailSizedImageForImage(interactionController.icons[0].CGImage);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static UIImage* iconForImageFile(NSURL *file)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> FloatRect visibleRect(FloatPoint(), m_viewSize);
</span><span class="cx"> visibleRect.intersect(m_scrolledExposedRect);
</span><span class="cx">
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> RefPtr<WebPage> retainedPage = &m_webPage;
</span><span class="cx"> [CATransaction addCommitHandler:[retainedPage] {
</span><span class="cx"> if (Page* corePage = retainedPage->corePage()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> if (m_viewOverlayRootLayer)
</span><span class="cx"> m_viewOverlayRootLayer->flushCompositingState(visibleRect, m_webPage.mainFrameView()->viewportIsStable());
</span><span class="cx">
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> RefPtr<WebPage> retainedPage = &m_webPage;
</span><span class="cx"> [CATransaction addCommitHandler:[retainedPage] {
</span><span class="cx"> if (Page* corePage = retainedPage->corePage()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -167,11 +167,11 @@
</span><span class="cx"> Method methodToPatch = class_getInstanceMethod([NSApplication class], @selector(accessibilityFocusedUIElement));
</span><span class="cx"> method_setImplementation(methodToPatch, (IMP)NSApplicationAccessibilityFocusedUIElement);
</span><span class="cx"> #endif
</span><del>-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</del><ins>+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</ins><span class="cx"> _CFNetworkSetATSContext(parameters.networkATSContext.get());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> // Priority decay on iOS 9 is impacting page load time so we fix the priority of the WebProcess' main thread (rdar://problem/22003112).
</span><span class="cx"> pthread_set_fixedpriority_self();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Tools/ChangeLog 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-10 Dan Bernstein <mitz@apple.com>
+
+ [iOS] Remove unnecessary iOS version checks
+ https://bugs.webkit.org/show_bug.cgi?id=150002
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKitTestRunner/ios/HIDEventGenerator.mm:
+ (-[HIDEventGenerator _createIOHIDEventType:]):
+ (-[HIDEventGenerator _sendHIDEvent:]):
+ (-[HIDEventGenerator _sendMarkerHIDEventWithCompletionBlock:]):
+ * WebKitTestRunner/ios/UIKitSPI.h:
+
</ins><span class="cx"> 2015-10-09 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r190689
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosHIDEventGeneratormm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -205,7 +205,6 @@
</span><span class="cx"> IOHIDEventAppendEvent(eventRef.get(), subEvent.get(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> if (_activePointCount) {
</span><span class="cx"> IOHIDFloat progress = _activePoints[0].pathPressure;
</span><span class="cx"> RetainPtr<IOHIDEventRef> forceEvent = adoptCF(IOHIDEventCreateForceEvent(kCFAllocatorDefault,
</span><span class="lines">@@ -217,7 +216,6 @@
</span><span class="cx"> kIOHIDEventOptionNone));
</span><span class="cx"> IOHIDEventAppendEvent(eventRef.get(), forceEvent.get(), 0);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return eventRef.leakRef();
</span><span class="cx"> }
</span><span class="lines">@@ -233,9 +231,7 @@
</span><span class="cx"> uint32_t contextID = [UIApplication sharedApplication].keyWindow._contextId;
</span><span class="cx"> ASSERT(contextID);
</span><span class="cx"> BKSHIDEventSetDigitizerInfo(strongEvent.get(), contextID, false, false, NULL, 0, 0);
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> [[UIApplication sharedApplication] _enqueueHIDEvent:strongEvent.get()];
</span><del>-#endif
</del><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> return YES;
</span><span class="lines">@@ -263,9 +259,7 @@
</span><span class="cx"> uint32_t contextID = [UIApplication sharedApplication].keyWindow._contextId;
</span><span class="cx"> ASSERT(contextID);
</span><span class="cx"> BKSHIDEventSetDigitizerInfo(markerEvent.get(), contextID, false, false, NULL, 0, 0);
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> [[UIApplication sharedApplication] _enqueueHIDEvent:markerEvent.get()];
</span><del>-#endif
</del><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> return YES;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h (190840 => 190841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h 2015-10-10 18:16:37 UTC (rev 190840)
+++ trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h 2015-10-10 20:05:53 UTC (rev 190841)
</span><span class="lines">@@ -42,9 +42,7 @@
</span><span class="cx"> #import "IOKitSPI.h"
</span><span class="cx">
</span><span class="cx"> @interface UIApplication ()
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</del><span class="cx"> - (void)_enqueueHIDEvent:(IOHIDEventRef)event;
</span><del>-#endif
</del><span class="cx"> - (void)_handleHIDEvent:(IOHIDEventRef)event;
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>