Remove InjectedBundlePagePolicyClient #5889

achristensen07 · 2022-10-28T04:55:52Z

`9eeab8d`

Remove InjectedBundlePagePolicyClient
https://bugs.webkit.org/show_bug.cgi?id=247169
rdar://101655797

Reviewed by Tim Horton.

There was one layout test, fast/loader/policy-delegate-action-hit-test-zoomed.html,
which printed the dom node path of the clicked link.  This functionality is not available
nor needed in WK2.  The WK1 test still verifies it.  WK2 has _WKHitTestResult with tests
to verify we get the node info we need in this case.

* Source/WebKit/Sources.txt:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetPolicyClient):
* Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp: Removed.
* Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h: Removed.
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
(WebKit::WebFrameLoaderClient::dispatchUnableToImplementPolicy):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::close):
(WebKit::WebPage::initializeInjectedBundlePolicyClient): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::injectedBundleLoaderClient):
(WebKit::WebPage::injectedBundlePolicyClient): Deleted.

Canonical link: https://commits.webkit.org/256491@main

bcb2242

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 api-mac	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2
	✅ 🛠 watch	✅ 🧪 mac-AS-debug-wk2
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

webkit-early-warning-system · 2022-10-28T04:56:05Z

EWS run on previous version of this PR (hash 1e51d06)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe
	✅ 🛠 ios-sim	✅ 🛠 mac-debug	❌ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	❌ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 api-mac	❌ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2
	✅ 🛠 watch	❌ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

webkit-early-warning-system · 2022-10-29T17:45:34Z

EWS run on previous version of this PR (hash 6b95a38)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	✅ 🛠 mac-AS-debug	❌ 🧪 gtk-wk2
	✅ 🧪 api-ios	⏳ 🧪 api-mac	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2
	✅ 🛠 watch	⏳ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

webkit-early-warning-system · 2022-10-29T20:01:25Z

EWS run on previous version of this PR (hash ed78d67)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	~~🛠 🧪 win~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	✅ 🛠 mac-AS-debug	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	⏳ 🧪 api-mac	✅ 🧪 api-gtk
	✅ 🛠 tv	~~🧪 mac-wk1~~
	✅ 🛠 tv-sim	~~🧪 mac-wk2~~
	✅ 🛠 watch	⏳ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	~~🧪 mac-wk2-stress~~

webkit-early-warning-system · 2022-10-29T20:14:15Z

EWS run on previous version of this PR (hash 9da8a08)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	✅ 🛠 mac-AS-debug	~~🧪 gtk-wk2~~
	✅ 🧪 api-ios	~~🧪 api-mac~~	~~🧪 api-gtk~~
	✅ 🛠 tv	~~🧪 mac-wk1~~
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2
	✅ 🛠 watch	~~🧪 mac-AS-debug-wk2~~
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

webkit-early-warning-system · 2022-10-29T22:30:36Z

EWS run on previous version of this PR (hash be10e5c)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 🧪 win~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	✅ 🛠 mac-AS-debug	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	⏳ 🧪 api-mac	~~🧪 api-gtk~~
	⏳ 🛠 tv	~~🧪 mac-wk1~~
	✅ 🛠 tv-sim	~~🧪 mac-wk2~~
	✅ 🛠 watch	⏳ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	~~🧪 mac-wk2-stress~~

webkit-early-warning-system · 2022-10-29T22:35:33Z

EWS run on previous version of this PR (hash 420fcf8)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	❌ 🧪 gtk-wk2
	❌ 🧪 api-ios	✅ 🧪 api-mac	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2
	✅ 🛠 watch	❌ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

webkit-early-warning-system · 2022-11-05T04:13:55Z

EWS run on previous version of this PR (hash 2efcd95)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	❌ 🧪 gtk-wk2
	~~🧪 api-ios~~	✅ 🧪 api-mac	❌ 🧪 api-gtk
	✅ 🛠 tv	~~🧪 mac-wk1~~
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2
	✅ 🛠 watch	~~🧪 mac-AS-debug-wk2~~
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

webkit-early-warning-system · 2022-11-05T18:59:58Z

EWS run on previous version of this PR (hash 6798dca)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 api-mac	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2
	✅ 🛠 watch	❌ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

webkit-early-warning-system · 2022-11-08T04:28:26Z

EWS run on current version of this PR (hash bcb2242)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 api-mac	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2
	✅ 🛠 watch	✅ 🧪 mac-AS-debug-wk2
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

hortont424 · 2022-11-09T06:25:42Z

LayoutTests/fast/loader/onload-policy-ignore-for-frame-async-delegates.html

