diff options
author | Carlos Garcia Campos <cgarcia@igalia.com> | 2012-05-06 22:47:19 +0800 |
---|---|---|
committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2012-06-21 19:54:16 +0800 |
commit | 97c91b2fc2059b1e358bb19896203afaa44bfd33 (patch) | |
tree | 6aa01250a99fa884d177ce3202d8ff41e8e96d74 /tests | |
parent | a8767266443074689200fff9ca43531d88d65aed (diff) | |
download | gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.gz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.bz2 gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.lz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.xz gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.tar.zst gsoc2013-epiphany-97c91b2fc2059b1e358bb19896203afaa44bfd33.zip |
Initial WebKit2 port
It builds and basic functionality works.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ephy-shell-test.c | 4 | ||||
-rw-r--r-- | tests/ephy-web-view-test.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/ephy-shell-test.c b/tests/ephy-shell-test.c index 75a33e2aa..84626ae26 100644 --- a/tests/ephy-shell-test.c +++ b/tests/ephy-shell-test.c @@ -284,6 +284,9 @@ test_ephy_shell_tab_no_history () EphyEmbed *embed2; EphyEmbed *embed3; +#ifdef HAVE_WEBKIT2 + /* TODO: BackForwardList */ +#else WebKitWebBackForwardList *bflist; WebKitWebHistoryItem *item; @@ -312,6 +315,7 @@ test_ephy_shell_tab_no_history () g_assert_cmpint (webkit_web_back_forward_list_get_back_length (bflist), ==, 0); gtk_widget_destroy (window); +#endif } int diff --git a/tests/ephy-web-view-test.c b/tests/ephy-web-view-test.c index bd0f2f0ce..31b6f78f8 100644 --- a/tests/ephy-web-view-test.c +++ b/tests/ephy-web-view-test.c @@ -63,6 +63,9 @@ server_callback (SoupServer *server, soup_message_body_complete (msg->response_body); } +#ifdef HAVE_WEBKIT2 +/* TODO: loader */ +#else static void notify_load_status_cb (WebKitWebView *view, GParamSpec *spec, GMainLoop *loop) { @@ -86,6 +89,7 @@ notify_load_status_cb (WebKitWebView *view, GParamSpec *spec, GMainLoop *loop) g_free (expected_url); g_main_loop_quit (loop); } +#endif typedef struct { const char *url; @@ -157,8 +161,12 @@ test_ephy_web_view_load_url () g_test_message ("[%s] \t-> %s", test.url, test.expected_url); +#ifdef HAVE_WEBKIT2 + /* TODO: loader */ +#else g_signal_connect (view, "notify::load-status", G_CALLBACK (notify_load_status_cb), loop); +#endif g_main_loop_run (loop); g_main_loop_unref (loop); |