Diff
Modified: trunk/LayoutTests/ChangeLog (232023 => 232024)
--- trunk/LayoutTests/ChangeLog 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/LayoutTests/ChangeLog 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1,3 +1,15 @@
+2018-05-21 Jer Noble <[email protected]>
+
+ Complete fix for enabling modern EME by default
+ https://bugs.webkit.org/show_bug.cgi?id=185770
+ <rdar://problem/40368220>
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+ * platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt:
+ * platform/mac/fast/dom/navigator-detached-no-crash-expected.txt:
+
2018-05-20 Emilio Cobos Álvarez <[email protected]>
Update CSSOM WPT tests.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (232023 => 232024)
--- trunk/LayoutTests/platform/mac/TestExpectations 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1768,3 +1768,10 @@
# macOS doesn't have ICU v59
webkit.org/b/185375 js/intl-numberformat-format-to-parts.html [ Failure ]
+
+# <= High Sierra doesn't support Modern EME
+[ HighSierra ] platform/mac/media/encrypted-media/fps-createMediaKeys.html [ Skip ]
+[ HighSierra ] platform/mac/media/encrypted-media/fps-createSession.html [ Skip ]
+[ HighSierra ] platform/mac/media/encrypted-media/fps-encrypted-event.html [ Skip ]
+[ HighSierra ] platform/mac/media/encrypted-media/fps-generateRequest.html [ Skip ]
+[ HighSierra ] platform/mac/media/encrypted-media/fps-requestMediaKeySystemAccess.html [ Skip ]
Copied: trunk/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt (from rev 232023, trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt) (0 => 232024)
--- trunk/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt 2018-05-21 20:50:46 UTC (rev 232024)
@@ -0,0 +1,47 @@
+This tests that the navigator object of a deleted frame is disconnected properly. Accessing fields or methods shouldn't crash the browser.
+ Check Navigator
+navigator.appCodeName is OK
+navigator.appName is OK
+navigator.appVersion is OK
+navigator.cookieEnabled is OK
+navigator.credentials is OK
+navigator.getStorageUpdates() is OK
+navigator.javaEnabled() is OK
+navigator.language is OK
+navigator.languages is OK
+navigator.mediaCapabilities is OK
+navigator.mimeTypes is OK
+navigator.onLine is OK
+navigator.platform is OK
+navigator.plugins is OK
+navigator.product is OK
+navigator.productSub is OK
+navigator.sendBeacon() threw err TypeError: Not enough arguments
+navigator.serviceWorker is OK
+navigator.userAgent is OK
+navigator.vendor is OK
+navigator.vendorSub is OK
+navigator.webdriver is OK
+navigator.appCodeName is OK
+navigator.appName is OK
+navigator.appVersion is OK
+navigator.cookieEnabled is OK
+navigator.credentials is OK
+navigator.getStorageUpdates() is OK
+navigator.javaEnabled() is OK
+navigator.language is OK
+navigator.languages is OK
+navigator.mediaCapabilities is OK
+navigator.mimeTypes is OK
+navigator.onLine is OK
+navigator.platform is OK
+navigator.plugins is OK
+navigator.product is OK
+navigator.productSub is OK
+navigator.sendBeacon() threw err TypeError: Not enough arguments
+navigator.serviceWorker is OK
+navigator.userAgent is OK
+navigator.vendor is OK
+navigator.vendorSub is OK
+navigator.webdriver is OK
+
Modified: trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt (232023 => 232024)
--- trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: Unhandled Promise Rejection: TypeError: Not enough arguments
This tests that the navigator object of a deleted frame is disconnected properly. Accessing fields or methods shouldn't crash the browser.
Check Navigator
navigator.appCodeName is OK
@@ -17,7 +16,6 @@
navigator.plugins is OK
navigator.product is OK
navigator.productSub is OK
-navigator.requestMediaKeySystemAccess() is OK
navigator.userAgent is OK
navigator.vendor is OK
navigator.vendorSub is OK
@@ -38,7 +36,6 @@
navigator.plugins is OK
navigator.product is OK
navigator.productSub is OK
-navigator.requestMediaKeySystemAccess() is OK
navigator.userAgent is OK
navigator.vendor is OK
navigator.vendorSub is OK
Modified: trunk/Source/_javascript_Core/ChangeLog (232023 => 232024)
--- trunk/Source/_javascript_Core/ChangeLog 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1,3 +1,13 @@
+2018-05-21 Jer Noble <[email protected]>
+
+ Complete fix for enabling modern EME by default
+ https://bugs.webkit.org/show_bug.cgi?id=185770
+ <rdar://problem/40368220>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-05-21 Yusuke Suzuki <[email protected]>
Unreviewed, fix 32bit and scope release
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (232023 => 232024)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-05-21 20:50:46 UTC (rev 232024)
@@ -122,7 +122,8 @@
ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014));
+ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA;
ENABLE_EXTRA_ZOOM_MODE = ;
Modified: trunk/Source/WebCore/ChangeLog (232023 => 232024)
--- trunk/Source/WebCore/ChangeLog 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/WebCore/ChangeLog 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1,3 +1,13 @@
+2018-05-21 Jer Noble <[email protected]>
+
+ Complete fix for enabling modern EME by default
+ https://bugs.webkit.org/show_bug.cgi?id=185770
+ <rdar://problem/40368220>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-05-21 Olivier Blin <[email protected]>
[CMake][WebCore] fix sqlite include dir variable
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (232023 => 232024)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-05-21 20:50:46 UTC (rev 232024)
@@ -122,7 +122,8 @@
ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014));
+ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA;
ENABLE_EXTRA_ZOOM_MODE = ;
Modified: trunk/Source/WebCore/PAL/ChangeLog (232023 => 232024)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1,3 +1,13 @@
+2018-05-21 Jer Noble <[email protected]>
+
+ Complete fix for enabling modern EME by default
+ https://bugs.webkit.org/show_bug.cgi?id=185770
+ <rdar://problem/40368220>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-05-18 Commit Queue <[email protected]>
Unreviewed, rolling out r231982.
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (232023 => 232024)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-05-21 20:50:46 UTC (rev 232024)
@@ -122,7 +122,8 @@
ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014));
+ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA;
ENABLE_EXTRA_ZOOM_MODE = ;
Modified: trunk/Source/WebKit/ChangeLog (232023 => 232024)
--- trunk/Source/WebKit/ChangeLog 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/WebKit/ChangeLog 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1,3 +1,13 @@
+2018-05-21 Jer Noble <[email protected]>
+
+ Complete fix for enabling modern EME by default
+ https://bugs.webkit.org/show_bug.cgi?id=185770
+ <rdar://problem/40368220>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-05-21 Sam Weinig <[email protected]>
Modernize RenderStyleConstants.h - Part 1
Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (232023 => 232024)
--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-05-21 20:50:46 UTC (rev 232024)
@@ -122,7 +122,8 @@
ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014));
+ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA;
ENABLE_EXTRA_ZOOM_MODE = ;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (232023 => 232024)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1,3 +1,13 @@
+2018-05-21 Jer Noble <[email protected]>
+
+ Complete fix for enabling modern EME by default
+ https://bugs.webkit.org/show_bug.cgi?id=185770
+ <rdar://problem/40368220>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-05-21 Antti Koivisto <[email protected]>
WebView._preferencesChanged should apply colorFilterEnabled preference before parsing user stylesheet
Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (232023 => 232024)
--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-05-21 20:50:46 UTC (rev 232024)
@@ -122,7 +122,8 @@
ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014));
+ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA;
ENABLE_EXTRA_ZOOM_MODE = ;
Modified: trunk/Tools/ChangeLog (232023 => 232024)
--- trunk/Tools/ChangeLog 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Tools/ChangeLog 2018-05-21 20:50:46 UTC (rev 232024)
@@ -1,3 +1,13 @@
+2018-05-21 Jer Noble <[email protected]>
+
+ Complete fix for enabling modern EME by default
+ https://bugs.webkit.org/show_bug.cgi?id=185770
+ <rdar://problem/40368220>
+
+ Reviewed by Eric Carlson.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2018-05-18 Christopher Reid <[email protected]>
Unreviewed, add myself as a WebKit committer.
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (232023 => 232024)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-05-21 18:19:10 UTC (rev 232023)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-05-21 20:50:46 UTC (rev 232024)
@@ -122,7 +122,8 @@
ENABLE_ENCRYPTED_MEDIA_watchsimulator = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvos = ENABLE_ENCRYPTED_MEDIA;
ENABLE_ENCRYPTED_MEDIA_appletvsimulator = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_macosx = ENABLE_ENCRYPTED_MEDIA;
+ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA$(WK_MACOS_1014));
+ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA;
ENABLE_EXTRA_ZOOM_MODE = ;