Attachment 370145 Details for Bug 197964 – patch with test

[patch] patch with test

patch (text/plain), 4.47 KB, created by Alex Christensen on 2019-05-17 13:45:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-05-17 13:45:25 PDT

Size: 4.47 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 245300)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-05-16  Alex Christensen  <achristensen@webkit.org>
>+
>+        Enable legacy EME for iOS WKWebView
>+        https://bugs.webkit.org/show_bug.cgi?id=197964
>+        <rdar://problem/50625666>
>+
>+        Reviewed by Wenson Hsieh.
>+
>+        This was attempted unsuccessfully in r230169.
>+        Verified manually that it works as desired.
>+
>+        * page/RuntimeEnabledFeatures.h:
>+
> 2019-05-14  Zalan Bujtas  <zalan@apple.com>
> 
>         Do not try to issue repaint while the render tree is being destroyed.
>Index: Source/WebCore/page/RuntimeEnabledFeatures.h
>===================================================================
>--- Source/WebCore/page/RuntimeEnabledFeatures.h	(revision 245300)
>+++ Source/WebCore/page/RuntimeEnabledFeatures.h	(working copy)
>@@ -507,7 +507,7 @@ private:
> #endif
> 
> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
>-    bool m_legacyEncryptedMediaAPIEnabled { false };
>+    bool m_legacyEncryptedMediaAPIEnabled { true };
> #endif
> 
> #if ENABLE(INTERSECTION_OBSERVER)
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 245406)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-05-16  Alex Christensen  <achristensen@webkit.org>
>+
>+        Enable legacy EME for iOS WKWebView
>+        https://bugs.webkit.org/show_bug.cgi?id=197964
>+        <rdar://problem/50625666>
>+
>+        Reviewed by Wenson Hsieh.
>+
>+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
>+        (-[WKWebViewConfiguration init]):
>+
> 2019-05-16  Alex Christensen  <achristensen@webkit.org>
> 
>         Add SPI to set a list of hosts to which to send custom header fields cross-origin
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	(revision 245300)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	(working copy)
>@@ -200,13 +200,12 @@ - (instancetype)init
> #endif
>         _mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeAll;
>     _ignoresViewportScaleLimits = NO;
>-    _legacyEncryptedMediaAPIEnabled = NO;
> #else
>     _mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeNone;
>     _mediaDataLoadsAutomatically = YES;
>     _userInterfaceDirectionPolicy = WKUserInterfaceDirectionPolicyContent;
>-    _legacyEncryptedMediaAPIEnabled = YES;
> #endif
>+    _legacyEncryptedMediaAPIEnabled = YES;
>     _mainContentUserGestureOverrideEnabled = NO;
>     _invisibleAutoplayNotPermitted = NO;
>     _attachmentElementEnabled = NO;
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog     (revision 245476)
>+++ Tools/ChangeLog     (working copy)
>@@ -1,3 +1,14 @@
>+2019-05-17  Alex Christensen  <achristensen@webkit.org>
>+
>+        Enable legacy EME for iOS WKWebView
>+        https://bugs.webkit.org/show_bug.cgi?id=197964
>+        <rdar://problem/50625666>
>+
>+        Reviewed by Wenson Hsieh.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewConfiguration.mm:
>+        (TEST):
>+
> 2019-05-17  Keith Rollin  <krollin@apple.com>
> 
>         Unreviewed build fix.
>Index: Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewConfiguration.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewConfiguration.mm     (revision 245407)
>+++ Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewConfiguration.mm     (working copy)
>@@ -81,3 +81,17 @@
>     auto configuationCopy = adoptNS([configuration copy]);
>     EXPECT_STREQ([configuration _groupIdentifier].UTF8String, [configuationCopy _groupIdentifier].UTF8String);
> }
>+
>+TEST(WebKit, DefaultConfigurationEME)
>+{
>+    auto configuration = adoptNS([WKWebViewConfiguration new]);
>+    EXPECT_TRUE([configuration _legacyEncryptedMediaAPIEnabled]);
>+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 100, 100) configuration:configuration.get()]);
>+    [webView loadHTMLString:@"<html>hi</html>" baseURL:nil];
>+    __block bool done = false;
>+    [webView evaluateJavaScript:@"window.WebKitMediaKeys ? 'ENABLED' : 'DISABLED'" completionHandler:^(id result, NSError *){
>+        EXPECT_TRUE([result isEqualToString:@"ENABLED"]);
>+        done = true;
>+    }];
>+    TestWebKitAPI::Util::run(&done);
>+}

Actions: View | Formatted Diff | Diff

Attachments on bug 197964: 370066 | 370067 | 370145