Remove WebGLLoadPolicy code #5792

grorg · 2022-10-26T01:08:09Z

`82d2d64`

Remove WebGLLoadPolicy code
https://bugs.webkit.org/show_bug.cgi?id=247039
rdar://101569935

Reviewed by Kimmo Kinnunen.

We don't use the WebGLLoadPolicy mechanism any more. Remove all the code.

* LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt: Removed.
* LayoutTests/fast/canvas/webgl/useWhilePending.html: Removed.
* Source/WebCore/html/canvas/WebGL2RenderingContext.cpp:
    Lots of removal for isContextLostOrPending().
* Source/WebCore/html/canvas/WebGLRenderingContext.cpp:
* Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::isContextLostOrPending): Deleted.
* Source/WebCore/html/canvas/WebGLRenderingContextBase.h:
* Source/WebCore/loader/FrameLoaderClient.h:
* Source/WebCore/loader/FrameLoaderTypes.h:
* Source/WebCore/page/Settings.yaml:
* Source/WebKit/Scripts/webkit/messages.py:
(headers_for_type):
* Source/WebKit/UIProcess/API/APINavigationClient.h:
(API::NavigationClient::webGLLoadPolicy const): Deleted.
(API::NavigationClient::resolveWebGLLoadPolicy const): Deleted.
* Source/WebKit/UIProcess/API/C/WKAPICast.h:
(WebKit::toWebGLLoadPolicy): Deleted.
* Source/WebKit/UIProcess/API/C/WKPage.cpp:
(WKPageSetPageLoaderClient):
* Source/WebKit/UIProcess/API/C/WKPageLoaderClient.h:
* Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
* Source/WebKit/UIProcess/Cocoa/NavigationState.h:
* Source/WebKit/UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::setNavigationDelegate):
(WebKit::toWebCoreWebGLLoadPolicy): Deleted.
(WebKit::NavigationState::NavigationClient::webGLLoadPolicy const): Deleted.
(WebKit::NavigationState::NavigationClient::resolveWebGLLoadPolicy const): Deleted.
* Source/WebKit/UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::webGLPolicyForURL): Deleted.
(WebKit::WebPageProxy::resolveWebGLPolicyForURL): Deleted.
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebPageProxy.messages.in:
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::webGLPolicyForURL const): Deleted.
(WebKit::WebFrameLoaderClient::resolveWebGLPolicyForURL const): Deleted.
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::webGLPolicyForURL): Deleted.
(WebKit::WebPage::resolveWebGLPolicyForURL): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::webGLPolicyForURL): Deleted.
(WebKit::WebPage::resolveWebGLPolicyForURL): Deleted.
* Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h:
* Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm:
(shouldBlockWebGL): Deleted.
(WebFrameLoaderClient::webGLPolicyForURL const): Deleted.
(WebFrameLoaderClient::resolveWebGLPolicyForURL const): Deleted.
* Tools/TestWebKitAPI/SourcesCocoa.txt:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WebGLPolicy.mm: Removed.

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

48ae15c

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~~
✅ 🧪 webkitpy	~~🧪 api-ios~~	~~🧪 api-mac~~	~~🧪 api-gtk~~
	✅ 🛠 tv	~~🧪 mac-wk1~~
	~~🛠 tv-sim~~	~~🧪 mac-wk2~~
~~🛠 🧪 merge~~	✅ 🛠 watch	~~🧪 mac-AS-debug-wk2~~
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim	~~🧪 mac-wk2-stress~~

webkit-early-warning-system · 2022-10-26T01:10:32Z

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

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~~

mattwoodrow

Looks like most of the commit is missing, there's lots of files in the message that aren't actually changed here.

grorg · 2022-10-26T09:05:48Z

Very weird! Not sure why the git webkit script detected all those changes and then didn't commit them!

webkit-early-warning-system · 2022-10-26T09:09:29Z

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

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
✅ 🧪 webkitpy	✅ 🧪 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-26T17:32:31Z

EWS run on current version of this PR (hash 226e110)

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
🧪 webkitpy	🧪 api-ios	⏳ 🧪 api-mac	⏳ 🧪 api-gtk
⏳ 🛠 🧪 jsc	⏳ 🛠 tv	⏳ 🧪 mac-wk1
	⏳ 🛠 tv-sim	⏳ 🧪 mac-wk2
	⏳ 🛠 watch	🧪 mac-AS-debug-wk2
	🛠 watch-sim	⏳ 🧪 mac-wk2-stress

webkit-early-warning-system · 2022-10-26T17:32:32Z

