nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "Merge branch 'mjog/558-webkit-shared-process' into 'mainline'""

Browse source 
This reverts commit cbe6e0ba9b, which reinstates
commit e4a5b85698.

See !411 and !374
This commit is contained in:
Michael James Gratton 2020-08-25 22:10:28 +10:00
parent d0fff267f8
commit d7af23201c
28 changed files with 418 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/js/client-page-state-test.vala → test/js/components-page-state-test.vala
View file

@ -5,24 +5,24 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
class ClientPageStateTest : ClientWebViewTestCase<ClientWebView> {
class Components.PageStateTest : WebViewTestCase<WebView> {
private class TestClientWebView : ClientWebView {
private class TestWebView : Components.WebView {
public TestClientWebView(Application.Configuration config) {
public TestWebView(Application.Configuration config) {
base(config);
}
}
public ClientPageStateTest() {
base("ClientPageStateTest");
public PageStateTest() {
base("Components.PageStateTest");
add_test("content_loaded", content_loaded);
try {
ClientWebView.load_resources(GLib.File.new_for_path("/tmp"));
WebView.load_resources(GLib.File.new_for_path("/tmp"));
} catch (GLib.Error err) {
GLib.assert_not_reached();
}
@ -45,7 +45,7 @@ class ClientPageStateTest : ClientWebViewTestCase<ClientWebView> {
assert(content_loaded_triggered);
}
protected override ClientWebView set_up_test_view() {
protected override WebView set_up_test_view() {
WebKit.UserScript test_script;
test_script = new WebKit.UserScript(
"var geary = new PageState()",
@ -55,7 +55,7 @@ class ClientPageStateTest : ClientWebViewTestCase<ClientWebView> {
null
);
ClientWebView view = new TestClientWebView(this.config);
WebView view = new TestWebView(this.config);
view.get_user_content_manager().add_script(test_script);
return view;
}

2
test/js/composer-page-state-test.vala
View file

@ -5,7 +5,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
class Composer.PageStateTest : ClientWebViewTestCase<Composer.WebView> {
class Composer.PageStateTest : Components.WebViewTestCase<Composer.WebView> {
public const string COMPLETE_BODY_TEMPLATE =
"""<div id="geary-body" dir="auto">%s<div><br></div><div><br></div></div><div id="geary-signature" dir="auto"></div>""";

2
test/js/conversation-page-state-test.vala
View file

@ -5,7 +5,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
class ConversationPageStateTest : ClientWebViewTestCase<ConversationWebView> {
class ConversationPageStateTest : Components.WebViewTestCase<ConversationWebView> {
public ConversationPageStateTest() {
base("ConversationPageStateTest");