Diff
Modified: trunk/LayoutTests/ChangeLog (224832 => 224833)
--- trunk/LayoutTests/ChangeLog 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/LayoutTests/ChangeLog 2017-11-14 20:29:05 UTC (rev 224833)
@@ -1,3 +1,13 @@
+2017-11-14 Jer Noble <jer.no...@apple.com>
+
+ Enable Modern EME tests in DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=179544
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+ * platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt:
+
2017-11-14 Youenn Fablet <you...@apple.com>
WebSWClientConnection should do IPC to StorageProcess if its WebSWOriginTable is not yet initialized
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (224832 => 224833)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-11-14 20:29:05 UTC (rev 224833)
@@ -465,6 +465,3 @@
webkit.org/b/177563 [ HighSierra ] http/tests/xmlhttprequest/response-empty-arraybuffer.html [ Failure ]
webkit.org/b/172397 [ Debug ] animations/needs-layout.html [ Pass ImageOnlyFailure ]
-
-webkit.org/b/179544 platform/mac/media/encrypted-media/fps-createMediaKeys.html [ Failure ]
-webkit.org/b/179544 platform/mac/media/encrypted-media/fps-requestMediaKeySystemAccess.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt (224832 => 224833)
--- trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2017-11-14 20:29:05 UTC (rev 224833)
@@ -14,6 +14,7 @@
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
@@ -32,6 +33,7 @@
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/WebKitLegacy/mac/ChangeLog (224832 => 224833)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-11-14 20:29:05 UTC (rev 224833)
@@ -1,3 +1,21 @@
+2017-11-14 Jer Noble <jer.no...@apple.com>
+
+ Enable Modern EME tests in DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=179544
+
+ Reviewed by Alex Christensen.
+
+ Add a WebPreferences property to enable the (modern) EME API.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences encryptedMediaAPIEnabled]):
+ (-[WebPreferences setEncryptedMediaAPIEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2017-11-14 Antti Koivisto <an...@apple.com>
Enable display:contents by default
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h (224832 => 224833)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2017-11-14 20:29:05 UTC (rev 224833)
@@ -249,5 +249,6 @@
#define WebKitResourceTimingEnabledPreferenceKey @"WebKitResourceTimingEnabled"
#define WebKitMediaContentTypesRequiringHardwareSupportPreferenceKey @"WebKitMediaContentTypesRequiringHardwareSupport"
#define WebKitLegacyEncryptedMediaAPIEnabledKey @"WebKitLegacyEncryptedMediaAPIEnabled"
+#define WebKitEncryptedMediaAPIEnabledKey @"WebKitEncryptedMediaAPIEnabled"
#define WebKitAllowMediaContentTypesRequiringHardwareSupportAsFallbackKey @"WebKitAllowMediaContentTypesRequiringHardwareSupportAsFallback"
#define WebKitInspectorAdditionsEnabledPreferenceKey @"WebKitInspectorAdditionsEnabled"
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (224832 => 224833)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2017-11-14 20:29:05 UTC (rev 224833)
@@ -674,6 +674,7 @@
#else
@YES, WebKitLegacyEncryptedMediaAPIEnabledKey,
#endif
+ @NO, WebKitEncryptedMediaAPIEnabledKey,
@YES, WebKitViewportFitEnabledPreferenceKey,
@YES, WebKitConstantPropertiesEnabledPreferenceKey,
@YES, WebKitAllowMediaContentTypesRequiringHardwareSupportAsFallbackKey,
@@ -3205,6 +3206,16 @@
[self _setBoolValue:flag forKey:WebKitLegacyEncryptedMediaAPIEnabledKey];
}
+- (BOOL)encryptedMediaAPIEnabled
+{
+ return [self _boolValueForKey:WebKitEncryptedMediaAPIEnabledKey];
+}
+
+- (void)setEncryptedMediaAPIEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitEncryptedMediaAPIEnabledKey];
+}
+
- (BOOL)viewportFitEnabled
{
return [self _boolValueForKey:WebKitViewportFitEnabledPreferenceKey];
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (224832 => 224833)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2017-11-14 20:29:05 UTC (rev 224833)
@@ -590,6 +590,7 @@
@property (nonatomic) BOOL mediaUserGestureInheritsFromDocument;
@property (nonatomic) BOOL isSecureContextAttributeEnabled;
@property (nonatomic) BOOL legacyEncryptedMediaAPIEnabled;
+@property (nonatomic) BOOL encryptedMediaAPIEnabled;
@property (nonatomic) BOOL viewportFitEnabled;
@property (nonatomic) BOOL constantPropertiesEnabled;
@property (nonatomic) BOOL inspectorAdditionsEnabled;
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (224832 => 224833)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2017-11-14 20:29:05 UTC (rev 224833)
@@ -3044,6 +3044,10 @@
RuntimeEnabledFeatures::sharedFeatures().setLegacyEncryptedMediaAPIEnabled(preferences.legacyEncryptedMediaAPIEnabled);
#endif
+#if ENABLE(ENCRYPTED_MEDIA)
+ RuntimeEnabledFeatures::sharedFeatures().setEncryptedMediaAPIEnabled(preferences.encryptedMediaAPIEnabled);
+#endif
+
RuntimeEnabledFeatures::sharedFeatures().setInspectorAdditionsEnabled(preferences.inspectorAdditionsEnabled);
settings.setAllowMediaContentTypesRequiringHardwareSupportAsFallback(preferences.allowMediaContentTypesRequiringHardwareSupportAsFallback);
Modified: trunk/Tools/ChangeLog (224832 => 224833)
--- trunk/Tools/ChangeLog 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Tools/ChangeLog 2017-11-14 20:29:05 UTC (rev 224833)
@@ -1,3 +1,13 @@
+2017-11-14 Jer Noble <jer.no...@apple.com>
+
+ Enable Modern EME tests in DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=179544
+
+ Reviewed by Alex Christensen.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (enableExperimentalFeatures):
+
2017-11-14 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r224800.
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (224832 => 224833)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-11-14 20:29:05 UTC (rev 224833)
@@ -854,6 +854,7 @@
[preferences setCacheAPIEnabled:NO];
[preferences setReadableByteStreamAPIEnabled:YES];
[preferences setWritableStreamAPIEnabled:YES];
+ preferences.encryptedMediaAPIEnabled = YES;
}
// Called before each test.