EWS run on previous version of this PR (hash 226e110)

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
✅ 🧪 webkitpy	✅ 🧪 api-ios	✅ 🧪 api-mac	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2
	✅ 🛠 watch	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

mattwoodrow · 2022-10-26T19:02:38Z

Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -510,30 +509,14 @@ std::unique_ptr<WebGLRenderingContextBase> WebGLRenderingContextBase::create(Can

        // The FrameLoaderClient might block creation of a new WebGL context despite the page settings; in
        // particular, if WebGL contexts were lost one or more times via the GL_ARB_robustness extension.


This comment can probably go too.

Thanks. I will remove it.

kkinnunen-apple

Oh no! I have had dreams about removing this. What do I do now?

grorg · 2022-10-27T21:45:48Z

This can't land until the code in Safari that uses it is removed.

webkit-commit-queue · 2022-10-27T23:37:14Z

Commit message contains (OOPS!), blocking PR #5792

webkit-early-warning-system · 2022-10-27T23:41:31Z

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

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
✅ 🧪 webkitpy	✅ 🧪 api-ios	~~🧪 api-mac~~	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk1
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2
❌ 🛠 🧪 merge	✅ 🛠 watch	❌ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress

grorg · 2022-10-28T20:42:22Z

Where is the OOPS? The commit message doesn't have it.

grorg · 2022-10-28T20:45:56Z

Oh. It's there, just after the changelog.

webkit-early-warning-system · 2022-10-28T20:51:50Z

EWS run on current version of this PR (hash 48ae15c)

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~~
✅ 🧪 webkitpy	~~🧪 api-ios~~	~~🧪 api-mac~~	~~🧪 api-gtk~~
	✅ 🛠 tv	~~🧪 mac-wk1~~
	~~🛠 tv-sim~~	~~🧪 mac-wk2~~
~~🛠 🧪 merge~~	✅ 🛠 watch	~~🧪 mac-AS-debug-wk2~~
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim	~~🧪 mac-wk2-stress~~

grorg · 2022-10-28T21:15:45Z

Going unsafe. I checked the test failure locally.

https://bugs.webkit.org/show_bug.cgi?id=247039 rdar://101569935 Reviewed by Kimmo Kinnunen. We don't use the WebGLLoadPolicy mechanism any more. Remove all the code. * LayoutTests/fast/canvas/webgl/useWhilePending-expected.txt: Removed. * LayoutTests/fast/canvas/webgl/useWhilePending.html: Removed. * Source/WebCore/html/canvas/WebGL2RenderingContext.cpp: Lots of removal for isContextLostOrPending(). * Source/WebCore/html/canvas/WebGLRenderingContext.cpp: * Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp: (WebCore::WebGLRenderingContextBase::isContextLostOrPending): Deleted. * Source/WebCore/html/canvas/WebGLRenderingContextBase.h: * Source/WebCore/loader/FrameLoaderClient.h: * Source/WebCore/loader/FrameLoaderTypes.h: * Source/WebCore/page/Settings.yaml: * Source/WebKit/Scripts/webkit/messages.py: (headers_for_type): * Source/WebKit/UIProcess/API/APINavigationClient.h: (API::NavigationClient::webGLLoadPolicy const): Deleted. (API::NavigationClient::resolveWebGLLoadPolicy const): Deleted. * Source/WebKit/UIProcess/API/C/WKAPICast.h: (WebKit::toWebGLLoadPolicy): Deleted. * Source/WebKit/UIProcess/API/C/WKPage.cpp: (WKPageSetPageLoaderClient): * Source/WebKit/UIProcess/API/C/WKPageLoaderClient.h: * Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: * Source/WebKit/UIProcess/Cocoa/NavigationState.h: * Source/WebKit/UIProcess/Cocoa/NavigationState.mm: (WebKit::NavigationState::setNavigationDelegate): (WebKit::toWebCoreWebGLLoadPolicy): Deleted. (WebKit::NavigationState::NavigationClient::webGLLoadPolicy const): Deleted. (WebKit::NavigationState::NavigationClient::resolveWebGLLoadPolicy const): Deleted. * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::webGLPolicyForURL): Deleted. (WebKit::WebPageProxy::resolveWebGLPolicyForURL): Deleted. * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/UIProcess/WebPageProxy.messages.in: * Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::webGLPolicyForURL const): Deleted. (WebKit::WebFrameLoaderClient::resolveWebGLPolicyForURL const): Deleted. * Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h: * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::webGLPolicyForURL): Deleted. (WebKit::WebPage::resolveWebGLPolicyForURL): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm: (WebKit::WebPage::webGLPolicyForURL): Deleted. (WebKit::WebPage::resolveWebGLPolicyForURL): Deleted. * Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h: * Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm: (shouldBlockWebGL): Deleted. (WebFrameLoaderClient::webGLPolicyForURL const): Deleted. (WebFrameLoaderClient::resolveWebGLPolicyForURL const): Deleted. * Tools/TestWebKitAPI/SourcesCocoa.txt: * Tools/TestWebKitAPI/Tests/WebKitCocoa/WebGLPolicy.mm: Removed. Canonical link: https://commits.webkit.org/256114@main

webkit-commit-queue · 2022-10-28T21:18:24Z

Committed 256114@main (82d2d64): https://commits.webkit.org/256114@main

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

grorg self-assigned this Oct 26, 2022

grorg added WebGL Bugs in WebKit’s implementation of the WebGL standard. WebKit Local Build labels Oct 26, 2022

grorg requested review from weinig, mattwoodrow, graouts and hortont424 October 26, 2022 01:08

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

mattwoodrow reviewed Oct 26, 2022

View reviewed changes

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

grorg force-pushed the eng/Remove-WebGLLoadPolicy-code branch from d8867c7 to 1a8b75b Compare October 26, 2022 09:06

grorg requested review from cdumez and rniwa as code owners October 26, 2022 09:06

grorg force-pushed the eng/Remove-WebGLLoadPolicy-code branch from 1a8b75b to 226e110 Compare October 26, 2022 17:24

mattwoodrow approved these changes Oct 26, 2022

View reviewed changes

kkinnunen-apple approved these changes Oct 27, 2022

View reviewed changes

grorg force-pushed the eng/Remove-WebGLLoadPolicy-code branch from 226e110 to e68005f Compare October 27, 2022 23:35

grorg added the merge-queue Applied to send a pull request to merge-queue label Oct 27, 2022

webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Oct 27, 2022

grorg force-pushed the eng/Remove-WebGLLoadPolicy-code branch from e68005f to 48ae15c Compare October 28, 2022 20:48

grorg added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Oct 28, 2022

grorg added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merge-queue Applied to send a pull request to merge-queue labels Oct 28, 2022

webkit-commit-queue force-pushed the eng/Remove-WebGLLoadPolicy-code branch from 48ae15c to 82d2d64 Compare October 28, 2022 21:18

webkit-commit-queue merged commit 82d2d64 into WebKit:main Oct 28, 2022

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

grorg deleted the eng/Remove-WebGLLoadPolicy-code branch January 11, 2023 17:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove WebGLLoadPolicy code #5792

Remove WebGLLoadPolicy code #5792

grorg commented Oct 26, 2022 •

edited by webkit-early-warning-system

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

edited

mattwoodrow left a comment

grorg commented Oct 26, 2022

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

edited

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

edited

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

edited

mattwoodrow Oct 26, 2022

grorg Oct 27, 2022

kkinnunen-apple left a comment

grorg commented Oct 27, 2022

webkit-commit-queue commented Oct 27, 2022

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

edited

grorg commented Oct 28, 2022

grorg commented Oct 28, 2022

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

edited

grorg commented Oct 28, 2022

webkit-commit-queue commented Oct 28, 2022

		@@ -510,30 +509,14 @@ std::unique_ptr<WebGLRenderingContextBase> WebGLRenderingContextBase::create(Can

		// The FrameLoaderClient might block creation of a new WebGL context despite the page settings; in
		// particular, if WebGL contexts were lost one or more times via the GL_ARB_robustness extension.

Remove WebGLLoadPolicy code #5792

Remove WebGLLoadPolicy code #5792

Conversation

grorg commented Oct 26, 2022 • edited by webkit-early-warning-system

82d2d64

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

mattwoodrow left a comment

Choose a reason for hiding this comment

grorg commented Oct 26, 2022

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

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

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

mattwoodrow Oct 26, 2022

Choose a reason for hiding this comment

grorg Oct 27, 2022

Choose a reason for hiding this comment

kkinnunen-apple left a comment

Choose a reason for hiding this comment

grorg commented Oct 27, 2022

webkit-commit-queue commented Oct 27, 2022

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

grorg commented Oct 28, 2022

grorg commented Oct 28, 2022

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

grorg commented Oct 28, 2022

webkit-commit-queue commented Oct 28, 2022

grorg commented Oct 26, 2022 •

edited by webkit-early-warning-system

`82d2d64`

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

edited

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

edited

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

edited

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

edited

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

edited

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

edited