Diff
Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (226922 => 226923)
--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-12 23:56:24 UTC (rev 226922)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-12 23:56:28 UTC (rev 226923)
@@ -1,5 +1,21 @@
2018-01-12 Jason Marcell <[email protected]>
+ Apply patch. rdar://problem/36303061
+
+ Disable WebKit features we don't want to ship after branching
+ <rdar://problem/36303061>
+
+ 2018-01-12 Maciej Stachowiak <[email protected]>
+
+ Disable WebKit features we don't want to ship after branching
+ <rdar://problem/36303061>
+
+ Reviewed by Maciej Stachowiak.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2018-01-12 Jason Marcell <[email protected]>
+
Cherry-pick r226840. rdar://problem/36479468
2018-01-11 Michael Saboff <[email protected]>
Modified: branches/safari-605-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (226922 => 226923)
--- branches/safari-605-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-01-12 23:56:24 UTC (rev 226922)
+++ branches/safari-605-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-01-12 23:56:28 UTC (rev 226923)
@@ -78,12 +78,12 @@
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = ;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
@@ -106,8 +106,8 @@
ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -213,7 +213,7 @@
ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
@@ -222,7 +222,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_ASYNC_ITERATION = ENABLE_ASYNC_ITERATION;
+ENABLE_ASYNC_ITERATION = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226922 => 226923)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 23:56:24 UTC (rev 226922)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 23:56:28 UTC (rev 226923)
@@ -1,5 +1,21 @@
2018-01-12 Jason Marcell <[email protected]>
+ Apply patch. rdar://problem/36303061
+
+ Disable WebKit features we don't want to ship after branching
+ <rdar://problem/36303061>
+
+ 2018-01-12 Maciej Stachowiak <[email protected]>
+
+ Disable WebKit features we don't want to ship after branching
+ <rdar://problem/36303061>
+
+ Reviewed by Maciej Stachowiak.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2018-01-12 Jason Marcell <[email protected]>
+
Cherry-pick r226905. rdar://problem/36483899
2018-01-12 Jer Noble <[email protected]>
Modified: branches/safari-605-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (226922 => 226923)
--- branches/safari-605-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-01-12 23:56:24 UTC (rev 226922)
+++ branches/safari-605-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-01-12 23:56:28 UTC (rev 226923)
@@ -78,12 +78,12 @@
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = ;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
@@ -106,8 +106,8 @@
ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -213,7 +213,7 @@
ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
@@ -222,7 +222,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_ASYNC_ITERATION = ENABLE_ASYNC_ITERATION;
+ENABLE_ASYNC_ITERATION = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (226922 => 226923)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-12 23:56:24 UTC (rev 226922)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-12 23:56:28 UTC (rev 226923)
@@ -1,5 +1,21 @@
2018-01-12 Jason Marcell <[email protected]>
+ Apply patch. rdar://problem/36303061
+
+ Disable WebKit features we don't want to ship after branching
+ <rdar://problem/36303061>
+
+ 2018-01-12 Maciej Stachowiak <[email protected]>
+
+ Disable WebKit features we don't want to ship after branching
+ <rdar://problem/36303061>
+
+ Reviewed by Maciej Stachowiak.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2018-01-12 Jason Marcell <[email protected]>
+
Cherry-pick r226792. rdar://problem/36450742
2018-01-11 Youenn Fablet <[email protected]>
Modified: branches/safari-605-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig (226922 => 226923)
--- branches/safari-605-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-01-12 23:56:24 UTC (rev 226922)
+++ branches/safari-605-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-01-12 23:56:28 UTC (rev 226923)
@@ -78,12 +78,12 @@
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = ;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
@@ -106,8 +106,8 @@
ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -213,7 +213,7 @@
ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
@@ -222,7 +222,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_ASYNC_ITERATION = ENABLE_ASYNC_ITERATION;
+ENABLE_ASYNC_ITERATION = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog (226922 => 226923)
--- branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog 2018-01-12 23:56:24 UTC (rev 226922)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog 2018-01-12 23:56:28 UTC (rev 226923)
@@ -1,3 +1,19 @@
+2018-01-12 Jason Marcell <[email protected]>
+
+ Apply patch. rdar://problem/36303061
+
+ Disable WebKit features we don't want to ship after branching
+ <rdar://problem/36303061>
+
+ 2018-01-12 Maciej Stachowiak <[email protected]>
+
+ Disable WebKit features we don't want to ship after branching
+ <rdar://problem/36303061>
+
+ Reviewed by Maciej Stachowiak.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-01-08 David Kilzer <[email protected]>
Build fix #2: Enable -Wcast-qual for WebInspectorUI, WebKitLegacy, WebKit projects
Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (226922 => 226923)
--- branches/safari-605-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-01-12 23:56:24 UTC (rev 226922)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-01-12 23:56:28 UTC (rev 226923)
@@ -78,12 +78,12 @@
ENABLE_AVF_CAPTIONS = ENABLE_AVF_CAPTIONS;
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
-ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA = ;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
@@ -106,8 +106,8 @@
ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
@@ -213,7 +213,7 @@
ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
@@ -222,7 +222,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_ASYNC_ITERATION = ENABLE_ASYNC_ITERATION;
+ENABLE_ASYNC_ITERATION = ;
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphone*] = $(ENABLE_FAST_JIT_PERMISSIONS_ios);
ENABLE_FAST_JIT_PERMISSIONS[sdk=iphoneos10*] = ;
