Attachment 368378 Details for Bug 197313 – Patch

[patch] Patch

bug-197313-20190426183559.patch (text/plain), 22.32 KB, created by Jessie Berlin on 2019-04-26 18:36:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jessie Berlin

Created: 2019-04-26 18:36:00 PDT

Size: 22.32 KB

patch

obsolete

>Subversion Revision: 244586
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 53e375bca44fe93b6818d7621757437cd5dec58d..2c1f1260c85afc26a49661f8f33ac3534484a3af 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-26  Jessie Berlin  <jberlin@webkit.org>
>+
>+        Add new mac target numbers
>+        https://bugs.webkit.org/show_bug.cgi?id=197313
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Version.xcconfig:
>+        * Configurations/WebKitTargetConditionals.xcconfig:
>+
> 2019-04-23  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] Shrink DFG::MinifiedNode
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index bd2fd5295530e19a36a02dbbbc4dab5f28e09780..b56831f77d5099c9c61cbf38bc5a757e936fb201 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-26  Jessie Berlin  <jberlin@webkit.org>
>+
>+        Add new mac target numbers
>+        https://bugs.webkit.org/show_bug.cgi?id=197313
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Version.xcconfig:
>+        * Configurations/WebKitTargetConditionals.xcconfig:
>+
> 2019-04-23  Alex Christensen  <achristensen@webkit.org>
> 
>         Add unit tests for WKWebView.serverTrust
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 68caca74c800832d68cd867ffb0d24a94fbaedd8..434a50306bb830d3e8193ad28c7cba4e8224fcd4 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-26  Jessie Berlin  <jberlin@webkit.org>
>+
>+        Add new mac target numbers
>+        https://bugs.webkit.org/show_bug.cgi?id=197313
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Version.xcconfig:
>+        * Configurations/WebKitTargetConditionals.xcconfig:
>+
> 2019-04-24  Philippe Normand  <pnormand@igalia.com>
> 
>         [GStreamer] Crash in AudioTrackPrivate with playbin3 enabled
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 4a28ff62055e8058a17a87f89a0438ef59d3cdb4..7c7b0cb8a7a0d3d8c38dbd04fbac8437f6534bc1 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-26  Jessie Berlin  <jberlin@webkit.org>
>+
>+        Add new mac target numbers
>+        https://bugs.webkit.org/show_bug.cgi?id=197313
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Version.xcconfig:
>+        * Configurations/WebKitTargetConditionals.xcconfig:
>+
> 2019-04-23  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r244556.
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 985fe6bb15169853ffcd78784ccfd7d25d8731f0..5168859193a2430b7164c255c12f241ec65897aa 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-04-26  Jessie Berlin  <jberlin@webkit.org>
>+
>+        Add new mac target numbers
>+        https://bugs.webkit.org/show_bug.cgi?id=197313
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Version.xcconfig:
>+
> 2019-04-23  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: REGRESSION(r238168): Network: preserve log doesn't show main frame main resource changes
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c5857c07ec51727f69cdd2f08b730dabc620041c..67f31b0b2e53f74dea47bc3f26506ede642b8dbb 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-26  Jessie Berlin  <jberlin@webkit.org>
>+
>+        Add new mac target numbers
>+        https://bugs.webkit.org/show_bug.cgi?id=197313
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Version.xcconfig:
>+        * Configurations/WebKitTargetConditionals.xcconfig:
>+
> 2019-04-24  Dean Jackson  <dino@apple.com>
> 
>         Rename _highlightLongPressCanClick and only add gesture recognizer when necessary
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 5f162a300a1ce18d719acc50c3d0015e83945a19..afacad46e8b052d8dd0943ab2ca1b24dab60ee79 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-26  Jessie Berlin  <jberlin@webkit.org>
>+
>+        Add new mac target numbers
>+        https://bugs.webkit.org/show_bug.cgi?id=197313
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/Version.xcconfig:
>+        * Configurations/WebKitTargetConditionals.xcconfig:
>+
> 2019-04-23  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r244556.
>diff --git a/Source/JavaScriptCore/Configurations/Version.xcconfig b/Source/JavaScriptCore/Configurations/Version.xcconfig
>index f89d3fd88449a58e6f6515f102127fe2e17fdfdd..8511c5f97b3a6502f557773e4757f15e53ad5e41 100644
>--- a/Source/JavaScriptCore/Configurations/Version.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/Version.xcconfig
>@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
>diff --git a/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig b/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig
>index f0e5315f28f0d97cc499c6aeba1519fa46183285..b5346797adeb2352d47a5fd0134f36fb96ea9fa4 100644
>--- a/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig
>@@ -60,6 +60,12 @@ WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>+WK_MACOS_BEFORE_1016 = $(WK_MACOS_BEFORE_1016_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>+WK_MACOS_BEFORE_1016_101200 = YES;
>+WK_MACOS_BEFORE_1016_101300 = YES;
>+WK_MACOS_BEFORE_1016_101400 = YES;
>+WK_MACOS_BEFORE_1016_101500 = YES;
>+
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>@@ -72,6 +78,10 @@ WK_MACOS_1013_1015 = $(WK_MACOS_1013_1015_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1013_1015_YES = _MACOS_BEFORE_1013;
> 
>+WK_MACOS_1013_1016 = $(WK_MACOS_1013_1016_$(WK_MACOS_BEFORE_1013));
>+WK_MACOS_1013_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1013_1016_YES = _MACOS_BEFORE_1013;
>+
> WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_ = _MACOS_SINCE_1014;
> WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
>@@ -80,10 +90,22 @@ WK_MACOS_1014_1015 = $(WK_MACOS_1014_1015_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1014_1015_YES = _MACOS_BEFORE_1014;
> 
>+WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
>+WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
>+
> WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
> WK_MACOS_1015_ = _MACOS_SINCE_1015;
> WK_MACOS_1015_YES = _MACOS_BEFORE_1015;
> 
>+WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
>+WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
>+
>+WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
>+WK_MACOS_1016_ = _MACOS_SINCE_1016;
>+WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
>+
> // iOS
> 
> WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
>index f89d3fd88449a58e6f6515f102127fe2e17fdfdd..8511c5f97b3a6502f557773e4757f15e53ad5e41 100644
>--- a/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
>+++ b/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
>@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
>index f0e5315f28f0d97cc499c6aeba1519fa46183285..b5346797adeb2352d47a5fd0134f36fb96ea9fa4 100644
>--- a/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
>+++ b/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
>@@ -60,6 +60,12 @@ WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>+WK_MACOS_BEFORE_1016 = $(WK_MACOS_BEFORE_1016_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>+WK_MACOS_BEFORE_1016_101200 = YES;
>+WK_MACOS_BEFORE_1016_101300 = YES;
>+WK_MACOS_BEFORE_1016_101400 = YES;
>+WK_MACOS_BEFORE_1016_101500 = YES;
>+
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>@@ -72,6 +78,10 @@ WK_MACOS_1013_1015 = $(WK_MACOS_1013_1015_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1013_1015_YES = _MACOS_BEFORE_1013;
> 
>+WK_MACOS_1013_1016 = $(WK_MACOS_1013_1016_$(WK_MACOS_BEFORE_1013));
>+WK_MACOS_1013_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1013_1016_YES = _MACOS_BEFORE_1013;
>+
> WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_ = _MACOS_SINCE_1014;
> WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
>@@ -80,10 +90,22 @@ WK_MACOS_1014_1015 = $(WK_MACOS_1014_1015_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1014_1015_YES = _MACOS_BEFORE_1014;
> 
>+WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
>+WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
>+
> WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
> WK_MACOS_1015_ = _MACOS_SINCE_1015;
> WK_MACOS_1015_YES = _MACOS_BEFORE_1015;
> 
>+WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
>+WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
>+
>+WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
>+WK_MACOS_1016_ = _MACOS_SINCE_1016;
>+WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
>+
> // iOS
> 
> WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
>diff --git a/Source/WebCore/Configurations/Version.xcconfig b/Source/WebCore/Configurations/Version.xcconfig
>index d15eed6b27e4c8096b770f898ff4ccc2ddcc2b2c..f9d48a3b9203f5f8fa2297d2110eccafff8ab586 100644
>--- a/Source/WebCore/Configurations/Version.xcconfig
>+++ b/Source/WebCore/Configurations/Version.xcconfig
>@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
>diff --git a/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
>index f0e5315f28f0d97cc499c6aeba1519fa46183285..b5346797adeb2352d47a5fd0134f36fb96ea9fa4 100644
>--- a/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
>+++ b/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
>@@ -60,6 +60,12 @@ WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>+WK_MACOS_BEFORE_1016 = $(WK_MACOS_BEFORE_1016_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>+WK_MACOS_BEFORE_1016_101200 = YES;
>+WK_MACOS_BEFORE_1016_101300 = YES;
>+WK_MACOS_BEFORE_1016_101400 = YES;
>+WK_MACOS_BEFORE_1016_101500 = YES;
>+
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>@@ -72,6 +78,10 @@ WK_MACOS_1013_1015 = $(WK_MACOS_1013_1015_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1013_1015_YES = _MACOS_BEFORE_1013;
> 
>+WK_MACOS_1013_1016 = $(WK_MACOS_1013_1016_$(WK_MACOS_BEFORE_1013));
>+WK_MACOS_1013_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1013_1016_YES = _MACOS_BEFORE_1013;
>+
> WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_ = _MACOS_SINCE_1014;
> WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
>@@ -80,10 +90,22 @@ WK_MACOS_1014_1015 = $(WK_MACOS_1014_1015_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1014_1015_YES = _MACOS_BEFORE_1014;
> 
>+WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
>+WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
>+
> WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
> WK_MACOS_1015_ = _MACOS_SINCE_1015;
> WK_MACOS_1015_YES = _MACOS_BEFORE_1015;
> 
>+WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
>+WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
>+
>+WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
>+WK_MACOS_1016_ = _MACOS_SINCE_1016;
>+WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
>+
> // iOS
> 
> WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
>diff --git a/Source/WebCore/PAL/Configurations/Version.xcconfig b/Source/WebCore/PAL/Configurations/Version.xcconfig
>index 7e64a78e61c2df9819d3e5effd2a358df994a598..b6e67abe1525a699e5f1e1dec60ee4dc06ef0541 100644
>--- a/Source/WebCore/PAL/Configurations/Version.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/Version.xcconfig
>@@ -39,6 +39,7 @@ SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
> 
> // The production build always uses the full version with a system version prefix.
> BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
>diff --git a/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
>index f0e5315f28f0d97cc499c6aeba1519fa46183285..b5346797adeb2352d47a5fd0134f36fb96ea9fa4 100644
>--- a/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
>@@ -60,6 +60,12 @@ WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>+WK_MACOS_BEFORE_1016 = $(WK_MACOS_BEFORE_1016_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>+WK_MACOS_BEFORE_1016_101200 = YES;
>+WK_MACOS_BEFORE_1016_101300 = YES;
>+WK_MACOS_BEFORE_1016_101400 = YES;
>+WK_MACOS_BEFORE_1016_101500 = YES;
>+
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>@@ -72,6 +78,10 @@ WK_MACOS_1013_1015 = $(WK_MACOS_1013_1015_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1013_1015_YES = _MACOS_BEFORE_1013;
> 
>+WK_MACOS_1013_1016 = $(WK_MACOS_1013_1016_$(WK_MACOS_BEFORE_1013));
>+WK_MACOS_1013_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1013_1016_YES = _MACOS_BEFORE_1013;
>+
> WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_ = _MACOS_SINCE_1014;
> WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
>@@ -80,10 +90,22 @@ WK_MACOS_1014_1015 = $(WK_MACOS_1014_1015_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1014_1015_YES = _MACOS_BEFORE_1014;
> 
>+WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
>+WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
>+
> WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
> WK_MACOS_1015_ = _MACOS_SINCE_1015;
> WK_MACOS_1015_YES = _MACOS_BEFORE_1015;
> 
>+WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
>+WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
>+
>+WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
>+WK_MACOS_1016_ = _MACOS_SINCE_1016;
>+WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
>+
> // iOS
> 
> WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
>diff --git a/Source/WebInspectorUI/Configurations/Version.xcconfig b/Source/WebInspectorUI/Configurations/Version.xcconfig
>index 149c5a8a0e9cbe006e0181b449db52162f27ffcc..cc6e325134545c84158210d5b6ec352aacfd115b 100644
>--- a/Source/WebInspectorUI/Configurations/Version.xcconfig
>+++ b/Source/WebInspectorUI/Configurations/Version.xcconfig
>@@ -12,6 +12,7 @@ SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
> 
> BUNDLE_VERSION = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
> SHORT_VERSION_STRING = $(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION);
>diff --git a/Source/WebKit/Configurations/Version.xcconfig b/Source/WebKit/Configurations/Version.xcconfig
>index e5090b848be146cdc533c35146812f3707d5d96a..6461a5912174ed884ae21b682f722d37cbc12c43 100644
>--- a/Source/WebKit/Configurations/Version.xcconfig
>+++ b/Source/WebKit/Configurations/Version.xcconfig
>@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
>diff --git a/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
>index f0e5315f28f0d97cc499c6aeba1519fa46183285..b5346797adeb2352d47a5fd0134f36fb96ea9fa4 100644
>--- a/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
>+++ b/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
>@@ -60,6 +60,12 @@ WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>+WK_MACOS_BEFORE_1016 = $(WK_MACOS_BEFORE_1016_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>+WK_MACOS_BEFORE_1016_101200 = YES;
>+WK_MACOS_BEFORE_1016_101300 = YES;
>+WK_MACOS_BEFORE_1016_101400 = YES;
>+WK_MACOS_BEFORE_1016_101500 = YES;
>+
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>@@ -72,6 +78,10 @@ WK_MACOS_1013_1015 = $(WK_MACOS_1013_1015_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1013_1015_YES = _MACOS_BEFORE_1013;
> 
>+WK_MACOS_1013_1016 = $(WK_MACOS_1013_1016_$(WK_MACOS_BEFORE_1013));
>+WK_MACOS_1013_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1013_1016_YES = _MACOS_BEFORE_1013;
>+
> WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_ = _MACOS_SINCE_1014;
> WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
>@@ -80,10 +90,22 @@ WK_MACOS_1014_1015 = $(WK_MACOS_1014_1015_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1014_1015_YES = _MACOS_BEFORE_1014;
> 
>+WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
>+WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
>+
> WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
> WK_MACOS_1015_ = _MACOS_SINCE_1015;
> WK_MACOS_1015_YES = _MACOS_BEFORE_1015;
> 
>+WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
>+WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
>+
>+WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
>+WK_MACOS_1016_ = _MACOS_SINCE_1016;
>+WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
>+
> // iOS
> 
> WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
>diff --git a/Source/WebKitLegacy/mac/Configurations/Version.xcconfig b/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
>index d15eed6b27e4c8096b770f898ff4ccc2ddcc2b2c..f9d48a3b9203f5f8fa2297d2110eccafff8ab586 100644
>--- a/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
>@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
> SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
>diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
>index f0e5315f28f0d97cc499c6aeba1519fa46183285..b5346797adeb2352d47a5fd0134f36fb96ea9fa4 100644
>--- a/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
>@@ -60,6 +60,12 @@ WK_MACOS_BEFORE_1015_101200 = YES;
> WK_MACOS_BEFORE_1015_101300 = YES;
> WK_MACOS_BEFORE_1015_101400 = YES;
> 
>+WK_MACOS_BEFORE_1016 = $(WK_MACOS_BEFORE_1016_$(TARGET_MAC_OS_X_VERSION_MAJOR));
>+WK_MACOS_BEFORE_1016_101200 = YES;
>+WK_MACOS_BEFORE_1016_101300 = YES;
>+WK_MACOS_BEFORE_1016_101400 = YES;
>+WK_MACOS_BEFORE_1016_101500 = YES;
>+
> WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_ = _MACOS_SINCE_1013;
> WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
>@@ -72,6 +78,10 @@ WK_MACOS_1013_1015 = $(WK_MACOS_1013_1015_$(WK_MACOS_BEFORE_1013));
> WK_MACOS_1013_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1013_1015_YES = _MACOS_BEFORE_1013;
> 
>+WK_MACOS_1013_1016 = $(WK_MACOS_1013_1016_$(WK_MACOS_BEFORE_1013));
>+WK_MACOS_1013_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1013_1016_YES = _MACOS_BEFORE_1013;
>+
> WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_ = _MACOS_SINCE_1014;
> WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
>@@ -80,10 +90,22 @@ WK_MACOS_1014_1015 = $(WK_MACOS_1014_1015_$(WK_MACOS_BEFORE_1014));
> WK_MACOS_1014_1015_ = $(WK_MACOS_1015);
> WK_MACOS_1014_1015_YES = _MACOS_BEFORE_1014;
> 
>+WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
>+WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
>+
> WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
> WK_MACOS_1015_ = _MACOS_SINCE_1015;
> WK_MACOS_1015_YES = _MACOS_BEFORE_1015;
> 
>+WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
>+WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
>+WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
>+
>+WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
>+WK_MACOS_1016_ = _MACOS_SINCE_1016;
>+WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
>+
> // iOS
> 
> WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));

Actions: View | Formatted Diff | Diff

Attachments on bug 197313: 368321 | 368378