@@ -6,6 +6,7 @@
        if (window.testRunner) {
            testRunner.dumpAsText();
            testRunner.setCustomPolicyDelegate(true);
+            if (testRunner.skipPolicyDelegateNotifyDone) { testRunner.skipPolicyDelegateNotifyDone() }


Why the weird style? Should be on the next line with no curly braces, just like in C++

JS is slightly different than C++ in its handling of if statements with/without {} and I like to do this to be as unambiguous as possible.

https://bugs.webkit.org/show_bug.cgi?id=247169 rdar://101655797 Reviewed by Tim Horton. There was one layout test, fast/loader/policy-delegate-action-hit-test-zoomed.html, which printed the dom node path of the clicked link. This functionality is not available nor needed in WK2. The WK1 test still verifies it. WK2 has _WKHitTestResult with tests to verify we get the node info we need in this case. * Source/WebKit/Sources.txt: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: (WKBundlePageSetPolicyClient): * Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp: Removed. * Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h: Removed. * Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse): (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): (WebKit::WebFrameLoaderClient::dispatchUnableToImplementPolicy): * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::close): (WebKit::WebPage::initializeInjectedBundlePolicyClient): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.h: (WebKit::WebPage::injectedBundleLoaderClient): (WebKit::WebPage::injectedBundlePolicyClient): Deleted. Canonical link: https://commits.webkit.org/256491@main

webkit-commit-queue · 2022-11-09T18:44:16Z

Committed 256491@main (9eeab8d): https://commits.webkit.org/256491@main

Reviewed commits have been landed. Closing PR #5889 and removing active labels.

achristensen07 requested a review from cdumez as a code owner October 28, 2022 04:55

achristensen07 self-assigned this Oct 28, 2022

achristensen07 added WebKit API For issues and bugs in the Web Kit public embedding APIs WebKit Local Build labels Oct 28, 2022

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 28, 2022

achristensen07 force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from 1e51d06 to 6b95a38 Compare October 29, 2022 17:45

achristensen07 requested a review from JonWBedard as a code owner October 29, 2022 17:45

achristensen07 force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from 6b95a38 to ed78d67 Compare October 29, 2022 20:01

achristensen07 force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from ed78d67 to 9da8a08 Compare October 29, 2022 20:14

achristensen07 force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from 9da8a08 to be10e5c Compare October 29, 2022 22:30

achristensen07 force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from be10e5c to 420fcf8 Compare October 29, 2022 22:35

achristensen07 removed the merging-blocked Applied to prevent a change from being merged label Oct 29, 2022

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 29, 2022

achristensen07 force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from 420fcf8 to 2efcd95 Compare November 5, 2022 04:13

achristensen07 removed the merging-blocked Applied to prevent a change from being merged label Nov 5, 2022

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Nov 5, 2022

achristensen07 force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from 2efcd95 to 6798dca Compare November 5, 2022 18:59

achristensen07 removed the merging-blocked Applied to prevent a change from being merged label Nov 5, 2022

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Nov 6, 2022

achristensen07 force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from 6798dca to bcb2242 Compare November 8, 2022 04:28

achristensen07 removed the merging-blocked Applied to prevent a change from being merged label Nov 8, 2022

hortont424 approved these changes Nov 9, 2022

View reviewed changes

achristensen07 added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Nov 9, 2022

webkit-early-warning-system force-pushed the eng/Remove-InjectedBundlePagePolicyClient branch from bcb2242 to 9eeab8d Compare November 9, 2022 18:44

webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Nov 9, 2022

webkit-early-warning-system merged commit 9eeab8d into WebKit:main Nov 9, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove InjectedBundlePagePolicyClient #5889

Remove InjectedBundlePagePolicyClient #5889

achristensen07 commented Oct 28, 2022 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Oct 28, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Nov 5, 2022 •

edited

webkit-early-warning-system commented Nov 5, 2022 •

edited

webkit-early-warning-system commented Nov 8, 2022 •

edited

hortont424 Nov 9, 2022

achristensen07 Nov 9, 2022

webkit-commit-queue commented Nov 9, 2022

Remove InjectedBundlePagePolicyClient #5889

Remove InjectedBundlePagePolicyClient #5889

Conversation

achristensen07 commented Oct 28, 2022 • edited by webkit-early-warning-system

9eeab8d

webkit-early-warning-system commented Oct 28, 2022 • edited

webkit-early-warning-system commented Oct 29, 2022 • edited

webkit-early-warning-system commented Oct 29, 2022 • edited

webkit-early-warning-system commented Oct 29, 2022 • edited

webkit-early-warning-system commented Oct 29, 2022 • edited

webkit-early-warning-system commented Oct 29, 2022 • edited

webkit-early-warning-system commented Nov 5, 2022 • edited

webkit-early-warning-system commented Nov 5, 2022 • edited

webkit-early-warning-system commented Nov 8, 2022 • edited

hortont424 Nov 9, 2022

Choose a reason for hiding this comment

achristensen07 Nov 9, 2022

Choose a reason for hiding this comment

webkit-commit-queue commented Nov 9, 2022

achristensen07 commented Oct 28, 2022 •

edited by webkit-early-warning-system

`9eeab8d`

webkit-early-warning-system commented Oct 28, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Oct 29, 2022 •

edited

webkit-early-warning-system commented Nov 5, 2022 •

edited

webkit-early-warning-system commented Nov 5, 2022 •

edited

webkit-early-warning-system commented Nov 8, 2022 •

edited