Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (209984 => 209985)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
@@ -1,3 +1,19 @@
+2016-12-19 Babak Shafiei <bshaf...@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2016-12-18 Mark Lam <mark....@apple.com>
Rename finallyActionRegister to completionTypeRegister and only store int JSValues in it.
Modified: branches/safari-603-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (209984 => 209985)
--- branches/safari-603-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
@@ -62,7 +62,7 @@
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-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 = ;
@@ -70,7 +70,7 @@
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS3_TEXT = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
ENABLE_CUSTOM_SCHEME_HANDLER = ;
@@ -92,9 +92,9 @@
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_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+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;
@@ -141,7 +141,7 @@
ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = ;
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -166,7 +166,7 @@
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC = ;
ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -191,11 +191,11 @@
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEBGL2 = ENABLE_WEBGL2;
-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_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-603-branch/Source/WTF/ChangeLog (209984 => 209985)
--- branches/safari-603-branch/Source/WTF/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WTF/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
@@ -1,3 +1,19 @@
+2016-12-19 Babak Shafiei <bshaf...@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * wtf/FeatureDefines.h:
+
2016-12-16 Mark Lam <mark....@apple.com>
Add predecessor info to dumps from JSC_dumpBytecodeLivenessResults=true.
Modified: branches/safari-603-branch/Source/WTF/wtf/FeatureDefines.h (209984 => 209985)
--- branches/safari-603-branch/Source/WTF/wtf/FeatureDefines.h 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WTF/wtf/FeatureDefines.h 2016-12-19 17:31:55 UTC (rev 209985)
@@ -228,11 +228,11 @@
#endif
#if !defined(ENABLE_INPUT_TYPE_COLOR)
-#define ENABLE_INPUT_TYPE_COLOR 1
+#define ENABLE_INPUT_TYPE_COLOR 0
#endif
#if !defined(ENABLE_INPUT_TYPE_COLOR_POPOVER)
-#define ENABLE_INPUT_TYPE_COLOR_POPOVER 1
+#define ENABLE_INPUT_TYPE_COLOR_POPOVER 0
#endif
#if !defined(ENABLE_FILE_REPLACEMENT)
@@ -600,7 +600,7 @@
#endif
#if !defined(ENABLE_NAVIGATOR_HWCONCURRENCY)
-#define ENABLE_NAVIGATOR_HWCONCURRENCY 1
+#define ENABLE_NAVIGATOR_HWCONCURRENCY 0
#endif
#if !defined(ENABLE_NETSCAPE_PLUGIN_API)
@@ -769,7 +769,7 @@
#endif
#if !defined(ENABLE_WILL_REVEAL_EDGE_EVENTS)
-#define ENABLE_WILL_REVEAL_EDGE_EVENTS 1
+#define ENABLE_WILL_REVEAL_EDGE_EVENTS 0
#endif
#if !defined(ENABLE_XSLT)
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (209984 => 209985)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
@@ -1,3 +1,19 @@
+2016-12-19 Babak Shafiei <bshaf...@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2016-12-18 Brady Eidson <beid...@apple.com>
IndexedDB 2.0: Prefetch cursor records in the server.
Modified: branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (209984 => 209985)
--- branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
@@ -62,7 +62,7 @@
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-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 = ;
@@ -70,7 +70,7 @@
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS3_TEXT = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
ENABLE_CUSTOM_SCHEME_HANDLER = ;
@@ -92,9 +92,9 @@
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_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+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;
@@ -141,7 +141,7 @@
ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = ;
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -166,7 +166,7 @@
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC = ;
ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -191,11 +191,11 @@
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEBGL2 = ENABLE_WEBGL2;
-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_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (209984 => 209985)
--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
@@ -1,3 +1,19 @@
+2016-12-19 Babak Shafiei <bshaf...@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2016-12-16 Dave Hyatt <hy...@apple.com>
[CSS Values] Make separate wrapper classes for the deprecated CSS Values OM
Modified: branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (209984 => 209985)
--- branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
@@ -62,7 +62,7 @@
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-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 = ;
@@ -70,7 +70,7 @@
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS3_TEXT = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
ENABLE_CUSTOM_SCHEME_HANDLER = ;
@@ -92,9 +92,9 @@
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_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+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;
@@ -141,7 +141,7 @@
ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = ;
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -166,7 +166,7 @@
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC = ;
ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -191,11 +191,11 @@
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEBGL2 = ENABLE_WEBGL2;
-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_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (209984 => 209985)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
@@ -1,3 +1,20 @@
+2016-12-19 Babak Shafiei <bshaf...@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/WebPreferencesDefinitions.h:
+
2016-12-18 Simon Fraser <simon.fra...@apple.com>
Expose a way for MiniBrowser to simulate header and footer banners
Modified: branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (209984 => 209985)
--- branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
@@ -62,7 +62,7 @@
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-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 = ;
@@ -70,7 +70,7 @@
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS3_TEXT = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
ENABLE_CUSTOM_SCHEME_HANDLER = ;
@@ -92,9 +92,9 @@
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_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+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;
@@ -141,7 +141,7 @@
ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = ;
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -166,7 +166,7 @@
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC = ;
ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -191,11 +191,11 @@
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEBGL2 = ENABLE_WEBGL2;
-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_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
Modified: branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (209984 => 209985)
--- branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-12-19 17:31:55 UTC (rev 209985)
@@ -248,6 +248,9 @@
macro(IntersectionObserverEnabled, intersectionObserverEnabled, Bool, bool, false, "Intersection Observer", "Enable Intersection Observer support") \
macro(InteractiveFormValidationEnabled, interactiveFormValidationEnabled, Bool, bool, DEFAULT_HTML_INTERACTIVE_FORM_VALIDATION_ENABLED, "HTML Interactive Form Validation", "HTML interactive form validation") \
macro(ShouldSuppressKeyboardInputDuringProvisionalNavigation, shouldSuppressKeyboardInputDuringProvisionalNavigation, Bool, bool, false, "", "") \
+ macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, true, "CSS Grid", "CSS Grid Layout Module support") \
+ macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, true, "Input Events", "Enable InputEvents support") \
+ macro(ES6ModulesEnabled, es6ModulesEnabled, Bool, bool, true, "ES6 Modules", "Enable ES6 Modules support") \
\
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
@@ -298,7 +301,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
@@ -313,15 +316,12 @@
// wider testing).
#define FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(macro) \
- macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "CSS Grid", "CSS Grid Layout Module support") \
macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "CSS Spring Animations", "CSS Spring Animation prototype") \
macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Gamepads", "Web Gamepad API support") \
macro(ModernMediaControlsEnabled, modernMediaControlsEnabled, Bool, bool, false, "Modern Media Controls", "Use modern media controls look") \
macro(VariationFontsEnabled, variationFontsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Variation Fonts", "Enable variation fonts") \
- macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Input Events", "Enable InputEvents support") \
macro(SubtleCryptoEnabled, subtleCryptoEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubtleCrypto", "Enable SubtleCrypto support") \
macro(WebGL2Enabled, webGL2Enabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "WebGL 2.0", "WebGL 2 prototype") \
- macro(ES6ModulesEnabled, es6ModulesEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "ES6 Modules", "Enable ES6 Modules support") \
\
#if PLATFORM(COCOA)
Modified: branches/safari-603-branch/Tools/ChangeLog (209984 => 209985)
--- branches/safari-603-branch/Tools/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Tools/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
@@ -1,3 +1,19 @@
+2016-12-19 Babak Shafiei <bshaf...@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <d...@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2016-12-18 Simon Fraser <simon.fra...@apple.com>
Expose a way for MiniBrowser to simulate header and footer banners
Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (209984 => 209985)
--- branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
@@ -62,7 +62,7 @@
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSP_NEXT = ;
-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 = ;
@@ -70,7 +70,7 @@
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
+ENABLE_CSS_SELECTORS_LEVEL4 = ;
ENABLE_CSS3_TEXT = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
ENABLE_CUSTOM_SCHEME_HANDLER = ;
@@ -92,9 +92,9 @@
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_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
+ENABLE_INDIE_UI = ;
+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;
@@ -141,7 +141,7 @@
ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
+ENABLE_MEDIA_STREAM = ;
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -166,7 +166,7 @@
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
+ENABLE_WEB_RTC = ;
ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
@@ -191,11 +191,11 @@
ENABLE_WEBASSEMBLY = ;
ENABLE_WEBGL = ENABLE_WEBGL;
ENABLE_WEBGL2 = ENABLE_WEBGL2;
-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_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;