Diff
Modified: tags/Safari-605.1.24.2/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2018-01-20 01:57:43 UTC (rev 227256)
@@ -129,7 +129,7 @@
}
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
struct LockBase {
private:
WTF_EXPORT_PRIVATE void lockSlow();
Modified: tags/Safari-605.1.24.2/Source/WTF/wtf/spi/cocoa/NSMapTableSPI.h (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WTF/wtf/spi/cocoa/NSMapTableSPI.h 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WTF/wtf/spi/cocoa/NSMapTableSPI.h 2018-01-20 01:57:43 UTC (rev 227256)
@@ -25,7 +25,7 @@
#import <Foundation/NSMapTable.h>
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000
#if USE(APPLE_INTERNAL_SDK)
#import <Foundation/NSMapTablePriv.h>
Modified: tags/Safari-605.1.24.2/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-01-20 01:57:43 UTC (rev 227256)
@@ -34,7 +34,7 @@
#define USE_CFNETWORK_IGNORE_HSTS 1
/* FIXME: Remove after rdar 35390452 is fixed: */
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
#undef USE_CFNETWORK_IGNORE_HSTS
#define USE_CFNETWORK_IGNORE_HSTS 0
#endif
Modified: tags/Safari-605.1.24.2/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h 2018-01-20 01:57:43 UTC (rev 227256)
@@ -31,7 +31,7 @@
#define USE_SECURE_ARCHIVER_API ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110200) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40200) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 110200))
-#define USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 120000))
+#define USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 130000))
#if USE(SECURE_ARCHIVER_API)
#if USE(APPLE_INTERNAL_SDK)
Modified: tags/Safari-605.1.24.2/Source/WebCore/editing/cocoa/HTMLConverter.mm (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebCore/editing/cocoa/HTMLConverter.mm 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebCore/editing/cocoa/HTMLConverter.mm 2018-01-20 01:57:43 UTC (rev 227256)
@@ -1355,7 +1355,7 @@
static BOOL lookedUpClass = NO;
if (!lookedUpClass) {
// If the class is not there, we don't want to try again
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
_WebMessageDocumentClass = objc_lookUpClass("EditableWebMessageDocument");
#endif
if (!_WebMessageDocumentClass)
Modified: tags/Safari-605.1.24.2/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2018-01-20 01:57:43 UTC (rev 227256)
@@ -52,7 +52,7 @@
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
-#define USE_DRAW_PATH_DIRECT (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400))
+#define USE_DRAW_PATH_DIRECT (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))
// FIXME: The following using declaration should be in <wtf/HashFunctions.h>.
using WTF::pairIntHash;
Modified: tags/Safari-605.1.24.2/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-01-20 01:57:43 UTC (rev 227256)
@@ -37,7 +37,7 @@
#define SHOULD_USE_CORE_TEXT_FONT_LOOKUP (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
#define HAS_CORE_TEXT_WIDTH_ATTRIBUTE ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000))
-#define CAN_DISALLOW_USER_INSTALLED_FONTS ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400))
+#define CAN_DISALLOW_USER_INSTALLED_FONTS ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))
namespace WebCore {
Modified: tags/Safari-605.1.24.2/Source/WebCore/platform/mac/EventLoopMac.mm (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebCore/platform/mac/EventLoopMac.mm 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebCore/platform/mac/EventLoopMac.mm 2018-01-20 01:57:43 UTC (rev 227256)
@@ -30,7 +30,7 @@
void EventLoop::cycle()
{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
if (![NSApp isRunning]) {
[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.05]];
return;
Modified: tags/Safari-605.1.24.2/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2018-01-20 01:57:43 UTC (rev 227256)
@@ -586,7 +586,7 @@
static void AccessibilityProcessSuspendedNotification(bool suspended)
{
#if PLATFORM(MAC)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
// Calling _AXUIElementNotifyProcessSuspendStatus will crash if the NSApplication event loop is not running.
if (![NSApp isRunning])
return;
Modified: tags/Safari-605.1.24.2/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2018-01-20 01:57:43 UTC (rev 227256)
@@ -76,7 +76,7 @@
UNUSED_PARAM(launchOptions);
return true;
#else
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
// Boost the WebContent process if the NSApplication run loop is not used.
if (launchOptions.processType == ProcessLauncher::ProcessType::Web)
return true;
Modified: tags/Safari-605.1.24.2/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-01-20 01:57:43 UTC (rev 227256)
@@ -2580,7 +2580,7 @@
});
}
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 120000
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < 130000
- (void)changeSelectionWithTouchAt:(CGPoint)point withSelectionTouch:(UIWKSelectionTouch)touch baseIsStart:(BOOL)baseIsStart
{
[self changeSelectionWithTouchAt:point withSelectionTouch:touch baseIsStart:baseIsStart withFlags:UIWKNone];
@@ -5040,7 +5040,7 @@
dataForPreview[UIPreviewDataAttachmentList] = [uiDelegate _attachmentListForWebView:_webView];
dataForPreview[UIPreviewDataAttachmentIndex] = [NSNumber numberWithUnsignedInteger:index];
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
// FIXME: Replace the following NSString literal with a UIKit NSString constant.
dataForPreview[@"UIPreviewDataAttachmentListIsContentManaged"] = [NSNumber numberWithBool:sourceIsManaged];
#else
Modified: tags/Safari-605.1.24.2/Source/WebKit/WebProcess/WebProcess.cpp (227255 => 227256)
--- tags/Safari-605.1.24.2/Source/WebKit/WebProcess/WebProcess.cpp 2018-01-20 01:50:10 UTC (rev 227255)
+++ tags/Safari-605.1.24.2/Source/WebKit/WebProcess/WebProcess.cpp 2018-01-20 01:57:43 UTC (rev 227256)
@@ -216,7 +216,7 @@
void WebProcess::initializeProcess(const ChildProcessInitializationParameters& parameters)
{
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
// This call is needed when the WebProcess is not running the NSApplication event loop.
// Otherwise, calling enableSandboxStyleFileQuarantine() will fail.
launchServicesCheckIn();
