Diff
Modified: branches/safari-604.1.28-branch/Source/_javascript_Core/ChangeLog (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/_javascript_Core/ChangeLog 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/_javascript_Core/ChangeLog 2017-06-29 18:06:14 UTC (rev 218946)
@@ -1,3 +1,11 @@
+2017-06-29 Dean Jackson <[email protected]>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+ * runtime/Options.h:
+
2017-06-28 Devin Rousso <[email protected]>
Web Inspector: Instrument active pixel memory used by canvases
Modified: branches/safari-604.1.28-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-06-29 18:06:14 UTC (rev 218946)
@@ -78,7 +78,7 @@
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
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 = ;
@@ -105,8 +105,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;
@@ -154,7 +154,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ENABLE_NOSNIFF;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -213,14 +213,12 @@
ENABLE_VIEW_MODE_CSS_MEDIA = ;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
+ENABLE_WEB_ANIMATIONS = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-604.1.28-branch/Source/_javascript_Core/runtime/Options.h (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/_javascript_Core/runtime/Options.h 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/_javascript_Core/runtime/Options.h 2017-06-29 18:06:14 UTC (rev 218946)
@@ -464,7 +464,7 @@
v(bool, useWebAssemblyFastTLS, true, Normal, "If true, we will try to use fast thread-local storage if available on the current platform.") \
v(bool, useFastTLSForWasmContext, true, Normal, "If true (and fast TLS is enabled), we will store context in fast TLS. If false, we will pin it to a register.") \
v(bool, useCallICsForWebAssemblyToJSCalls, true, Normal, "If true, we will use CallLinkInfo to inline cache Wasm to JS calls.") \
- v(bool, useObjectRestSpread, true, Normal, "If true, we will enable Object Rest/Spread feature.")
+ v(bool, useObjectRestSpread, false, Normal, "If true, we will enable Object Rest/Spread feature.")
enum OptionEquivalence {
Modified: branches/safari-604.1.28-branch/Source/WebCore/ChangeLog (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebCore/ChangeLog 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebCore/ChangeLog 2017-06-29 18:06:14 UTC (rev 218946)
@@ -1,3 +1,11 @@
+2017-06-29 Dean Jackson <[email protected]>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+ * page/Settings.in:
+
2017-06-28 Myles C. Maxfield <[email protected]>
Only apply font features for the particular type of font they are being applied to
Modified: branches/safari-604.1.28-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-06-29 18:06:14 UTC (rev 218946)
@@ -78,7 +78,7 @@
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
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 = ;
@@ -105,8 +105,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;
@@ -154,7 +154,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ENABLE_NOSNIFF;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -213,14 +213,12 @@
ENABLE_VIEW_MODE_CSS_MEDIA = ;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
+ENABLE_WEB_ANIMATIONS = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-604.1.28-branch/Source/WebCore/PAL/ChangeLog (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebCore/PAL/ChangeLog 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebCore/PAL/ChangeLog 2017-06-29 18:06:14 UTC (rev 218946)
@@ -1,3 +1,10 @@
+2017-06-29 Dean Jackson <[email protected]>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-06-28 Jonathan Bedard <[email protected]>
Build fix for PAL
Modified: branches/safari-604.1.28-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-06-29 18:06:14 UTC (rev 218946)
@@ -78,7 +78,7 @@
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
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 = ;
@@ -105,8 +105,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;
@@ -154,7 +154,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ENABLE_NOSNIFF;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -213,14 +213,12 @@
ENABLE_VIEW_MODE_CSS_MEDIA = ;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
+ENABLE_WEB_ANIMATIONS = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-604.1.28-branch/Source/WebCore/page/Settings.in (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebCore/page/Settings.in 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebCore/page/Settings.in 2017-06-29 18:06:14 UTC (rev 218946)
@@ -294,7 +294,11 @@
langAttributeAwareFormControlUIEnabled initial=false
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 110000)
+subresourceIntegrityEnabled initial=false
+#else
subresourceIntegrityEnabled initial=true
+#endif
constantPropertiesEnabled initial=false
Modified: branches/safari-604.1.28-branch/Source/WebKit/mac/ChangeLog (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebKit/mac/ChangeLog 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebKit/mac/ChangeLog 2017-06-29 18:06:14 UTC (rev 218946)
@@ -1,3 +1,10 @@
+2017-06-29 Dean Jackson <[email protected]>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-06-28 Simon Fraser <[email protected]>
Mark the GraphicsContext as accelerated when the WebHTMLView's layer is drawing asynchronously
Modified: branches/safari-604.1.28-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-06-29 18:06:14 UTC (rev 218946)
@@ -78,7 +78,7 @@
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
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 = ;
@@ -105,8 +105,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;
@@ -154,7 +154,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ENABLE_NOSNIFF;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -213,14 +213,12 @@
ENABLE_VIEW_MODE_CSS_MEDIA = ;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
+ENABLE_WEB_ANIMATIONS = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-604.1.28-branch/Source/WebKit2/ChangeLog (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebKit2/ChangeLog 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebKit2/ChangeLog 2017-06-29 18:06:14 UTC (rev 218946)
@@ -1,3 +1,11 @@
+2017-06-29 Dean Jackson <[email protected]>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/WebPreferencesDefinitions.h:
+
2017-06-28 Tim Horton <[email protected]>
MobileSafari was constantly using 10-15% CPU viewing a PDF
Modified: branches/safari-604.1.28-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-06-29 18:06:14 UTC (rev 218946)
@@ -78,7 +78,7 @@
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
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 = ;
@@ -105,8 +105,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;
@@ -154,7 +154,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ENABLE_NOSNIFF;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -213,14 +213,12 @@
ENABLE_VIEW_MODE_CSS_MEDIA = ;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
+ENABLE_WEB_ANIMATIONS = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-604.1.28-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (218945 => 218946)
--- branches/safari-604.1.28-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-06-29 18:06:14 UTC (rev 218946)
@@ -338,7 +338,7 @@
// Our Xcode build system does not currently have any concept of DEVELOPER_MODE.
// Cocoa ports must disable experimental features on release branches for now.
#if ENABLE(DEVELOPER_MODE) || PLATFORM(COCOA)
-#define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED true
+#define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED false
#else
#define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED false
#endif
@@ -362,7 +362,6 @@
macro(SubresourceIntegrityEnabled, subresourceIntegrityEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubresourceIntegrity", "Enable SubresourceIntegrity") \
macro(ViewportFitEnabled, viewportFitEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Viewport Fit", "Enable viewport-fit viewport parameter") \
macro(WebAnimationsEnabled, webAnimationsEnabled, Bool, bool, false, "Web Animations", "Web Animations prototype") \
- macro(WebGL2Enabled, webGL2Enabled, Bool, bool, false, "WebGL 2.0", "WebGL 2 prototype") \
macro(WebGPUEnabled, webGPUEnabled, Bool, bool, false, "WebGPU", "WebGPU prototype") \
macro(AsyncFrameScrollingEnabled, asyncFrameScrollingEnabled, Bool, bool, false, "Async Frame Scrolling", "Perform frame scrolling in a dedicated thread or process") \
\
Modified: branches/safari-604.1.28-branch/Tools/ChangeLog (218945 => 218946)
--- branches/safari-604.1.28-branch/Tools/ChangeLog 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Tools/ChangeLog 2017-06-29 18:06:14 UTC (rev 218946)
@@ -1,3 +1,10 @@
+2017-06-29 Dean Jackson <[email protected]>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2017-06-28 Tim Horton <[email protected]>
MobileSafari was constantly using 10-15% CPU viewing a PDF
Modified: branches/safari-604.1.28-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (218945 => 218946)
--- branches/safari-604.1.28-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-06-29 18:05:11 UTC (rev 218945)
+++ branches/safari-604.1.28-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-06-29 18:06:14 UTC (rev 218946)
@@ -78,7 +78,7 @@
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
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 = ;
@@ -105,8 +105,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;
@@ -154,7 +154,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
ENABLE_NOSNIFF = ENABLE_NOSNIFF;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
@@ -213,14 +213,12 @@
ENABLE_VIEW_MODE_CSS_MEDIA = ;
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
-ENABLE_WEBGL2 = ENABLE_WEBGL2;
+ENABLE_WEBGL2 = ;
ENABLE_WEBGPU = ENABLE_WEBGPU;
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
+ENABLE_WEB_ANIMATIONS = ;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
+ENABLE_WEB_REPLAY = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
