solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'webkit2_fixes' of https://github.com/swt2c/wxWidgets

Browse source 
Miscellaneous fixes for WebKit2 wxWebView backend.

See #23497.
This commit is contained in:
Vadim Zeitlin 2023-04-28 16:39:49 +02:00
commit 8d8f94da64
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gtk/webview_webkit2.cpp
View file

@ -631,7 +631,7 @@ wxgtk_initialize_web_extensions(WebKitWebContext *context,
for ( size_t n = 0; n < WXSIZEOF(directories); ++n )
{
if ( !TrySetWebExtensionsDirectory(context, directories[n]) )
if ( TrySetWebExtensionsDirectory(context, directories[n]) )
break;
}
}

8
tests/controls/webtest.cpp
View file

@ -232,9 +232,11 @@ TEST_CASE_METHOD(WebViewTestCase, "WebView", "[wxWebView]")
// With WebKit SelectAll() sends a request to perform the selection to
// another process via proxy and there doesn't seem to be any way to
// wait until this request is actually handled, so loop here for some a
// bit before giving up.
for ( wxStopWatch sw; !m_browser->HasSelection() && sw.Time() < 50; )
wxMilliSleep(1);
// bit before giving up. Avoid calling HasSelection() right away
// without wxYielding a bit because this seems to cause the extension
// to hang with webkit 2.40.0+.
for ( wxStopWatch sw; sw.Time() < 50; )
wxYield();
#endif // wxUSE_WEBVIEW_WEBKIT2
CHECK(m_browser->HasSelection());