[GSoC 2024] Porting WebKit2 Final Report | Haiku Project

A bit more on “what’s next” from my point of view:

First of all, thank you for this work, which I was not able to figure out on my own since 2019, despite spending a lot of time trying to clean up the existing patches and experiment to try to better understand them. Now that we have a mostly working base with cleaner code, I hope it will be easier to keep that working.

During the summer, I paused the merges of upstream code, to avoid trying to build the webkit port on shifting sand. Now I will probably resume that and cach up with all the upstream changes. Usually I merge them in the webkitlegacy branch, and then rebase the webkit2 branch on top, that preserves the webkit2 commit history. And then I try to rewrite the history of the webkit2 branch to avoid places where code is introduced and then removed again to use a different approach. Once a part of the webkit2 branch is clean enough and tested, I integrate it in the main Haiku branch.

I’m not sure if I should continue doing it this way, or just merge everything and move on with a single branch.

After that, I think it’s time we start considering to upstream our changes again to WebKit. I have been maintaining WebKit for 10 years now, so, clearly there are some guarantees that the project will not be abandoned. But this means extracting all our changes in smaller patches that make sense and can be reviewed by WebKit developers. And I think they wouldn’t want to merge the WebKitLegacy parts.

However, while I work on all this merging and rebasing and upstreaming, I will not work on other things, including efforts to get WebKit2 more completely working. So, I hope other people can join and help with that :slight_smile:

22 Likes