Attachment 340872 Details for Bug 185770 – Patch for landing

[patch] Patch for landing

bug-185770-20180521123058.patch (text/plain), 13.58 KB, created by Jer Noble on 2018-05-21 12:30:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-05-21 12:30:58 PDT

Size: 13.58 KB

patch

obsolete

>Subversion Revision: 232018
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index a6dc21c321bbaf708e0bb8243ee2467fc72ce379..62612eaa6a37429e9a662a025e404fd749d463af 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-18  Jer Noble  <jer.noble@apple.com>
>+
>+        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  <utatane.tea@gmail.com>
> 
>         Unreviewed, fix 32bit and scope release
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 68ac9bcca6a1d976bf17e5e54e5e8a4783db2d8d..4db012b58e3c9025c5e9d67f6ccb161bd2ce1384 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-18  Jer Noble  <jer.noble@apple.com>
>+
>+        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-17  Jer Noble  <jer.noble@apple.com>
> 
>         CRASH in ImageDecoderAVFObjC::sampleAtIndex()
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 423c5b01152566dd6570099aba3196db150284df..65ccd45cacec7d02ea96b269fd654260e5aa0806 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-18  Jer Noble  <jer.noble@apple.com>
>+
>+        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  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r231982.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index efe6f4dd4f14862712d3690c7d8b2d716e8a64c4..4f96a9cab6bb3d4acc2a1c7db74f6e3a8e646ff9 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-18  Jer Noble  <jer.noble@apple.com>
>+
>+        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-16  Jer Noble  <jer.noble@apple.com>
> 
>         Turn Modern EME API on by default and remove it as an experimental feature
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index fa88b46af23209eb05211e5e83fc04c689567d19..b18ecdee7e7e9d81798f803a30982fa3d6ea5da5 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-18  Jer Noble  <jer.noble@apple.com>
>+
>+        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  <antti@apple.com>
> 
>         WebView._preferencesChanged should apply colorFilterEnabled preference before parsing user stylesheet
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index 32f3e4ea0e11f3e483e4bb636e35715eddbec1cb..776ec7cd551c51dcfaff0c5216a9ca5759da3d07 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -122,7 +122,8 @@ ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
> 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 = ;
> 
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 32f3e4ea0e11f3e483e4bb636e35715eddbec1cb..776ec7cd551c51dcfaff0c5216a9ca5759da3d07 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -122,7 +122,8 @@ ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
> 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 = ;
> 
>diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>index 32f3e4ea0e11f3e483e4bb636e35715eddbec1cb..776ec7cd551c51dcfaff0c5216a9ca5759da3d07 100644
>--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>@@ -122,7 +122,8 @@ ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
> 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 = ;
> 
>diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>index 32f3e4ea0e11f3e483e4bb636e35715eddbec1cb..776ec7cd551c51dcfaff0c5216a9ca5759da3d07 100644
>--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>@@ -122,7 +122,8 @@ ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
> 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 = ;
> 
>diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>index 32f3e4ea0e11f3e483e4bb636e35715eddbec1cb..776ec7cd551c51dcfaff0c5216a9ca5759da3d07 100644
>--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>@@ -122,7 +122,8 @@ ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
> 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 = ;
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ef6de93cde92ec45fa270ddf4430ca1520e8cef6..2115b11b188d0a5749ea33d5a72d7c2fe348db62 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-18  Jer Noble  <jer.noble@apple.com>
>+
>+        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-21  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed, rolling out r222967.
>diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>index 32f3e4ea0e11f3e483e4bb636e35715eddbec1cb..776ec7cd551c51dcfaff0c5216a9ca5759da3d07 100644
>--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>@@ -122,7 +122,8 @@ ENABLE_ENCRYPTED_MEDIA_watchos = ENABLE_ENCRYPTED_MEDIA;
> 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 = ;
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3ce89095c3c1e52fcfa033a9061063f5fcd129ff..da8f3fd02110b2b898c6f3939a6c703c960ef4f5 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-18  Jer Noble  <jer.noble@apple.com>
>+
>+        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-17  Jer Noble  <jer.noble@apple.com>
> 
>         CRASH in ImageDecoderAVFObjC::sampleAtIndex()
>diff --git a/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt b/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt
>index 567339c99a232fb0dd2d73e61b11280abd3f27b9..9f7621e879e10e0a04c55c09102c0a5c79cdee30 100644
>--- a/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt
>+++ b/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt
>@@ -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.platform is OK
> 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.platform is OK
> 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
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 0863201ec145c66f0f20fd178b8424378dc29cc8..c067be8b080f36d1626171fd79bba5ab07ed3a37 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -1768,3 +1768,10 @@ webkit.org/b/185659 [ Debug ] animations/needs-layout.html [ Pass ImageOnlyFailu
> 
> # 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 ]
>diff --git a/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt b/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..d4b707114e63f6943852784daba042255982c472
>--- /dev/null
>+++ b/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt
>@@ -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
>+

Actions: View | Formatted Diff | Diff

Attachments on bug 185770: 340705 | 340715 | 340717 | 340720 | 340725 | 340860 | 340869 | 340872