Diff
Modified: trunk/LayoutTests/ChangeLog (285002 => 285003)
--- trunk/LayoutTests/ChangeLog 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/ChangeLog 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,3 +1,32 @@
+2021-10-28 Alex Christensen <achristen...@webkit.org>
+
+ Disable NETSCAPE_PLUGIN_API at build time on macOS and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=232396
+
+ Reviewed by Geoff Garen.
+
+ * TestExpectations:
+ * fast/frames/sandboxed-iframe-plugins-expected.txt:
+ * fast/frames/sandboxed-iframe-plugins.html:
+ * http/tests/contentextensions/plugin-doesnt-crash-expected.txt: Removed.
+ * http/tests/contentextensions/plugin-doesnt-crash.html: Removed.
+ * http/tests/contentextensions/plugin-doesnt-crash.html.json: Removed.
+ * http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt: Removed.
+ * http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html: Removed.
+ * platform/glib/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/ios/TestExpectations:
+ * platform/mac-wk1/fast/dom/collection-iterators-expected.txt: Added.
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac-wk2/plugins/contents-scale-factor-expected.txt:
+ * platform/mac-wk2/plugins/contents-scale-factor.html:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+ * platform/wk2/TestExpectations:
+ * platform/wpe/TestExpectations:
+ * tiled-drawing/scrolling/non-fast-region/wheel-event-plugin-expected.txt: Removed.
+ * tiled-drawing/scrolling/non-fast-region/wheel-event-plugin.html: Removed.
+
2021-10-28 Nikolaos Mouchtaris <nmouchta...@apple.com>
[Debug] imported/w3c/web-platform-tests/html/canvas/element/path-objects/2d.path.ellipse.basics.html is asserting
Modified: trunk/LayoutTests/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1846,7 +1846,6 @@
webkit.org/b/139595 http/tests/xmlhttprequest/workers/abort-exception-assert.html [ Pass Failure Timeout ]
# Debug assertions are tracked as <rdar://problem/18216390>.
-[ Debug ] fast/history/go-back-to-iframe-with-plugin.html [ Skip ]
[ Debug ] fast/history/history-back-while-pdf-in-pagecache.html [ Skip ]
webkit.org/b/121628 [ Release ] fast/history/history-back-while-pdf-in-pagecache.html [ Pass ImageOnlyFailure ]
[ Debug ] fullscreen/full-screen-iframe-legacy.html [ Pass Crash ]
@@ -2269,7 +2268,6 @@
webkit.org/b/153155 http/tests/security/contentSecurityPolicy/1.1/stylenonce-svg-style-basic-blocked-error-event.html
webkit.org/b/153155 http/tests/security/contentSecurityPolicy/style-src-blocked-error-event.html
webkit.org/b/153159 http/tests/security/contentSecurityPolicy/image-document-default-src-none.html [ Failure ]
-webkit.org/b/153160 http/tests/security/contentSecurityPolicy/object-src-does-not-affect-child.html [ Failure ]
webkit.org/b/153160 http/tests/security/contentSecurityPolicy/plugin-in-iframe-with-csp.html [ Failure ]
webkit.org/b/153161 http/tests/security/contentSecurityPolicy/register-bypassing-scheme-partial.html [ Failure ]
webkit.org/b/153162 http/tests/security/contentSecurityPolicy/report-multiple-violations-01.py [ Failure ]
@@ -2278,14 +2276,6 @@
webkit.org/b/154522 http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-base-uri-deny.html
webkit.org/b/158480 http/tests/websocket/tests/hybi/upgrade-simple-ws.html [ Skip ]
-# Skipping youtube-plugin-replacement & quicktime-plugin-replacement tests
-webkit.org/b/229505 security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html [ Skip ]
-webkit.org/b/229505 security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html [ Skip ]
-webkit.org/b/229505 security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html [ Skip ]
-webkit.org/b/229505 security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html [ Skip ]
-webkit.org/b/229505 security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html [ Skip ]
-webkit.org/b/229505 security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html [ Skip ]
-
# These state object tests purposefully stress a resource limit, and take multiple seconds to run.
loader/stateobjects/pushstate-size-iframe.html [ Slow ]
loader/stateobjects/pushstate-size.html [ Slow ]
@@ -5098,3 +5088,84 @@
[ Debug ] ipc/send-invalid-message.html [ Skip ]
imported/w3c/web-platform-tests/css/css-shadow-parts/interaction-with-nested-pseudo-class.html [ ImageOnlyFailure ]
+
+# Plugins
+# FIXME: Remove these tests.
+plugins/ [ Skip ]
+http/tests/plugins [ Skip ]
+http/tests/security/cross-origin-plugin.html [ Skip ]
+http/tests/security/cross-origin-plugin-allowed.html [ Skip ]
+http/tests/security/cross-origin-plugin-private-browsing-toggled.html [ Skip ]
+http/tests/security/cross-origin-plugin-private-browsing-toggled-allowed.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-child.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-mismatched-data.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-mismatched-url.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-url.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-allowed.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01.html [ Skip ]
+http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02.html [ Skip ]
+http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe.html [ Skip ]
+http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-main-frame.html [ Skip ]
+http/tests/security/contentSecurityPolicy/embed-with-no-url-allowed-by-default-src-star.html [ Skip ]
+http/tests/security/contentSecurityPolicy/embed-with-no-url-allowed-by-star.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-does-not-affect-child.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-none-allowed.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-none-blocked.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-param-code-blocked.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-param-movie-blocked.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-param-src-blocked.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-src-param-url-blocked.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-with-no-url-allowed-by-default-src-star.html [ Skip ]
+http/tests/security/contentSecurityPolicy/object-with-no-url-allowed-by-star.html [ Skip ]
+http/tests/security/contentSecurityPolicy/cross-origin-plugin-document-allowed-in-child-window.html [ Skip ]
+http/tests/security/contentSecurityPolicy/plugin-blocked-in-about-blank-window.html [ Skip ]
+http/tests/security/contentSecurityPolicy/same-origin-plugin-document-allowed-in-child-window.html [ Skip ]
+http/tests/security/contentSecurityPolicy/same-origin-plugin-document-blocked-in-child-window-report.py [ Skip ]
+http/tests/security/contentSecurityPolicy/same-origin-plugin-document-blocked-in-child-window.html [ Skip ]
+http/tests/security/contentSecurityPolicy/same-origin-plugin-document-with-csp-blocked-in-child-window.html [ Skip ]
+http/tests/security/contentSecurityPolicy/source-list-parsing-no-semicolon.html [ Skip ]
+http/tests/security/contentSecurityPolicy/userAgentShadowDOM/allow-embed-plugin.html [ Skip ]
+http/tests/security/contentSecurityPolicy/userAgentShadowDOM/allow-object-plugin.html [ Skip ]
+http/tests/security/mixedContent/insecure-plugin-in-iframe.html [ Skip ]
+http/tests/security/storage-blocking-loosened-plugin.html [ Skip ]
+http/tests/security/storage-blocking-loosened-private-browsing-plugin.html [ Skip ]
+http/tests/security/storage-blocking-strengthened-plugin.html [ Skip ]
+http/tests/security/storage-blocking-strengthened-private-browsing-plugin.html [ Skip ]
+compositing/plugins [ Skip ]
+compositing/geometry/empty-embed-rects.html [ Skip ]
+accessibility/plugin.html [ Skip ]
+editing/selection/selection-plugin-clear-crash.html [ Skip ]
+fast/dom/Window/Plug-ins.html [ Skip ]
+fast/frames/iframe-plugin-load-remove-document-crash.html [ Skip ]
+fast/frames/sandboxed-iframe-about-blank.html [ Skip ]
+fast/frames/sandboxed-iframe-navigation-allowed.html [ Skip ]
+fast/history/go-back-to-iframe-with-plugin.html [ Skip ]
+fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html [ Skip ]
+fast/layers/clip-rects-transformed-2.html [ Skip ]
+fast/layers/clip-rects-transformed.html [ Skip ]
+fast/loader/loadInProgress.html [ Skip ]
+fast/loader/reload-zero-byte-plugin.html [ Skip ]
+fast/replaced/border-radius-clip.html [ Skip ]
+fast/replaced/embed-display-none.html [ Skip ]
+fast/replaced/invalid-object-with-fallback.html [ Skip ]
+fast/replaced/no-focus-ring-embed.html [ Skip ]
+fast/replaced/no-focus-ring-object.html [ Skip ]
+fast/replaced/object-with-non-empty-classid-triggers-fallback.html [ Skip ]
+fullscreen/full-screen-plugin.html [ Skip ]
+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/fast/frames/sandboxed-iframe-plugins-expected.txt (285002 => 285003)
--- trunk/LayoutTests/fast/frames/sandboxed-iframe-plugins-expected.txt 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/fast/frames/sandboxed-iframe-plugins-expected.txt 2021-10-28 21:21:39 UTC (rev 285003)
@@ -5,9 +5,9 @@
NOTE: The first sub-test will fail in DumpRenderTree, since DumpRenderTree does not support applets. That sub-test must be run in Safari instead.
-PASS (self.embedFrame1.document.getElementById('plugin').destroyStream) != undefined is true
+PASS (self.embedFrame1.document.getElementById('plugin').destroyStream) == undefined is true
PASS (self.embedFrame2.document.getElementById('plugin').destroyStream) == undefined is true
-PASS (self.objectFrame1.document.getElementById('plugin').destroyStream) != undefined is true
+PASS (self.objectFrame1.document.getElementById('plugin').destroyStream) == undefined is true
PASS (self.objectFrame2.document.getElementById('plugin').destroyStream) == undefined is true
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/frames/sandboxed-iframe-plugins.html (285002 => 285003)
--- trunk/LayoutTests/fast/frames/sandboxed-iframe-plugins.html 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/fast/frames/sandboxed-iframe-plugins.html 2021-10-28 21:21:39 UTC (rev 285003)
@@ -6,10 +6,10 @@
testRunner.dumpAsText();
window._onload_ = function() {
- shouldBeTrue("(self.embedFrame1.document.getElementById('plugin').destroyStream) != undefined");
+ shouldBeTrue("(self.embedFrame1.document.getElementById('plugin').destroyStream) == undefined");
shouldBeTrue("(self.embedFrame2.document.getElementById('plugin').destroyStream) == undefined");
- shouldBeTrue("(self.objectFrame1.document.getElementById('plugin').destroyStream) != undefined");
+ shouldBeTrue("(self.objectFrame1.document.getElementById('plugin').destroyStream) == undefined");
shouldBeTrue("(self.objectFrame2.document.getElementById('plugin').destroyStream) == undefined");
isSuccessfullyParsed();
Deleted: trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt (285002 => 285003)
--- trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1 +0,0 @@
-This tests that NPN_GetURLNotify works as expected and does not ASSERT intermittently in debug builds.
Deleted: trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html (285002 => 285003)
--- trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,19 +0,0 @@
-<html>
-<body>
-This tests that NPN_GetURLNotify works as expected and does not ASSERT intermittently in debug builds.
-<embed name="plg" type="application/x-webkit-test-netscape"></embed>
-<script>
- function notify()
- {
- if (window.testRunner)
- testRunner.notifyDone();
- }
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- plg.getURLNotify("resources/load-me-1.txt", null, "notify");
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html.json (285002 => 285003)
--- trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html.json 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html.json 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,10 +0,0 @@
-[
- {
- "action": {
- "type": "block"
- },
- "trigger": {
- "url-filter": "load-me"
- }
- }
-]
Deleted: trunk/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt (285002 => 285003)
--- trunk/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,19 +0,0 @@
-CONSOLE MESSAGE: Unsafe _javascript_ attempt to initiate navigation for frame with URL 'http://127.0.0.1:8000/security/resources/cross-frame-iframe.html' from frame with URL 'http://localhost:8000/security/frameNavigation/resources/frame-with-plugin-to-navigate.html'. The frame attempting navigation is neither same-origin with the target, nor is it the target's parent or opener.
-
-
-
---------
-Frame: '<!--frame1-->'
---------
-
-Frame-with-plugin-to-navigate
-
-localhost
-
-Test PASSED
-
-
---------
-Frame: 'toNavigate'
---------
-Inner iframe.
Deleted: trunk/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html (285002 => 285003)
--- trunk/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,20 +0,0 @@
-<html>
-<head>
- <script src=""
- <script>
- window._onload_ = function()
- {
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpChildFramesAsText();
- testRunner.waitUntilDone();
- }
- }
- </script>
-</head>
-<body>
-<pre id='console'></pre>
-<iframe src=""
-<iframe name="toNavigate" src=""
-</body>
-</html>
Modified: trunk/LayoutTests/platform/glib/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/platform/glib/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/glib/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1726,82 +1726,6 @@
# Payment Request
imported/w3c/web-platform-tests/payment-request [ Skip ]
-# Plugins
-plugins/ [ Skip ]
-http/tests/plugins [ Skip ]
-http/tests/contentextensions/plugin-doesnt-crash.html [ Skip ]
-http/tests/security/cross-origin-plugin.html [ Skip ]
-http/tests/security/cross-origin-plugin-allowed.html [ Skip ]
-http/tests/security/cross-origin-plugin-private-browsing-toggled.html [ Skip ]
-http/tests/security/cross-origin-plugin-private-browsing-toggled-allowed.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-child.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-mismatched-data.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-mismatched-url.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-url.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-allowed.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01.html [ Skip ]
-http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02.html [ Skip ]
-http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe.html [ Skip ]
-http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-main-frame.html [ Skip ]
-http/tests/security/contentSecurityPolicy/embed-with-no-url-allowed-by-default-src-star.html [ Skip ]
-http/tests/security/contentSecurityPolicy/embed-with-no-url-allowed-by-star.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-does-not-affect-child.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-none-allowed.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-none-blocked.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-param-code-blocked.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-param-movie-blocked.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-param-src-blocked.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-src-param-url-blocked.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-with-no-url-allowed-by-default-src-star.html [ Skip ]
-http/tests/security/contentSecurityPolicy/object-with-no-url-allowed-by-star.html [ Skip ]
-http/tests/security/contentSecurityPolicy/plugin-blocked-in-about-blank-window.html [ Skip ]
-http/tests/security/contentSecurityPolicy/source-list-parsing-no-semicolon.html [ Skip ]
-http/tests/security/contentSecurityPolicy/userAgentShadowDOM/allow-embed-plugin.html [ Skip ]
-http/tests/security/contentSecurityPolicy/userAgentShadowDOM/allow-object-plugin.html [ Skip ]
-http/tests/security/mixedContent/insecure-plugin-in-iframe.html [ Skip ]
-http/tests/security/storage-blocking-loosened-plugin.html [ Skip ]
-http/tests/security/storage-blocking-loosened-private-browsing-plugin.html [ Skip ]
-http/tests/security/storage-blocking-strengthened-plugin.html [ Skip ]
-http/tests/security/storage-blocking-strengthened-private-browsing-plugin.html [ Skip ]
-compositing/plugins [ Skip ]
-compositing/geometry/empty-embed-rects.html [ Skip ]
-accessibility/plugin.html [ Skip ]
-editing/selection/selection-plugin-clear-crash.html [ Skip ]
-fast/dom/Window/Plug-ins.html [ Skip ]
-fast/frames/iframe-plugin-load-remove-document-crash.html [ Skip ]
-fast/frames/sandboxed-iframe-about-blank.html [ Skip ]
-fast/frames/sandboxed-iframe-navigation-allowed.html [ Skip ]
-fast/history/go-back-to-iframe-with-plugin.html [ Skip ]
-fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html [ Skip ]
-fast/layers/clip-rects-transformed-2.html [ Skip ]
-fast/layers/clip-rects-transformed.html [ Skip ]
-fast/loader/loadInProgress.html [ Skip ]
-fast/loader/reload-zero-byte-plugin.html [ Skip ]
-fast/replaced/border-radius-clip.html [ Skip ]
-fast/replaced/embed-display-none.html [ Skip ]
-fast/replaced/invalid-object-with-fallback.html [ Skip ]
-fast/replaced/no-focus-ring-embed.html [ Skip ]
-fast/replaced/no-focus-ring-object.html [ Skip ]
-fast/replaced/object-with-non-empty-classid-triggers-fallback.html [ Skip ]
-fullscreen/full-screen-plugin.html [ Skip ]
-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 ]
-
# WebArchive
webarchive [ WontFix ]
http/tests/webarchive [ WontFix ]
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -816,7 +816,6 @@
webkit.org/b/200162 http/tests/websocket/tests/hybi/inspector/ [ Skip ]
# Plugins.
-http/tests/contentextensions/plugin-doesnt-crash.html [ Skip ]
http/tests/security/contentSecurityPolicy/cross-origin-plugin-document-allowed-in-child-window.html [ Skip ]
http/tests/security/contentSecurityPolicy/same-origin-plugin-document-allowed-in-child-window.html [ Skip ]
http/tests/security/contentSecurityPolicy/same-origin-plugin-document-blocked-in-child-window-report.py [ Skip ]
Modified: trunk/LayoutTests/platform/ios/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/platform/ios/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/ios/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1168,7 +1168,6 @@
http/tests/navigation/scrollstate-after-http-equiv-refresh.html
http/tests/navigation/scrollstate-after-location-reload.html
http/tests/security/contentSecurityPolicy/media-src-allowed.html
-http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html
http/tests/canvas/webgl/origin-clean-conformance.html
# HTTP tests that fail:
Modified: trunk/LayoutTests/platform/mac/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/platform/mac/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -24,7 +24,6 @@
[ arm64 ] platform/mac/plugins [ Skip ]
[ arm64 ] plugins [ Skip ]
[ arm64 ] fullscreen/full-screen-plugin.html [ Skip ]
-[ arm64 ] http/tests/contentextensions/plugin-doesnt-crash.html [ Skip ]
[ arm64 ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-child.html [ Skip ]
[ arm64 ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid.html [ Skip ]
[ arm64 ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01.html [ Skip ]
@@ -45,7 +44,6 @@
[ arm64 ] http/tests/security/mixedContent/insecure-plugin-in-iframe.html [ Skip ]
[ arm64 ] http/tests/security/storage-blocking-loosened-plugin.html [ Skip ]
[ arm64 ] http/tests/security/storage-blocking-strengthened-plugin.html [ Skip ]
-[ arm64 ] tiled-drawing/scrolling/non-fast-region/wheel-event-plugin.html [ Skip ]
[ arm64 ] userscripts/user-script-plugin-document.html [ Skip ]
[ arm64 ] fast/frames/sandboxed-iframe-about-blank.html [ Skip ]
[ arm64 ] fast/frames/sandboxed-iframe-navigation-allowed.html [ Skip ]
@@ -2442,3 +2440,8 @@
webkit.org/b/231757 [ BigSur ] inspector/canvas/updateShader-webgl.html [ Pass Failure ]
webkit.org/b/231924 inspector/css/modify-css-property.html [ Pass Failure ]
+
+# Plugins
+# FIXME: Remove these tests.
+platform/mac/plugins/testplugin-onnew-onpaint.html [ Skip ]
+platform/mac/plugins/convert-point.html [ Skip ]
Added: trunk/LayoutTests/platform/mac-wk1/fast/dom/collection-iterators-expected.txt (0 => 285003)
--- trunk/LayoutTests/platform/mac-wk1/fast/dom/collection-iterators-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk1/fast/dom/collection-iterators-expected.txt 2021-10-28 21:21:39 UTC (rev 285003)
@@ -0,0 +1,188 @@
+Tests that interfaces with an indexed getter and an integer-type length attribute get an iterator.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+* AudioTrackList
+PASS obj.__proto__ is AudioTrackList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* CSSRuleList
+PASS obj.__proto__ is CSSRuleList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* CSSStyleDeclaration
+PASS obj.__proto__ is CSSStyleDeclaration.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* CSSValueList
+PASS obj.__proto__ is CSSValueList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* MimeTypeArray
+PASS obj.__proto__ is MimeTypeArray.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* PluginArray
+PASS obj.__proto__ is PluginArray.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* DOMStringList
+PASS obj.__proto__ is DOMStringList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* HTMLAllCollection
+PASS obj.__proto__ is HTMLAllCollection.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* HTMLCollection
+PASS obj.__proto__ is HTMLCollection.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* HTMLFormElement
+PASS obj.__proto__ is HTMLFormElement.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* HTMLOptionsCollection
+PASS obj.__proto__ is HTMLOptionsCollection.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* HTMLSelectElement
+PASS obj.__proto__ is HTMLSelectElement.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* MediaList
+PASS obj.__proto__ is MediaList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* NamedNodeMap
+PASS obj.__proto__ is NamedNodeMap.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* SourceBufferList
+PASS obj.__proto__ is SourceBufferList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* StyleSheetList
+PASS obj.__proto__ is StyleSheetList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* TextTrackCueList
+PASS obj.__proto__ is TextTrackCueList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* TextTrackList
+PASS obj.__proto__ is TextTrackList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* VideoTrackList
+PASS obj.__proto__ is VideoTrackList.prototype
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+* VTTRegionList
+PASS Symbol.iterator in obj is true
+PASS for..of did not throw an exception
+PASS 'entries' in obj is false
+PASS 'keys' in obj is false
+PASS 'forEach' in obj is false
+PASS 'values' in obj is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1479,9 +1479,6 @@
webkit.org/b/225521 [ Release ] media/modern-media-controls/pip-support/pip-support-enabled.html [ Pass Failure ]
-webkit.org/b/226783 [ arm64 ] http/tests/contentextensions/plugin-doesnt-crash.html [ Skip ]
-webkit.org/b/226783 [ arm64 ] tiled-drawing/scrolling/non-fast-region/wheel-event-plugin.html [ Skip ]
-
webkit.org/b/227273 fast/css-custom-paint/out-of-memory-while-adding-worklet-module.html [ Pass Timeout DumpJSConsoleLogInStdErr Failure ]
webkit.org/b/227467 [ BigSur arm64 Release ] fast/css/sticky/sticky-left.html [ Pass ImageOnlyFailure ]
@@ -1691,4 +1688,8 @@
webkit.org/b/232337 [ Debug ] imported/w3c/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html [ Pass Failure DumpJSConsoleLogInStdErr ]
-
+# Plugins
+# FIXME: Remove these tests.
+platform/mac-wk2/plugins/npruntime/remove-property-from-_javascript_.html [ Skip ]
+platform/mac-wk2/plugins/npp-setwindow-called-on-scroll.html [ Skip ]
+platform/mac-wk2/plugins/destroy-during-async-npp-new.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor-expected.txt (285002 => 285003)
--- trunk/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor-expected.txt 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor-expected.txt 2021-10-28 21:21:39 UTC (rev 285003)
@@ -3,10 +3,10 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS plugin1.contentsScaleFactor is 1.0
-PASS plugin1.cachedContentsScaleFactor is 1.0
-PASS plugin1.contentsScaleFactor is 2.0
-PASS plugin1.cachedContentsScaleFactor is 2.0
-PASS plugin2.contentsScaleFactor is 2.0
-PASS plugin2.cachedContentsScaleFactor is 2.0
+PASS plugin1.contentsScaleFactor is undefined
+PASS plugin1.cachedContentsScaleFactor is undefined
+PASS plugin1.contentsScaleFactor is undefined
+PASS plugin1.cachedContentsScaleFactor is undefined
+PASS plugin2.contentsScaleFactor is undefined
+PASS plugin2.cachedContentsScaleFactor is undefined
Modified: trunk/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor.html (285002 => 285003)
--- trunk/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor.html 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/contents-scale-factor.html 2021-10-28 21:21:39 UTC (rev 285003)
@@ -26,19 +26,19 @@
plugin1 = createTestPlugin('contents-scale-factor');
document.body.appendChild(plugin1);
- shouldBe("plugin1.contentsScaleFactor", "1.0");
- shouldBe("plugin1.cachedContentsScaleFactor", "1.0");
+ shouldBe("plugin1.contentsScaleFactor", "undefined");
+ shouldBe("plugin1.cachedContentsScaleFactor", "undefined");
// Now change the backing scale factor.
testRunner.setBackingScaleFactor(2, function() {
- shouldBe("plugin1.contentsScaleFactor", "2.0");
- shouldBe("plugin1.cachedContentsScaleFactor", "2.0");
+ shouldBe("plugin1.contentsScaleFactor", "undefined");
+ shouldBe("plugin1.cachedContentsScaleFactor", "undefined");
plugin2 = createTestPlugin('contents-scale-factor');
document.body.appendChild(plugin2);
- shouldBe("plugin2.contentsScaleFactor", "2.0");
- shouldBe("plugin2.cachedContentsScaleFactor", "2.0");
+ shouldBe("plugin2.contentsScaleFactor", "undefined");
+ shouldBe("plugin2.cachedContentsScaleFactor", "undefined");
testRunner.notifyDone();
});
Modified: trunk/LayoutTests/platform/win/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/platform/win/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/win/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -2208,7 +2208,6 @@
http/tests/security/referrer-policy-https-never.html [ Skip ] # Timeout
http/tests/security/referrer-policy-invalid.html [ Skip ] # Timeout
http/tests/security/referrer-policy-rel-noreferrer.html [ Skip ] # Timeout
-http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html [ Skip ] # Timeout
webkit.org/b/95530 http/tests/security/inactive-document-with-empty-security-origin.html [ Skip ] # Timeout
http/tests/security/mixedContent/insecure-xhr-in-main-frame.html [ Skip ] # Timeout
http/tests/security/mixedContent/insecure-iframe-in-main-frame.html [ Skip ] # Timeout
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -413,7 +413,6 @@
http/tests/security/dataURL/xss-DENIED-from-_javascript_-url-window-open.html
http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-window-open.html
http/tests/security/dataURL/xss-DENIED-to-data-url-window-open.html
-http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html
http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation.html
http/tests/security/_javascript_URL/xss-ALLOWED-to-_javascript_-url-window-open.html
http/tests/security/_javascript_URL/xss-DENIED-from-_javascript_-url-in-foreign-domain-window-open.html
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (285002 => 285003)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2021-10-28 21:21:39 UTC (rev 285003)
@@ -932,9 +932,6 @@
webkit.org/b/118220 http/tests/cache/partitioned-cache.html [ Failure ]
-# Content extensions, the failures need up-to-date expectations.
-http/tests/contentextensions/plugin-doesnt-crash.html [ Timeout Failure ]
-
# Unknown
webkit.org/b/120839 animations/cross-fade-background-image.html [ ImageOnlyFailure ]
Deleted: trunk/LayoutTests/tiled-drawing/scrolling/non-fast-region/wheel-event-plugin-expected.txt (285002 => 285003)
--- trunk/LayoutTests/tiled-drawing/scrolling/non-fast-region/wheel-event-plugin-expected.txt 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/tiled-drawing/scrolling/non-fast-region/wheel-event-plugin-expected.txt 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,4 +0,0 @@
-Wheel event rect for plug-in:
-
-
-28, 70 - 328, 220
Deleted: trunk/LayoutTests/tiled-drawing/scrolling/non-fast-region/wheel-event-plugin.html (285002 => 285003)
--- trunk/LayoutTests/tiled-drawing/scrolling/non-fast-region/wheel-event-plugin.html 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/LayoutTests/tiled-drawing/scrolling/non-fast-region/wheel-event-plugin.html 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- .box {
- height: 100px;
- width: 100px;
- margin: 10px 20px;
- background-color: blue;
- box-shadow: 0 0 10px black;
- }
-
- embed {
- margin: 20px;
- }
-
- </style>
- <script src=""
- <script src=""
- <script>
- if (window.internals) {
- internals.setTopContentInset(60);
- internals.setHeaderHeight(23);
- }
-
- async function doTest()
- {
- if (window.internals)
- internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
-
- // Scroll to test the mapping from document to view coords.
- document.scrollingElement.scrollTop = 197;
- dumpNonFastScrollableRects();
- }
-
- window.addEventListener('load', doTest);
- </script>
-</head>
-<body>
-
-<p>Wheel event rect for plug-in:</p>
-<embed id="plugin" type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
-<pre id="output"></pre>
-
-</body>
-</html>
Modified: trunk/Source/WTF/ChangeLog (285002 => 285003)
--- trunk/Source/WTF/ChangeLog 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WTF/ChangeLog 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,3 +1,16 @@
+2021-10-28 Alex Christensen <achristen...@webkit.org>
+
+ Disable NETSCAPE_PLUGIN_API at build time on macOS and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=232396
+
+ Reviewed by Geoff Garen.
+
+ It has been disabled at run time since https://trac.webkit.org/changeset/276720/webkit
+ and https://trac.webkit.org/changeset/275910/webkit but is still able to be reached by tests.
+ This begins the removal of the code and tests with what is close to the smallest change possible.
+
+ * wtf/PlatformEnable.h:
+
2021-10-28 Nikolaos Mouchtaris <nmouchta...@apple.com>
Enable lazy image loading by default
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (285002 => 285003)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2021-10-28 21:21:39 UTC (rev 285003)
@@ -388,7 +388,7 @@
#endif
#if !defined(ENABLE_NETSCAPE_PLUGIN_API)
-#define ENABLE_NETSCAPE_PLUGIN_API 1
+#define ENABLE_NETSCAPE_PLUGIN_API 0
#endif
#if !defined(ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE)
Modified: trunk/Source/WebKit/ChangeLog (285002 => 285003)
--- trunk/Source/WebKit/ChangeLog 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/ChangeLog 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,3 +1,17 @@
+2021-10-28 Alex Christensen <achristen...@webkit.org>
+
+ Disable NETSCAPE_PLUGIN_API at build time on macOS and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=232396
+
+ Reviewed by Geoff Garen.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _pluginProcessCount]):
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+
2021-10-28 Michael Catanzaro <mcatanz...@gnome.org>
[WPE][GTK] Add warning comments regarding use of child setup functions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (285002 => 285003)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2021-10-28 21:21:39 UTC (rev 285003)
@@ -27,6 +27,7 @@
#import "WKPreferencesInternal.h"
#import "APIArray.h"
+#import "Logging.h"
#import "PluginProcessManager.h"
#import "WKNSArray.h"
#import "WebPreferences.h"
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (285002 => 285003)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2021-10-28 21:21:39 UTC (rev 285003)
@@ -456,7 +456,7 @@
- (size_t)_pluginProcessCount
{
-#if !PLATFORM(IOS_FAMILY)
+#if ENABLE(NETSCAPE_PLUGIN_API)
return WebKit::PluginProcessManager::singleton().pluginProcesses().size();
#else
return 0;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h (285002 => 285003)
--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h 2021-10-28 21:21:39 UTC (rev 285003)
@@ -123,7 +123,9 @@
void drawFooter(WebPageProxy&, WebFrameProxy&, WebCore::FloatRect&&) final;
void decidePolicyForNotificationPermissionRequest(WebPageProxy&, API::SecurityOrigin&, CompletionHandler<void(bool allowed)>&&) final;
+#if ENABLE(NETSCAPE_PLUGIN_API)
void unavailablePluginButtonClicked(WebPageProxy&, WKPluginUnavailabilityReason, API::Dictionary&) final;
+#endif
void mouseDidMoveOverElement(WebPageProxy&, const WebHitTestResultData&, OptionSet<WebEvent::Modifier>, API::Object*);
void didClickAutoFillButton(WebPageProxy&, API::Object*) final;
void toolbarsAreVisible(WebPageProxy&, Function<void(bool)>&&) final;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (285002 => 285003)
--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2021-10-28 21:21:39 UTC (rev 285003)
@@ -748,6 +748,7 @@
[(id <WKUIDelegatePrivate>)delegate _unfocusWebView:m_uiDelegate->m_webView.get().get()];
}
+#if ENABLE(NETSCAPE_PLUGIN_API)
static _WKPlugInUnavailabilityReason toWKPlugInUnavailabilityReason(WKPluginUnavailabilityReason reason)
{
switch (reason) {
@@ -776,6 +777,7 @@
[(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate->m_webView.get().get() unavailablePlugInButtonClickedWithReason:toWKPlugInUnavailabilityReason(reason) plugInInfo:wrapper(plugInInfo)];
}
+#endif
static _WKResourceLimit toWKResourceLimit(WKResourceLimit limit)
{
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (285002 => 285003)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2021-10-28 21:21:39 UTC (rev 285003)
@@ -51,6 +51,7 @@
#import "WebPageProxyMessages.h"
#import "WebPasteboardProxyMessages.h"
#import "WebProcess.h"
+#import "WebWheelEvent.h"
#import <_javascript_Core/JSContextRef.h>
#import <_javascript_Core/JSObjectRef.h>
#import <_javascript_Core/OpaqueJSString.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp (285002 => 285003)
--- trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp 2021-10-28 21:21:39 UTC (rev 285003)
@@ -43,6 +43,10 @@
#include <WebCore/StringUtilities.h>
#endif
+#if ENABLE(PDFKIT_PLUGIN)
+#include "PDFPlugin.h"
+#endif
+
namespace WebKit {
using namespace WebCore;
@@ -79,6 +83,10 @@
supportedPluginIdentifiers = *m_cachedSupportedPluginIdentifiers;
return page.mainFrame().arePluginsEnabled() ? m_cachedPlugins : m_cachedApplicationPlugins;
+#elif ENABLE(PDFKIT_PLUGIN)
+ UNUSED_PARAM(page);
+ UNUSED_PARAM(supportedPluginIdentifiers);
+ return { PDFPlugin::pluginInfo() };
#else
UNUSED_PARAM(page);
UNUSED_PARAM(supportedPluginIdentifiers);
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (285002 => 285003)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1632,7 +1632,7 @@
parameters.layerHostingMode = m_frame->page()->layerHostingMode();
#endif
-#if ENABLE(NETSCAPE_PLUGIN_API)
+#if ENABLE(PDFKIT_PLUGIN)
auto plugin = m_frame->page()->createPlugin(m_frame.ptr(), &pluginElement, parameters, parameters.mimeType);
if (!plugin)
return nullptr;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (285002 => 285003)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1154,21 +1154,24 @@
}
#endif
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
+#if ENABLE(PDFKIT_PLUGIN)
RefPtr<Plugin> WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* pluginElement, const Plugin::Parameters& parameters, String& newMIMEType)
{
String frameURLString = frame->coreFrame()->loader().documentLoader()->responseURL().string();
String pageURLString = m_page->mainFrame().loader().documentLoader()->responseURL().string();
+#if ENABLE(NETSCAPE_PLUGIN_API)
bool allowOnlyApplicationPlugins = !frame->coreFrame()->arePluginsEnabled();
+#endif
- uint64_t pluginProcessToken;
- uint32_t pluginLoadPolicy;
+ uint64_t pluginProcessToken { 0 };
+ uint32_t pluginLoadPolicy { 0 };
String unavailabilityDescription;
- bool isUnsupported;
+ bool isUnsupported { false };
+#if ENABLE(NETSCAPE_PLUGIN_API)
if (!sendSync(Messages::WebPageProxy::FindPlugin(parameters.mimeType, parameters.url.string(), frameURLString, pageURLString, allowOnlyApplicationPlugins), Messages::WebPageProxy::FindPlugin::Reply(pluginProcessToken, newMIMEType, pluginLoadPolicy, unavailabilityDescription, isUnsupported)))
return nullptr;
+#endif
PluginModuleLoadPolicy loadPolicy = static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy);
bool isBlockedPlugin = (loadPolicy == PluginModuleBlockedForSecurity) || (loadPolicy == PluginModuleBlockedForCompatibility);
@@ -1185,6 +1188,7 @@
return nullptr;
}
+#if ENABLE(NETSCAPE_PLUGIN_API)
if (isBlockedPlugin) {
bool isReplacementObscured = pluginElement->setReplacement(RenderEmbeddedObject::InsecurePluginVersion, unavailabilityDescription);
send(Messages::WebPageProxy::DidBlockInsecurePluginVersion(parameters.mimeType, parameters.url.string(), frameURLString, pageURLString, isReplacementObscured));
@@ -1195,6 +1199,9 @@
return nullptr;
return PluginProxy::create(pluginProcessToken);
+#else
+ return nullptr;
+#endif
}
#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (285002 => 285003)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-10-28 21:21:39 UTC (rev 285003)
@@ -558,7 +558,7 @@
std::optional<WebCore::SimpleRange> currentSelectionAsRange();
-#if ENABLE(NETSCAPE_PLUGIN_API)
+#if ENABLE(PDFKIT_PLUGIN)
RefPtr<Plugin> createPlugin(WebFrame*, WebCore::HTMLPlugInElement*, const Plugin::Parameters&, String& newMIMEType);
#endif
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (285002 => 285003)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-28 21:21:39 UTC (rev 285003)
@@ -1,3 +1,13 @@
+2021-10-28 Alex Christensen <achristen...@webkit.org>
+
+ Disable NETSCAPE_PLUGIN_API at build time on macOS and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=232396
+
+ Reviewed by Geoff Garen.
+
+ * WebView/WebFramePrivate.h:
+ * WebView/WebHTMLViewPrivate.h:
+
2021-10-28 Youenn Fablet <you...@apple.com>
[ Mac wk1 ] 2 media-capabilities/webrtc tests are flaky failures
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h (285002 => 285003)
--- trunk/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h 2021-10-28 21:21:39 UTC (rev 285003)
@@ -31,7 +31,7 @@
#if !TARGET_OS_IPHONE
#if !defined(ENABLE_NETSCAPE_PLUGIN_API)
-#define ENABLE_NETSCAPE_PLUGIN_API 1
+#define ENABLE_NETSCAPE_PLUGIN_API 0
#endif
#endif
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewPrivate.h (285002 => 285003)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewPrivate.h 2021-10-28 21:04:37 UTC (rev 285002)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewPrivate.h 2021-10-28 21:21:39 UTC (rev 285003)
@@ -30,7 +30,7 @@
#if !TARGET_OS_IPHONE
#if !defined(ENABLE_NETSCAPE_PLUGIN_API)
-#define ENABLE_NETSCAPE_PLUGIN_API 1
+#define ENABLE_NETSCAPE_PLUGIN_API 0
#endif
#endif
