Diff
Modified: branches/safari-604-branch/Source/_javascript_Core/ChangeLog (219580 => 219581)
--- branches/safari-604-branch/Source/_javascript_Core/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/_javascript_Core/ChangeLog 2017-07-17 22:56:45 UTC (rev 219581)
@@ -1,3 +1,15 @@
+2017-07-17 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219413. rdar://problem/33337335
+
+ 2017-06-29 Dean Jackson <d...@apple.com>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+ * runtime/Options.h:
+
2017-07-17 Saam Barati <sbar...@apple.com>
Remove custom defined RELEASE_ASSERT in DFGObjectAllocationSinkingPhase
Modified: branches/safari-604-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (219580 => 219581)
--- branches/safari-604-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-07-17 22:56:45 UTC (rev 219581)
@@ -74,7 +74,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 = ;
@@ -101,8 +101,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;
@@ -150,7 +150,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;
@@ -208,10 +208,10 @@
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_SOCKETS = ENABLE_WEB_SOCKETS;
Modified: branches/safari-604-branch/Source/_javascript_Core/runtime/Options.h (219580 => 219581)
--- branches/safari-604-branch/Source/_javascript_Core/runtime/Options.h 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/_javascript_Core/runtime/Options.h 2017-07-17 22:56:45 UTC (rev 219581)
@@ -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.") \
v(bool, useArrayAllocationProfiling, true, Normal, "If true, we will use our normal array allocation profiling. If false, the allocation profile will always claim to be undecided.")
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (219580 => 219581)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-07-17 22:56:45 UTC (rev 219581)
@@ -1,3 +1,15 @@
+2017-07-17 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219413. rdar://problem/33337335
+
+ 2017-06-29 Dean Jackson <d...@apple.com>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+ * page/Settings.in:
+
2017-07-17 Brady Eidson <beid...@apple.com>
WKHTTPCookieStore observing only works on the default cookie store.
Modified: branches/safari-604-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (219580 => 219581)
--- branches/safari-604-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-07-17 22:56:45 UTC (rev 219581)
@@ -74,7 +74,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 = ;
@@ -101,8 +101,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;
@@ -150,7 +150,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;
@@ -208,10 +208,10 @@
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_SOCKETS = ENABLE_WEB_SOCKETS;
Modified: branches/safari-604-branch/Source/WebCore/PAL/ChangeLog (219580 => 219581)
--- branches/safari-604-branch/Source/WebCore/PAL/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebCore/PAL/ChangeLog 2017-07-17 22:56:45 UTC (rev 219581)
@@ -1,3 +1,14 @@
+2017-07-17 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219413. rdar://problem/33337335
+
+ 2017-06-29 Dean Jackson <d...@apple.com>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-07-17 Konstantin Tokarev <annu...@yandex.ru>
[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
Modified: branches/safari-604-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (219580 => 219581)
--- branches/safari-604-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-07-17 22:56:45 UTC (rev 219581)
@@ -74,7 +74,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 = ;
@@ -101,8 +101,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;
@@ -150,7 +150,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;
@@ -208,10 +208,10 @@
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_SOCKETS = ENABLE_WEB_SOCKETS;
Modified: branches/safari-604-branch/Source/WebCore/page/Settings.in (219580 => 219581)
--- branches/safari-604-branch/Source/WebCore/page/Settings.in 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebCore/page/Settings.in 2017-07-17 22:56:45 UTC (rev 219581)
@@ -292,7 +292,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-branch/Source/WebKit/ChangeLog (219580 => 219581)
--- branches/safari-604-branch/Source/WebKit/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog 2017-07-17 22:56:45 UTC (rev 219581)
@@ -1,3 +1,15 @@
+2017-07-17 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219413. rdar://problem/33337335
+
+ 2017-06-29 Dean Jackson <d...@apple.com>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/WebPreferencesDefinitions.h:
+
2017-07-17 Konstantin Tokarev <annu...@yandex.ru>
[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
Modified: branches/safari-604-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig (219580 => 219581)
--- branches/safari-604-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2017-07-17 22:56:45 UTC (rev 219581)
@@ -74,7 +74,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 = ;
@@ -101,8 +101,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;
@@ -150,7 +150,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;
@@ -208,10 +208,10 @@
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_SOCKETS = ENABLE_WEB_SOCKETS;
Modified: branches/safari-604-branch/Source/WebKit/Shared/WebPreferencesDefinitions.h (219580 => 219581)
--- branches/safari-604-branch/Source/WebKit/Shared/WebPreferencesDefinitions.h 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebKit/Shared/WebPreferencesDefinitions.h 2017-07-17 22:56:45 UTC (rev 219581)
@@ -348,7 +348,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
@@ -372,7 +372,6 @@
macro(SubresourceIntegrityEnabled, subresourceIntegrityEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubresourceIntegrity", "Enable SubresourceIntegrity") \
macro(ViewportFitEnabled, viewportFitEnabled, Bool, bool, true, "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-branch/Source/WebKitLegacy/mac/ChangeLog (219580 => 219581)
--- branches/safari-604-branch/Source/WebKitLegacy/mac/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/ChangeLog 2017-07-17 22:56:45 UTC (rev 219581)
@@ -1,3 +1,14 @@
+2017-07-17 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219413. rdar://problem/33337335
+
+ 2017-06-29 Dean Jackson <d...@apple.com>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-07-14 Jer Noble <jer.no...@apple.com>
Allow clients to override their own hardware media requirements where no fallback media exists.
Modified: branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (219580 => 219581)
--- branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2017-07-17 22:56:45 UTC (rev 219581)
@@ -74,7 +74,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 = ;
@@ -101,8 +101,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;
@@ -150,7 +150,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;
@@ -208,10 +208,10 @@
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_SOCKETS = ENABLE_WEB_SOCKETS;
Modified: branches/safari-604-branch/Tools/ChangeLog (219580 => 219581)
--- branches/safari-604-branch/Tools/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Tools/ChangeLog 2017-07-17 22:56:45 UTC (rev 219581)
@@ -1,3 +1,14 @@
+2017-07-17 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219413. rdar://problem/33337335
+
+ 2017-06-29 Dean Jackson <d...@apple.com>
+
+ Disable some features on this release branch.
+ <rdar://problem/32913370>
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2017-07-17 Brady Eidson <beid...@apple.com>
WKHTTPCookieStore observing only works on the default cookie store.
Modified: branches/safari-604-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (219580 => 219581)
--- branches/safari-604-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-07-17 22:50:40 UTC (rev 219580)
+++ branches/safari-604-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-07-17 22:56:45 UTC (rev 219581)
@@ -74,7 +74,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 = ;
@@ -101,8 +101,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;
@@ -150,7 +150,7 @@
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
-ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ENABLE_NAVIGATOR_STANDALONE;
+ENABLE_NAVIGATOR_STANDALONE[sdk=iphone*] = ;
ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
ENABLE_POINTER_LOCK[sdk=macosx*] = ENABLE_POINTER_LOCK;
@@ -208,10 +208,10 @@
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_SOCKETS = ENABLE_WEB_SOCKETS;
