browser(webkit): rebase to 05/31/22 (r295073) #14556
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebase
webkit/patches/bootstrap.diff
to r295073. Changes:About the linking error, after resolving the conflicts the build finished with a linking error. The output was:
So basically this was a linking error due to missing linkage to pthread from libraries
webrtc
andboringssl
. I inspected several commits and found out the linking error started happening since this commit https://bugs.webkit.org/show_bug.cgi?id=240755This patch fixed a linking error in non-unified builds. The patch reintroduced a CMake setting that had created some problems in the past (there's a lof of discussion in the bug ticket about whether to enable this setting or not). The setting is
set(WebCore_LIBRARY_TYPE OBJECT)
. My understanding is that this change makes WebCore be built as dynamic library instead of statically.I didn't manage to reproduce this linking error upstream.
To solve the linking error I enforced linking to pthread. Probably this is not the right fix and there's a better way to fix it than introducing a change in Options{GTK,WPE}.cmake.
About the tests, I got the following failures:
These tests have been failing since #1649. They started failing due to fast/text/international/system-language/navigator-language/navigator-language-fr.html is a flaky failure. It seems to me these tests need to get their expectations updated after that change.
Likely a regression introduced by Stop exposing ApplicationCache API if it is not enabled. Probably can be fixed by updating expectations or enabling this setting.