Diff
Modified: trunk/LayoutTests/ChangeLog (285251 => 285252)
--- trunk/LayoutTests/ChangeLog 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/ChangeLog 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,3 +1,13 @@
+2021-11-03 Alex Christensen <[email protected]>
+
+ Remove QuickTimePluginReplacement and YouTubePluginReplacement
+ https://bugs.webkit.org/show_bug.cgi?id=232400
+
+ Reviewed by Chris Dumez.
+
+ * security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt: Removed.
+ * security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html: Removed.
+
2021-11-03 Nikos Mouchtaris <[email protected]>
Add platform test expectations for imported/w3c/web-platform-tests/mathml/relations/html5-tree/dynamic-childlist-001.html
Modified: trunk/LayoutTests/TestExpectations (285251 => 285252)
--- trunk/LayoutTests/TestExpectations 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/TestExpectations 2021-11-04 01:23:46 UTC (rev 285252)
@@ -5177,12 +5177,4 @@
imported/blink/http/tests/plugins [ Skip ]
imported/blink/plugins [ Skip ]
js/dom/reflect-set-onto-dom.html [ Skip ]
-security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html [ Skip ]
-security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html [ Skip ]
-security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html [ Skip ]
-security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html [ Skip ]
-security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html [ Skip ]
-security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html [ Skip ]
-security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html [ Skip ]
-security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html [ Skip ]
userscripts/user-script-plugin-document.html [ Skip ]
Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (285251 => 285252)
--- trunk/LayoutTests/platform/ios-wk2/TestExpectations 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations 2021-11-04 01:23:46 UTC (rev 285252)
@@ -2076,8 +2076,6 @@
webkit.org/b/214955 fast/parser/xml-colon-entity.html [ Failure ]
-webkit.org/b/223750 [ Debug ] security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html [ Pass Crash ]
-
webkit.org/b/155196 security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [ Pass ImageOnlyFailure ]
webkit.org/b/155196 security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html [ Pass ImageOnlyFailure ]
Modified: trunk/LayoutTests/platform/win/TestExpectations (285251 => 285252)
--- trunk/LayoutTests/platform/win/TestExpectations 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/platform/win/TestExpectations 2021-11-04 01:23:46 UTC (rev 285252)
@@ -3262,7 +3262,6 @@
pageoverlay/overlay-installation.html [ Failure ]
pageoverlay/overlay-large-document-scrolled.html [ Failure ]
pageoverlay/overlay-large-document.html [ Failure ]
-security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html [ Failure ]
storage/indexeddb/modern/blob-cursor.html [ Failure ]
streams/readable-byte-stream-controller.html [ Failure ]
streams/readable-byte-stream-controller-worker.html [ Failure ]
@@ -3409,7 +3408,6 @@
http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html [ Skip ]
imported/blink/storage/indexeddb/blob-valid-after-deletion.html [ Skip ]
imported/blink/storage/indexeddb/blob-valid-before-commit.html [ Skip ]
-security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html [ Skip ]
security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star.html [ Skip ]
security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star.html [ Skip ]
fast/events/ghostly-mousemoves-in-subframe.html [ Missing ]
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement-expected.txt (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement-expected.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement-expected.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: Refused to load yellow.mov because it does not appear in the object-src directive of the Content Security Policy.
-
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="object-src 'none'">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setQuickTimePluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<embed id="embed" width="640" height="480" src="" qtsrc="../../plugins/resources/orange.mov">
-</body>
-</html>
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement-expected.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: Refused to load https://www.youtube.com/v/UF8uR6Z6KLc because it does not appear in the object-src directive of the Content Security Policy.
-
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="object-src 'none'">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setYouTubeFlashPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<object width="425" height="350" classid=""
- codebase=""
- <embed width="425" height="350" type="application/x-shockwave-flash" src=""
-</object>
-</body>
-</html>
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement-expected.txt (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement-expected.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement-expected.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,2 +0,0 @@
-ALERT: PASS did load plugin.
-
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types video/quicktime">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setQuickTimePluginReplacementEnabled(true);
-</script>
-</head>
-<body>
-<embed id="embed" type="video/quicktime" width="640" height="480" src="" qtsrc="../../plugins/resources/orange.mov" postdomevents=true>
-<script>
-document.getElementById("embed").addEventListener("qt_begin", function () {
- alert("PASS did load plugin.");
- if (window.testRunner)
- testRunner.notifyDone();
-}, true);
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement-expected.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,2 +0,0 @@
-Blocked access to external URL https://www.youtube.com/embed/UF8uR6Z6KLc
-
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types application/x-shockwave-flash">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setYouTubeFlashPluginReplacementEnabled(true);
-
-// Waiting at least 100ms seems to ensure that YouTube plugin replacement has loaded.
-window.setTimeout(function () {
- if (window.testRunner)
- testRunner.notifyDone();
-}, 100);
-</script>
-</head>
-<body>
-<object width="425" height="350" classid=""
- codebase=""
- <embed width="425" height="350" type="application/x-shockwave-flash" src=""
-</object>
-</body>
-</html>
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-expected.txt (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-expected.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-expected.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: Refused to load yellow.mov because its MIME type does not appear in the plugin-types directive of the Content Security Policy.
-
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type-expected.txt (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type-expected.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type-expected.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: Refused to load yellow.mov because its MIME type does not appear in the plugin-types directive of the Content Security Policy.
-
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types text/html">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setQuickTimePluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<embed width="640" height="480" src="" qtsrc="../../plugins/resources/orange.mov">
-</body>
-</html>
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types text/html">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setQuickTimePluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<embed type="video/quicktime" width="640" height="480" src="" qtsrc="../../plugins/resources/orange.mov">
-</body>
-</html>
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-expected.txt (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-expected.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-expected.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: Refused to load https://www.youtube.com/v/UF8uR6Z6KLc because its MIME type does not appear in the plugin-types directive of the Content Security Policy.
-
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type-expected.txt (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type-expected.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type-expected.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: Refused to load https://www.youtube.com/v/UF8uR6Z6KLc because its MIME type does not appear in the plugin-types directive of the Content Security Policy.
-
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types text/html">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setYouTubeFlashPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<object width="425" height="350" classid=""
- codebase=""
- <embed width="425" height="350" src=""
-</object>
-</body>
-</html>
Deleted: trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html (285251 => 285252)
--- trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="plugin-types text/html">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-if (window.internals)
- window.internals.settings.setYouTubeFlashPluginReplacementEnabled(true);
-
-function done()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-document.addEventListener("securitypolicyviolation", done, false);
-</script>
-</head>
-<body>
-<object width="425" height="350" classid=""
- codebase=""
- <embed width="425" height="350" type="application/x-shockwave-flash" src=""
-</object>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (285251 => 285252)
--- trunk/Source/WebCore/ChangeLog 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/ChangeLog 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,3 +1,46 @@
+2021-11-03 Alex Christensen <[email protected]>
+
+ Remove QuickTimePluginReplacement and YouTubePluginReplacement
+ https://bugs.webkit.org/show_bug.cgi?id=232400
+
+ Reviewed by Chris Dumez.
+
+ They were disabled at runtime in https://trac.webkit.org/changeset/275911/webkit
+
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources-output.xcfilelist:
+ * DerivedSources.make:
+ * Modules/plugins/PluginReplacement.h: Removed.
+ * Modules/plugins/QuickTimePluginReplacement.css: Removed.
+ * Modules/plugins/QuickTimePluginReplacement.h: Removed.
+ * Modules/plugins/QuickTimePluginReplacement.idl: Removed.
+ * Modules/plugins/QuickTimePluginReplacement.js: Removed.
+ * Modules/plugins/QuickTimePluginReplacement.mm: Removed.
+ * Modules/plugins/YouTubePluginReplacement.cpp: Removed.
+ * Modules/plugins/YouTubePluginReplacement.h: Removed.
+ * SourcesCocoa.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSPluginElementFunctions.cpp:
+ (WebCore::pluginScriptObject):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * html/HTMLPlugInElement.cpp:
+ (WebCore::HTMLPlugInElement::createElementRenderer):
+ (WebCore::HTMLPlugInElement::didAddUserAgentShadowRoot):
+ (WebCore::HTMLPlugInElement::requestObject):
+ (): Deleted.
+ (WebCore::registrar): Deleted.
+ (WebCore::pluginReplacementForType): Deleted.
+ (WebCore::HTMLPlugInElement::scriptObjectForPluginReplacement): Deleted.
+ * html/HTMLPlugInElement.h:
+ (WebCore::HTMLPlugInElement::pluginReplacementScriptObject): Deleted.
+ * html/shadow/ShadowPseudoIds.cpp:
+ (WebCore::ShadowPseudoIds::webkitPluginReplacement): Deleted.
+ * html/shadow/ShadowPseudoIds.h:
+ * html/shadow/YouTubeEmbedShadowElement.cpp: Removed.
+ * html/shadow/YouTubeEmbedShadowElement.h: Removed.
+ * page/Settings.yaml:
+
2021-11-03 Yusuke Suzuki <[email protected]>
[JSC] Clean up StructureStubInfo initialization
Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (285251 => 285252)
--- trunk/Source/WebCore/DerivedSources-input.xcfilelist 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist 2021-11-04 01:23:46 UTC (rev 285252)
@@ -422,9 +422,6 @@
$(PROJECT_DIR)/Modules/pictureinpicture/EnterPictureInPictureEvent.idl
$(PROJECT_DIR)/Modules/pictureinpicture/HTMLVideoElement+PictureInPicture.idl
$(PROJECT_DIR)/Modules/pictureinpicture/PictureInPictureWindow.idl
-$(PROJECT_DIR)/Modules/plugins/QuickTimePluginReplacement.css
-$(PROJECT_DIR)/Modules/plugins/QuickTimePluginReplacement.idl
-$(PROJECT_DIR)/Modules/plugins/QuickTimePluginReplacement.js
$(PROJECT_DIR)/Modules/push-api/PushEncryptionKeyName.idl
$(PROJECT_DIR)/Modules/push-api/PushEvent.idl
$(PROJECT_DIR)/Modules/push-api/PushEventInit.idl
Modified: trunk/Source/WebCore/DerivedSources-output.xcfilelist (285251 => 285252)
--- trunk/Source/WebCore/DerivedSources-output.xcfilelist 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/DerivedSources-output.xcfilelist 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1631,8 +1631,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSPushSubscriptionOptions.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSPushSubscriptionOptionsInit.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSPushSubscriptionOptionsInit.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSQuickTimePluginReplacement.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSQuickTimePluginReplacement.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCAnswerOptions.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCAnswerOptions.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSRTCCertificate.cpp
Modified: trunk/Source/WebCore/DerivedSources.make (285251 => 285252)
--- trunk/Source/WebCore/DerivedSources.make 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/DerivedSources.make 2021-11-04 01:23:46 UTC (rev 285252)
@@ -352,7 +352,6 @@
$(WebCore)/Modules/pictureinpicture/EnterPictureInPictureEvent.idl \
$(WebCore)/Modules/pictureinpicture/HTMLVideoElement+PictureInPicture.idl \
$(WebCore)/Modules/pictureinpicture/PictureInPictureWindow.idl \
- $(WebCore)/Modules/plugins/QuickTimePluginReplacement.idl \
$(WebCore)/Modules/push-api/PushEncryptionKeyName.idl \
$(WebCore)/Modules/push-api/PushEvent.idl \
$(WebCore)/Modules/push-api/PushEventInit.idl \
@@ -1623,7 +1622,6 @@
$(WebCore)/css/svg.css \
$(WebCore)/html/shadow/imageOverlay.css \
$(WebCore)/html/shadow/meterElementShadow.css \
- $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css \
ModernMediaControls.css \
$(POSSIBLE_ADDITIONAL_USER_AGENT_STYLE_SHEETS) \
#
@@ -1732,7 +1730,6 @@
# user agent scripts
USER_AGENT_SCRIPTS = \
- $(WebCore)/Modules/plugins/QuickTimePluginReplacement.js \
ModernMediaControls.js \
#
Modified: trunk/Source/WebCore/Headers.cmake (285251 => 285252)
--- trunk/Source/WebCore/Headers.cmake 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/Headers.cmake 2021-11-04 01:23:46 UTC (rev 285252)
@@ -151,9 +151,6 @@
Modules/permissions/PermissionObserver.h
Modules/permissions/PermissionState.h
- Modules/plugins/PluginReplacement.h
- Modules/plugins/YouTubePluginReplacement.h
-
Modules/push-api/PushPermissionState.h
Modules/push-api/PushSubscriptionData.h
Modified: trunk/Source/WebCore/SourcesCocoa.txt (285251 => 285252)
--- trunk/Source/WebCore/SourcesCocoa.txt 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2021-11-04 01:23:46 UTC (rev 285252)
@@ -100,8 +100,6 @@
Modules/async-clipboard/mac/ClipboardImageReaderMac.mm
Modules/mediastream/RTCRtpSFrameTransformerCocoa.cpp
Modules/model-element/HTMLModelElementCocoa.mm
-Modules/plugins/QuickTimePluginReplacement.mm
-Modules/plugins/YouTubePluginReplacement.cpp
Modules/speech/cocoa/SpeechRecognizerCocoa.mm
Modules/speech/cocoa/WebSpeechRecognizerTask.mm
Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm
@@ -172,7 +170,6 @@
editing/mac/TextUndoInsertionMarkupMac.mm
fileapi/FileCocoa.mm
history/mac/HistoryItemMac.mm
-html/shadow/YouTubeEmbedShadowElement.cpp
inspector/mac/PageDebuggerMac.mm
loader/archive/cf/LegacyWebArchive.cpp
loader/archive/cf/LegacyWebArchiveMac.mm
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (285251 => 285252)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-11-04 01:23:46 UTC (rev 285252)
@@ -109,8 +109,6 @@
07277E5517D018CC0015534D /* JSMediaStreamTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */; };
072880D12010F1F60071B255 /* RealtimeVideoCaptureSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 072880D02010EED70071B255 /* RealtimeVideoCaptureSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
072A70401D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 072A703E1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h */; };
- 072AE1E5183C0741000A5988 /* PluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 072AE1DF183C0741000A5988 /* PluginReplacement.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 072AE1E2183C0741000A5988 /* QuickTimePluginReplacement.h */; };
073794DE19EE2C5200E5A045 /* RTCOfferAnswerOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794DC19EE2C5200E5A045 /* RTCOfferAnswerOptions.h */; };
073794E619EE2FF200E5A045 /* JSRTCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794E419EE2FF200E5A045 /* JSRTCConfiguration.h */; };
073794EC19EE341E00E5A045 /* JSRTCIceServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794EA19EE341E00E5A045 /* JSRTCIceServer.h */; };
@@ -132,7 +130,6 @@
076970871463AD8700F502CF /* TextTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = 076970851463AD8700F502CF /* TextTrackList.h */; };
076D1C1F23F6EB5B00D95B06 /* SerializedPlatformDataCueValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 076D1C1D23F6D9D800D95B06 /* SerializedPlatformDataCueValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */; };
- 077664FD183E6B5C00133B92 /* JSQuickTimePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */; };
077AF14018F4AE400001ED61 /* SerializedPlatformDataCue.h in Headers */ = {isa = PBXBuildFile; fileRef = 077AF13E18F4AE400001ED61 /* SerializedPlatformDataCue.h */; settings = {ATTRIBUTES = (Private, ); }; };
077AF14318F4B1BB0001ED61 /* SerializedPlatformDataCueMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 077AF14118F4B1BB0001ED61 /* SerializedPlatformDataCueMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
077B64131B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 077B64111B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1852,7 +1849,6 @@
538EC9321F99B9F7004D22A8 /* JSMallocStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA6814C9348400C8F5BF /* JSMallocStatistics.cpp */; };
538EC9331F99B9F7004D22A8 /* JSMockCDMFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF4B72E1E03CA4A00E235A2 /* JSMockCDMFactory.h */; };
538EC9341F99B9F7004D22A8 /* JSMockPageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6F3E931C1F85550061DBD4 /* JSMockPageOverlay.h */; };
- 538EC93E1F99BF5A004D22A8 /* JSQuickTimePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */; };
538F10A81F9022A4005102CE /* SoftLinkLibxslt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 538F10A31F900BDC005102CE /* SoftLinkLibxslt.cpp */; };
53B895AF19DC7ED9009CAA93 /* Microtasks.h in Headers */ = {isa = PBXBuildFile; fileRef = 53B895AD19DC7C37009CAA93 /* Microtasks.h */; settings = {ATTRIBUTES = (Private, ); }; };
53C8298E13D8D92700DE2DEB /* RenderFlexibleBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2342,7 +2338,6 @@
7A45033018DB717200377B34 /* BufferedLineReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A45032E18DB717200377B34 /* BufferedLineReader.h */; };
7A54858014E02D51006AE05A /* InspectorHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A54857E14E02D51006AE05A /* InspectorHistory.h */; };
7A54881714E432A1006AE05A /* DOMPatchSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A54881514E432A1006AE05A /* DOMPatchSupport.h */; };
- 7A5515F5191830A3009687D2 /* YouTubePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5515F3191830A3009687D2 /* YouTubePluginReplacement.h */; settings = {ATTRIBUTES = (Private, ); }; };
7A5699702086C619000E0433 /* CookieRequestHeaderFieldProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A56996E2086C618000E0433 /* CookieRequestHeaderFieldProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
7A674BDC0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */; };
7A929CA71C598AA9004DF226 /* ResourceLoadStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A929CA21C598378004DF226 /* ResourceLoadStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3423,7 +3418,6 @@
A52B348F1FA3BDA6008B6246 /* ServiceWorkerDebuggable.h in Headers */ = {isa = PBXBuildFile; fileRef = A52B348C1FA3BD79008B6246 /* ServiceWorkerDebuggable.h */; settings = {ATTRIBUTES = (Private, ); }; };
A52B34961FA3E290008B6246 /* ServiceWorkerInspectorProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A52B34931FA3E286008B6246 /* ServiceWorkerInspectorProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
A52B349E1FA41703008B6246 /* WorkerDebuggerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A52B349C1FA416F8008B6246 /* WorkerDebuggerProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
- A5416FE618810EF80009FC5F /* YouTubeEmbedShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A5416FE418810EF80009FC5F /* YouTubeEmbedShadowElement.h */; };
A54A0C621DB7F8C10017A90B /* WorkerInspectorController.h in Headers */ = {isa = PBXBuildFile; fileRef = A54A0C601DB7F8B70017A90B /* WorkerInspectorController.h */; };
A54A0C661DB805360017A90B /* WorkerDebugger.h in Headers */ = {isa = PBXBuildFile; fileRef = A54A0C641DB805320017A90B /* WorkerDebugger.h */; };
A54A0C681DB807D90017A90B /* WorkerToPageFrontendChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = A54A0C671DB807D00017A90B /* WorkerToPageFrontendChannel.h */; };
@@ -5928,12 +5922,6 @@
072880D02010EED70071B255 /* RealtimeVideoCaptureSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeVideoCaptureSource.h; sourceTree = "<group>"; };
072A703E1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverconstrainedErrorEvent.h; sourceTree = "<group>"; };
072A703F1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OverconstrainedErrorEvent.idl; sourceTree = "<group>"; };
- 072AE1DF183C0741000A5988 /* PluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginReplacement.h; sourceTree = "<group>"; };
- 072AE1E0183C0741000A5988 /* QuickTimePluginReplacement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickTimePluginReplacement.mm; sourceTree = "<group>"; };
- 072AE1E1183C0741000A5988 /* QuickTimePluginReplacement.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = QuickTimePluginReplacement.css; sourceTree = "<group>"; };
- 072AE1E2183C0741000A5988 /* QuickTimePluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickTimePluginReplacement.h; sourceTree = "<group>"; };
- 072AE1E3183C0741000A5988 /* QuickTimePluginReplacement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = QuickTimePluginReplacement.idl; sourceTree = "<group>"; };
- 072AE1E4183C0741000A5988 /* QuickTimePluginReplacement.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = QuickTimePluginReplacement.js; sourceTree = "<group>"; };
072CA86016CB4DC3008AE131 /* CaptionUserPreferences.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CaptionUserPreferences.cpp; sourceTree = "<group>"; };
072DBBFB25DB38BC00A1350E /* MediaSessionCoordinator.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = MediaSessionCoordinator.idl; sourceTree = "<group>"; };
072DBC0325DC6BD300A1350E /* MediaSessionCoordinator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSessionCoordinator.h; sourceTree = "<group>"; };
@@ -5989,8 +5977,6 @@
076E11BE1F683E0D00177395 /* TrackPrivateBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackPrivateBase.cpp; sourceTree = "<group>"; };
076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlayerPrivateAVFoundation.cpp; sourceTree = "<group>"; };
076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundation.h; sourceTree = "<group>"; };
- 077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSQuickTimePluginReplacement.cpp; sourceTree = "<group>"; };
- 077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQuickTimePluginReplacement.h; sourceTree = "<group>"; };
077AF13E18F4AE400001ED61 /* SerializedPlatformDataCue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedPlatformDataCue.h; sourceTree = "<group>"; };
077AF14118F4B1BB0001ED61 /* SerializedPlatformDataCueMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedPlatformDataCueMac.h; sourceTree = "<group>"; };
077AF14218F4B1BB0001ED61 /* SerializedPlatformDataCueMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SerializedPlatformDataCueMac.mm; sourceTree = "<group>"; };
@@ -10683,8 +10669,6 @@
7A54857E14E02D51006AE05A /* InspectorHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorHistory.h; sourceTree = "<group>"; };
7A54881514E432A1006AE05A /* DOMPatchSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMPatchSupport.h; sourceTree = "<group>"; };
7A54881614E432A1006AE05A /* DOMPatchSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMPatchSupport.cpp; sourceTree = "<group>"; };
- 7A5515F3191830A3009687D2 /* YouTubePluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YouTubePluginReplacement.h; sourceTree = "<group>"; };
- 7A5515F4191830A3009687D2 /* YouTubePluginReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YouTubePluginReplacement.cpp; sourceTree = "<group>"; };
7A56996E2086C618000E0433 /* CookieRequestHeaderFieldProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CookieRequestHeaderFieldProxy.h; sourceTree = "<group>"; };
7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroupLoadDeferrer.cpp; sourceTree = "<group>"; };
7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroupLoadDeferrer.h; sourceTree = "<group>"; };
@@ -12997,8 +12981,6 @@
A52B349C1FA416F8008B6246 /* WorkerDebuggerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerDebuggerProxy.h; sourceTree = "<group>"; };
A52D85CA21B0982F0061C1EB /* ServerTimingParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ServerTimingParser.cpp; sourceTree = "<group>"; };
A52D85CB21B098300061C1EB /* ServerTimingParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ServerTimingParser.h; sourceTree = "<group>"; };
- A5416FE318810EF80009FC5F /* YouTubeEmbedShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YouTubeEmbedShadowElement.cpp; sourceTree = "<group>"; };
- A5416FE418810EF80009FC5F /* YouTubeEmbedShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YouTubeEmbedShadowElement.h; sourceTree = "<group>"; };
A54A0C5F1DB7F8B70017A90B /* WorkerInspectorController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerInspectorController.cpp; sourceTree = "<group>"; };
A54A0C601DB7F8B70017A90B /* WorkerInspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerInspectorController.h; sourceTree = "<group>"; };
A54A0C631DB805320017A90B /* WorkerDebugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerDebugger.cpp; sourceTree = "<group>"; };
@@ -17851,21 +17833,6 @@
path = mac;
sourceTree = "<group>";
};
- 072AE1DE183C0513000A5988 /* plugins */ = {
- isa = PBXGroup;
- children = (
- 072AE1DF183C0741000A5988 /* PluginReplacement.h */,
- 072AE1E1183C0741000A5988 /* QuickTimePluginReplacement.css */,
- 072AE1E2183C0741000A5988 /* QuickTimePluginReplacement.h */,
- 072AE1E3183C0741000A5988 /* QuickTimePluginReplacement.idl */,
- 072AE1E4183C0741000A5988 /* QuickTimePluginReplacement.js */,
- 072AE1E0183C0741000A5988 /* QuickTimePluginReplacement.mm */,
- 7A5515F4191830A3009687D2 /* YouTubePluginReplacement.cpp */,
- 7A5515F3191830A3009687D2 /* YouTubePluginReplacement.h */,
- );
- path = plugins;
- sourceTree = "<group>";
- };
076F0D0812B8192700C26AA4 /* avfoundation */ = {
isa = PBXGroup;
children = (
@@ -18593,8 +18560,6 @@
BC9854430CD3D9D000069BC1 /* Window */,
A83B79220CCB00F0000B0825 /* XML */,
A83B790C0CCAFF83000B0825 /* XPath */,
- 077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */,
- 077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */,
BC348BD10DB7F804004ABABB /* WebCoreJSBuiltinInternals.cpp */,
BC348BD20DB7F804004ABABB /* WebCoreJSBuiltinInternals.h */,
BC348BD10DB7F804004ABABA /* WebCoreJSBuiltins.cpp */,
@@ -19784,8 +19749,6 @@
142B97C813138943008BEF4B /* TextControlInnerElements.h */,
CE212154240DBD30006ED443 /* TextPlaceholderElement.cpp */,
CE212153240DBD30006ED443 /* TextPlaceholderElement.h */,
- A5416FE318810EF80009FC5F /* YouTubeEmbedShadowElement.cpp */,
- A5416FE418810EF80009FC5F /* YouTubeEmbedShadowElement.h */,
);
path = shadow;
sourceTree = "<group>";
@@ -24454,7 +24417,6 @@
A1F76B0E1F44C0CF0014C318 /* paymentrequest */,
93B0A64226CDC57400AA21E4 /* permissions */,
1DEF06A2233C32DB00EE228D /* pictureinpicture */,
- 072AE1DE183C0513000A5988 /* plugins */,
418FCBB82706E4BD00F96ECA /* push-api */,
CDC312E022FCD0B0001204EC /* remoteplayback */,
AA2A5AB716A485A400975A25 /* speech */,
@@ -33889,7 +33851,6 @@
57303BF42009904600355965 /* JSPublicKeyCredentialDescriptor.h in Headers */,
57303C1120099CB100355965 /* JSPublicKeyCredentialRequestOptions.h in Headers */,
57303C002009951C00355965 /* JSPublicKeyCredentialType.h in Headers */,
- 077664FD183E6B5C00133B92 /* JSQuickTimePluginReplacement.h in Headers */,
B658FFA21522EF3A00DD5595 /* JSRadioNodeList.h in Headers */,
65DF320209D1CC60000BE325 /* JSRange.h in Headers */,
6C4C96DF1AD4483500363F64 /* JSReadableByteStreamController.h in Headers */,
@@ -34840,7 +34801,6 @@
A9C6E4F40D745E48006442E9 /* PluginData.h in Headers */,
97205ABC1239292700B17380 /* PluginDocument.h in Headers */,
1A08FEDD1D592B8B008BA8CB /* PluginInfoProvider.h in Headers */,
- 072AE1E5183C0741000A5988 /* PluginReplacement.h in Headers */,
71E2183A17359FB8006E6E4D /* PlugInsResources.h in Headers */,
0AFDAC3D10F5448C00E1F3D2 /* PluginViewBase.h in Headers */,
BCBB8AB913F1AFB000734DF0 /* PODInterval.h in Headers */,
@@ -34917,7 +34877,6 @@
550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
83C1F5941EDF69D300410D27 /* QualifiedNameCache.h in Headers */,
A15E31F41E0CB0B5004B371C /* QuickLook.h in Headers */,
- 072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */,
9BAEE92C22388A7D004157A9 /* Quirks.h in Headers */,
379E371713736A6600B9E919 /* QuotedPrintable.h in Headers */,
5A574F29131DB96D00471B88 /* QuotesData.h in Headers */,
@@ -36370,8 +36329,6 @@
E1F1E8300C3C2BB9006DB391 /* XSLTExtensions.h in Headers */,
93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */,
E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
- A5416FE618810EF80009FC5F /* YouTubeEmbedShadowElement.h in Headers */,
- 7A5515F5191830A3009687D2 /* YouTubePluginReplacement.h in Headers */,
FD537353137B651800008DCE /* ZeroPole.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -36841,7 +36798,6 @@
CD27AE5122A9868700947FF9 /* ImageRotationSessionVT.mm in Sources */,
070E2D0F26F250890014AAC3 /* InbandChapterTrackPrivateAVFObjC.mm in Sources */,
CD063F821E23FA8900812BE3 /* InitDataRegistry.cpp in Sources */,
- 538EC93E1F99BF5A004D22A8 /* JSQuickTimePluginReplacement.cpp in Sources */,
935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
CDA98E0B1603CD6000FEA3B1 /* LegacyCDM.cpp in Sources */,
CDE8B5EC1A69777300B4B66A /* LegacyCDMPrivateClearKey.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp (285251 => 285252)
--- trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp 2021-11-04 01:23:46 UTC (rev 285252)
@@ -78,12 +78,8 @@
// Choke point for script/plugin interaction; notify DOMTimer of the event.
DOMTimer::scriptDidInteractWithPlugin(pluginElement);
-
- // First, see if the element has a plug-in replacement with a script.
- if (auto* scriptObject = pluginElement.scriptObjectForPluginReplacement())
- return scriptObject;
- // Next, see if we can ask the plug-in view for its script object.
+ // See if we can ask the plug-in view for its script object.
if (auto* scriptObject = pluginScriptObjectFromPluginViewBase(pluginElement, jsHTMLElement->globalObject()))
return scriptObject;
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (285251 => 285252)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2021-11-04 01:23:46 UTC (rev 285252)
@@ -4881,11 +4881,6 @@
push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
push(@implContent, " Base::visitChildren(thisObject, visitor);\n");
push(@implContent, " thisObject->visitAdditionalChildren(visitor);\n") if $interface->extendedAttributes->{JSCustomMarkFunction};
- if ($interface->extendedAttributes->{Plugin}) {
- push(@implContent, "#if PLATFORM(COCOA)\n");
- push(@implContent, " thisObject->wrapped().pluginReplacementScriptObject().visit(visitor);\n");
- push(@implContent, "#endif\n");
- }
if ($interface->extendedAttributes->{GenerateAddOpaqueRoot}) {
AddToImplIncludes("<wtf/GetPtr.h>");
my $functionName = $interface->extendedAttributes->{GenerateAddOpaqueRoot};
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestPluginInterface.cpp (285251 => 285252)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestPluginInterface.cpp 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestPluginInterface.cpp 2021-11-04 01:23:46 UTC (rev 285252)
@@ -265,9 +265,6 @@
auto* thisObject = jsCast<JSTestPluginInterface*>(cell);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
Base::visitChildren(thisObject, visitor);
-#if PLATFORM(COCOA)
- thisObject->wrapped().pluginReplacementScriptObject().visit(visitor);
-#endif
}
DEFINE_VISIT_CHILDREN(JSTestPluginInterface);
Modified: trunk/Source/WebCore/html/HTMLPlugInElement.cpp (285251 => 285252)
--- trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2021-11-04 01:23:46 UTC (rev 285252)
@@ -37,7 +37,6 @@
#include "MIMETypeRegistry.h"
#include "Page.h"
#include "PluginData.h"
-#include "PluginReplacement.h"
#include "PluginViewBase.h"
#include "RenderEmbeddedObject.h"
#include "RenderLayer.h"
@@ -50,11 +49,6 @@
#include "Widget.h"
#include <wtf/IsoMallocInlines.h>
-#if PLATFORM(COCOA)
-#include "QuickTimePluginReplacement.h"
-#include "YouTubePluginReplacement.h"
-#endif
-
namespace WebCore {
WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLPlugInElement);
@@ -252,11 +246,8 @@
return !downcast<RenderEmbeddedObject>(*renderer()).isPluginUnavailable();
}
-RenderPtr<RenderElement> HTMLPlugInElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition& insertionPosition)
+RenderPtr<RenderElement> HTMLPlugInElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
{
- if (m_pluginReplacement && m_pluginReplacement->willCreateRenderer())
- return m_pluginReplacement->createElementRenderer(*this, WTFMove(style), insertionPosition);
-
return createRenderer<RenderEmbeddedObject>(*this, WTFMove(style));
}
@@ -284,125 +275,15 @@
m_swapRendererTimer.startOneShot(0_s);
}
-void HTMLPlugInElement::didAddUserAgentShadowRoot(ShadowRoot& root)
+void HTMLPlugInElement::didAddUserAgentShadowRoot(ShadowRoot&)
{
- if (!m_pluginReplacement || !document().page() || displayState() != PreparingPluginReplacement)
- return;
-
- root.setResetStyleInheritance(true);
- auto result = m_pluginReplacement->installReplacement(root);
-
-#if PLATFORM(COCOA)
- RELEASE_ASSERT(result.success || !result.scriptObject);
- m_pluginReplacementScriptObject = result.scriptObject;
-#endif
-
- if (result.success) {
- setDisplayState(DisplayingPluginReplacement);
- invalidateStyleAndRenderersForSubtree();
- }
}
-#if PLATFORM(COCOA)
-static void registrar(const ReplacementPlugin&);
-#endif
-
-static Vector<ReplacementPlugin*>& registeredPluginReplacements()
+bool HTMLPlugInElement::requestObject(const String&, const String&, const Vector<String>&, const Vector<String>&)
{
- static NeverDestroyed<Vector<ReplacementPlugin*>> registeredReplacements;
- static bool enginesQueried = false;
-
- if (enginesQueried)
- return registeredReplacements;
- enginesQueried = true;
-
-#if PLATFORM(COCOA)
- QuickTimePluginReplacement::registerPluginReplacement(registrar);
- YouTubePluginReplacement::registerPluginReplacement(registrar);
-#endif
-
- return registeredReplacements;
+ return false;
}
-#if PLATFORM(COCOA)
-static void registrar(const ReplacementPlugin& replacement)
-{
- registeredPluginReplacements().append(new ReplacementPlugin(replacement));
-}
-#endif
-
-static ReplacementPlugin* pluginReplacementForType(const URL& url, const String& mimeType)
-{
- Vector<ReplacementPlugin*>& replacements = registeredPluginReplacements();
- if (replacements.isEmpty())
- return nullptr;
-
- String extension;
- auto lastPathComponent = url.lastPathComponent();
- size_t dotOffset = lastPathComponent.reverseFind('.');
- if (dotOffset != notFound)
- extension = lastPathComponent.substring(dotOffset + 1).toString();
-
- String type = mimeType;
- if (type.isEmpty() && url.protocolIsData())
- type = mimeTypeFromDataURL(url.string());
-
- if (type.isEmpty() && !extension.isEmpty()) {
- for (auto* replacement : replacements) {
- if (replacement->supportsFileExtension(extension) && replacement->supportsURL(url))
- return replacement;
- }
- }
-
- if (type.isEmpty()) {
- if (extension.isEmpty())
- return nullptr;
- type = MIMETypeRegistry::mediaMIMETypeForExtension(extension);
- }
-
- if (type.isEmpty())
- return nullptr;
-
- for (auto* replacement : replacements) {
- if (replacement->supportsType(type) && replacement->supportsURL(url))
- return replacement;
- }
-
- return nullptr;
-}
-
-bool HTMLPlugInElement::requestObject(const String& relativeURL, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
-{
- if (m_pluginReplacement)
- return true;
-
- URL completedURL;
- if (!relativeURL.isEmpty())
- completedURL = document().completeURL(relativeURL);
-
- ReplacementPlugin* replacement = pluginReplacementForType(completedURL, mimeType);
- if (!replacement || !replacement->isEnabledBySettings(document().settings()))
- return false;
-
- LOG(Plugins, "%p - Found plug-in replacement for %s.", this, completedURL.string().utf8().data());
-
- m_pluginReplacement = replacement->create(*this, paramNames, paramValues);
- setDisplayState(PreparingPluginReplacement);
- return true;
-}
-
-JSC::JSObject* HTMLPlugInElement::scriptObjectForPluginReplacement()
-{
-#if PLATFORM(COCOA)
- JSC::JSValue value = m_pluginReplacementScriptObject;
- if (!value)
- return nullptr;
- return value.getObject();
-#else
- return nullptr;
-#endif
-}
-
bool HTMLPlugInElement::isBelowSizeThreshold() const
{
auto* renderObject = renderer();
Modified: trunk/Source/WebCore/html/HTMLPlugInElement.h (285251 => 285252)
--- trunk/Source/WebCore/html/HTMLPlugInElement.h 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.h 2021-11-04 01:23:46 UTC (rev 285252)
@@ -35,7 +35,6 @@
namespace WebCore {
-class PluginReplacement;
class RenderWidget;
class Widget;
@@ -59,11 +58,6 @@
DisplayState displayState() const { return m_displayState; }
void setDisplayState(DisplayState);
- JSC::JSObject* scriptObjectForPluginReplacement();
-#if PLATFORM(COCOA)
- JSValueInWrappedObject& pluginReplacementScriptObject() { return m_pluginReplacementScriptObject; }
-#endif
-
bool isCapturingMouseEvents() const { return m_isCapturingMouseEvents; }
void setIsCapturingMouseEvents(bool capturing) { m_isCapturingMouseEvents = capturing; }
@@ -119,10 +113,6 @@
RefPtr<JSC::Bindings::Instance> m_instance;
Timer m_swapRendererTimer;
- RefPtr<PluginReplacement> m_pluginReplacement;
-#if PLATFORM(COCOA)
- JSValueInWrappedObject m_pluginReplacementScriptObject;
-#endif
bool m_isCapturingMouseEvents { false };
bool m_inBeforeLoadEventHandler { false };
DisplayState m_displayState { Playing };
Modified: trunk/Source/WebCore/html/shadow/ShadowPseudoIds.cpp (285251 => 285252)
--- trunk/Source/WebCore/html/shadow/ShadowPseudoIds.cpp 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/html/shadow/ShadowPseudoIds.cpp 2021-11-04 01:23:46 UTC (rev 285252)
@@ -219,12 +219,6 @@
return webkitMeterEvenLessGoodValue;
}
-const AtomString& webkitPluginReplacement()
-{
- static MainThreadNeverDestroyed<const AtomString> webkitPluginReplacement("-webkit-plugin-replacement", AtomString::ConstructFromLiteral);
- return webkitPluginReplacement;
-}
-
const AtomString& webkitProgressBar()
{
static MainThreadNeverDestroyed<const AtomString> webkitProgressBar("-webkit-progress-bar", AtomString::ConstructFromLiteral);
Modified: trunk/Source/WebCore/html/shadow/ShadowPseudoIds.h (285251 => 285252)
--- trunk/Source/WebCore/html/shadow/ShadowPseudoIds.h 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/html/shadow/ShadowPseudoIds.h 2021-11-04 01:23:46 UTC (rev 285252)
@@ -79,8 +79,6 @@
const AtomString& webkitMeterSuboptimumValue();
const AtomString& webkitMeterEvenLessGoodValue();
-const AtomString& webkitPluginReplacement();
-
const AtomString& webkitProgressBar();
const AtomString& webkitProgressValue();
const AtomString& webkitProgressInnerElement();
Deleted: trunk/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp (285251 => 285252)
--- trunk/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2012-2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "YouTubeEmbedShadowElement.h"
-
-#include "RenderBlockFlow.h"
-#include "ShadowPseudoIds.h"
-#include <wtf/IsoMallocInlines.h>
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(YouTubeEmbedShadowElement);
-
-Ref<YouTubeEmbedShadowElement> YouTubeEmbedShadowElement::create(Document& document)
-{
- auto element = adoptRef(*new YouTubeEmbedShadowElement(document));
- element->setPseudo(ShadowPseudoIds::webkitPluginReplacement());
- return element;
-}
-
-YouTubeEmbedShadowElement::YouTubeEmbedShadowElement(Document& document)
- : HTMLDivElement(HTMLNames::divTag, document)
-{
-}
-
-RenderPtr<RenderElement> YouTubeEmbedShadowElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
-{
- return createRenderer<RenderBlockFlow>(*this, WTFMove(style));
-}
-
-}
Deleted: trunk/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h (285251 => 285252)
--- trunk/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "HTMLDivElement.h"
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-class YouTubeEmbedShadowElement final : public HTMLDivElement {
- WTF_MAKE_ISO_ALLOCATED(YouTubeEmbedShadowElement);
-public:
- static Ref<YouTubeEmbedShadowElement> create(Document&);
-
- RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
-
-private:
- YouTubeEmbedShadowElement(Document&);
-};
-
-} // namespace WebCore
Modified: trunk/Source/WebCore/page/Settings.yaml (285251 => 285252)
--- trunk/Source/WebCore/page/Settings.yaml 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebCore/page/Settings.yaml 2021-11-04 01:23:46 UTC (rev 285252)
@@ -445,12 +445,6 @@
"HAVE(RSA_BSSA)": true
default: false
-QuickTimePluginReplacementEnabled:
- type: bool
- defaultValue:
- WebCore:
- default: false
-
RepaintOutsideLayoutEnabled:
type: bool
defaultValue:
@@ -638,9 +632,3 @@
defaultValue:
WebCore:
default: false
-
-YouTubeFlashPluginReplacementEnabled:
- type: bool
- defaultValue:
- WebCore:
- default: false
Modified: trunk/Source/WebInspectorUI/ChangeLog (285251 => 285252)
--- trunk/Source/WebInspectorUI/ChangeLog 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebInspectorUI/ChangeLog 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,3 +1,12 @@
+2021-11-03 Alex Christensen <[email protected]>
+
+ Remove QuickTimePluginReplacement and YouTubePluginReplacement
+ https://bugs.webkit.org/show_bug.cgi?id=232400
+
+ Reviewed by Chris Dumez.
+
+ * UserInterface/Models/NativeFunctionParameters.js:
+
2021-11-03 Nikita Vasilyev <[email protected]>
Web Inspector: Display swatch popovers below the swatch by default, not on the left side
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js (285251 => 285252)
--- trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1271,11 +1271,6 @@
__proto__: null,
},
- QuickTimePluginReplacement: {
- postEvent: "eventName",
- __proto__: null,
- },
-
RTCDTMFSender: {
insertDTMF: "tones, [duration], [interToneGap]",
__proto__: null,
Modified: trunk/Tools/ChangeLog (285251 => 285252)
--- trunk/Tools/ChangeLog 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Tools/ChangeLog 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,3 +1,13 @@
+2021-11-03 Alex Christensen <[email protected]>
+
+ Remove QuickTimePluginReplacement and YouTubePluginReplacement
+ https://bugs.webkit.org/show_bug.cgi?id=232400
+
+ Reviewed by Chris Dumez.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp: Removed.
+
2021-11-03 Yousuke Kimoto <[email protected]>
Use 0.0.0.0 when "--all-interfaces" is given for websocket_server
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (285251 => 285252)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-11-04 01:23:46 UTC (rev 285252)
@@ -946,7 +946,6 @@
9BDD95581F83683600D20C60 /* PasteRTFD.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9BDD95561F83683600D20C60 /* PasteRTFD.mm */; };
9BF00133267C4C5900DCFB3F /* CheckedRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BF00132267C4C5900DCFB3F /* CheckedRef.cpp */; };
9BF356CD202D458500F71160 /* mso-list.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 9BF356CC202D44F200F71160 /* mso-list.html */; };
- 9C64DC321D76198A004B598E /* YouTubePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */; };
A10F047E1E3AD29C00C95E19 /* NSFileManagerExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = A10F047C1E3AD29C00C95E19 /* NSFileManagerExtras.mm */; };
A1146A8D1D2D7115000FE710 /* ContentFiltering.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */; };
A11E7DA024A169F900026745 /* link-with-hover-menu.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = A11E7D9F24A169E200026745 /* link-with-hover-menu.html */; };
@@ -2710,7 +2709,6 @@
9BDD95561F83683600D20C60 /* PasteRTFD.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteRTFD.mm; sourceTree = "<group>"; };
9BF00132267C4C5900DCFB3F /* CheckedRef.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CheckedRef.cpp; sourceTree = "<group>"; };
9BF356CC202D44F200F71160 /* mso-list.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "mso-list.html"; sourceTree = "<group>"; };
- 9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YouTubePluginReplacement.cpp; sourceTree = "<group>"; };
A10F047C1E3AD29C00C95E19 /* NSFileManagerExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NSFileManagerExtras.mm; sourceTree = "<group>"; };
A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContentFiltering.mm; sourceTree = "<group>"; };
A11E7D9F24A169E200026745 /* link-with-hover-menu.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "link-with-hover-menu.html"; sourceTree = "<group>"; };
@@ -3854,7 +3852,6 @@
7AD3FE8D1D75FB8D00B169A4 /* TransformationMatrix.cpp */,
57D1D75E21DCB7A80093E86A /* U2fCommandConstructorTest.cpp */,
E3A1E77E21B25B39008C6007 /* URLParserTextEncoding.cpp */,
- 9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */,
);
path = WebCore;
sourceTree = "<group>";
@@ -6076,7 +6073,6 @@
953ABB3525C0D682004C8B73 /* WKWebViewUnderPageBackgroundColor.mm in Sources */,
7C74C8FA22DFBA9600DA2DAB /* WTFStringUtilities.cpp in Sources */,
C14D304624B4C3BA00480387 /* XPCEndpoint.mm in Sources */,
- 9C64DC321D76198A004B598E /* YouTubePluginReplacement.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Deleted: trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp (285251 => 285252)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp 2021-11-04 00:40:44 UTC (rev 285251)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp 2021-11-04 01:23:46 UTC (rev 285252)
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include <WebCore/YouTubePluginReplacement.h>
-#include <wtf/MainThread.h>
-#include <wtf/URL.h>
-
-using namespace WebCore;
-
-namespace TestWebKitAPI {
-
-class YouTubePluginReplacementTest : public testing::Test {
-public:
- void SetUp() final {
- WTF::initializeMainThread();
- }
-};
-
-static bool test(const String& inputURLString, const String& expectedURLString)
-{
- URL inputURL(URL(), inputURLString);
- String actualURLString = YouTubePluginReplacement::youTubeURLFromAbsoluteURL(inputURL, inputURLString);
- return actualURLString.utf8() == expectedURLString.utf8();
-}
-
-TEST_F(YouTubePluginReplacementTest, YouTubeURLFromAbsoluteURL)
-{
- // YouTube non-video URL, not expected to be transformed.
- EXPECT_TRUE(test("https://www.youtube.com", "https://www.youtube.com"));
-
- // Basic YouTube video links, expected to be transformed.
- EXPECT_TRUE(test("https://www.youtube.com/v/dQw4w9WgXcQ", "https://www.youtube.com/embed/dQw4w9WgXcQ"));
- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ", "http://www.youtube.com/embed/dQw4w9WgXcQ"));
- EXPECT_TRUE(test("https://youtube.com/v/dQw4w9WgXcQ", "https://youtube.com/embed/dQw4w9WgXcQ"));
- EXPECT_TRUE(test("http://youtube.com/v/dQw4w9WgXcQ", "http://youtube.com/embed/dQw4w9WgXcQ"));
-
- // With start time, preserved.
- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4"));
- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ?start=4&fs=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&fs=1"));
-
- // With an invalid query (see & instead of ?), we preserve and fix the query.
- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4"));
- EXPECT_TRUE(test("http://www.youtube.com/v/dQw4w9WgXcQ&start=4&fs=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?start=4&fs=1"));
-
- // Non-Flash URL is untouched.
- EXPECT_TRUE(test("https://www.youtube.com/embed/dQw4w9WgXcQ", "https://www.youtube.com/embed/dQw4w9WgXcQ"));
- EXPECT_TRUE(test("http://www.youtube.com/embed/dQw4w9WgXcQ", "http://www.youtube.com/embed/dQw4w9WgXcQ"));
- EXPECT_TRUE(test("https://youtube.com/embed/dQw4w9WgXcQ", "https://youtube.com/embed/dQw4w9WgXcQ"));
- EXPECT_TRUE(test("http://youtube.com/embed/dQw4w9WgXcQ", "http://youtube.com/embed/dQw4w9WgXcQ"));
- // Even with extra parameters.
- EXPECT_TRUE(test("https://www.youtube.com/embed/dQw4w9WgXcQ?start=4", "https://www.youtube.com/embed/dQw4w9WgXcQ?start=4"));
- EXPECT_TRUE(test("http://www.youtube.com/embed/dQw4w9WgXcQ?enablejsapi=1", "http://www.youtube.com/embed/dQw4w9WgXcQ?enablejsapi=1"));
- // Even with an invalid "query".
- EXPECT_TRUE(test("https://www.youtube.com/embed/dQw4w9WgXcQ&start=4", "https://www.youtube.com/embed/dQw4w9WgXcQ&start=4"));
-
- // Don't transform anything with a non "/v/" path component immediately following the domain.
- EXPECT_TRUE(test("https://www.youtube.com/something/v/dQw4w9WgXcQ", "https://www.youtube.com/something/v/dQw4w9WgXcQ"));
-
- // Non-YouTube domain whose path looks like a Flash video shouldn't be transformed.
- EXPECT_TRUE(test("https://www.notyoutube.com/v/dQw4w9WgXcQ", "https://www.notyoutube.com/v/dQw4w9WgXcQ"));
-}
-
-} // namespace TestWebKitAPI
