Merge lp:~midori/midori/twoWebKittens into lp:midori

[Cris Dywan]

Make trunk build with WebKit2 again

Support editing actions with WebKit2
Set cache and cookies correctly in Midori.Paths
Disable WebExtension with WebKitGTK+ 2.3.91
Opt in to multiple rendering processes
Implement new windows opening with WebKit2
Make View Source work with WebKit2

[gue5t gue5t (gue5t)]

View source doesn't seem to respect the editor set in preferences.

Multiple processes do spawn, but it doesn't seem they're ever cleaned up. Closing the last tab over and over seems to result in more and more processes sitting around.

I don't think these are regressions, though, and wk2 is still behind the half-broken-incomplete switch.

review: Approve

[Cris Dywan (kalikiana)]

There's a TODO for view source - it does something unlike before.

The processes are spawned by WebKitGTK+ I don't think we have any control over it - unless there's a bug more generally in our ref counting of tabs which would trigger this but in that case it would probably mean a memory leak in WebKit1 also.

[lp:~midori/midori/twoWebKittens]

6599. By Cris Dywan on 2014-03-26

Use HAVE_WEBKIT2_3_91 to guard WebKit.WebView.with_related_view

6600. By Cris Dywan on 2014-03-26

Move Copy and Select All menu items out of the selection clause

[Paweł Forysiuk (tuxator)]

review: Approve

[lp:~midori/midori/twoWebKittens]

6601. By Cris Dywan on 2014-03-26

Merge lp:midori

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-04 14:41:28 +0000
+++ CMakeLists.txt	2014-03-26 21:12:29 +0000
@@ -216,6 +216,9 @@
     set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkit2gtk-3.0.vapi")
     set(VALAFLAGS ${VALAFLAGS} -D HAVE_GTK3)
     set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2)
+    if (${DEPS_GTK_webkit2gtk-3.0_VERSION} VERSION_GREATER "2.3.90")
+        set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2_3_91)
+    endif ()
 elseif (USE_GTK3)
     pkg_check_modules(DEPS_GTK REQUIRED
                       gtk+-3.0>=3.0.0

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2014-03-18 16:57:25 +0000
+++ extensions/adblock/extension.vala	2014-03-26 21:12:29 +0000
@@ -56,7 +56,8 @@
 #endif
 
 #if HAVE_WEBKIT2
-        public Extension (WebKit.WebExtension web_extension) {
+#if !HAVE_WEBKIT2_3_91
+        public Extension.WebExtension (WebKit.WebExtension web_extension) {
             init ();
             web_extension.page_created.connect (page_created);
         }
@@ -68,7 +69,9 @@
         bool send_request (WebKit.WebPage web_page, WebKit.URIRequest request, WebKit.URIResponse? redirected_response) {
             return request_handled (request.uri, web_page.uri);
         }
-#else
+#endif
+#endif
+
         public Extension () {
             GLib.Object (name: _("Advertisement blocker"),
                          description: _("Block advertisements according to a filter list"),
@@ -84,6 +87,21 @@
         }
 
         void extension_activated (Midori.App app) {
+#if HAVE_WEBKIT2
+            string cache_dir = Environment.get_user_cache_dir ();
+            string wk2path = Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "wk2ext");
+            Midori.Paths.mkdir_with_parents (wk2path);
+            string filename = "libadblock." + GLib.Module.SUFFIX;
+            var wk2link = File.new_for_path (wk2path).get_child (filename);
+            var library = File.new_for_path (Midori.Paths.get_lib_path (PACKAGE_NAME)).get_child (filename);
+            try {
+                wk2link.make_symbolic_link (library.get_path ());
+            } catch (IOError.EXISTS exist_error) {
+                /* It's no error if the file already exists. */
+            } catch (Error error) {
+                critical ("Failed to create WebKit2 link: %s", error.message);
+            }
+#endif
             init ();
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);
@@ -120,15 +138,19 @@
         }
 
         void tab_added (Midori.View view) {
+            view.navigation_requested.connect (navigation_requested);
+#if !HAVE_WEBKIT2
             view.web_view.resource_request_starting.connect (resource_requested);
-            view.web_view.navigation_policy_decision_requested.connect (navigation_requested);
+#endif
             view.notify["load-status"].connect (load_status_changed);
             view.context_menu.connect (context_menu);
         }
 
         void tab_removed (Midori.View view) {
+#if !HAVE_WEBKIT2
             view.web_view.resource_request_starting.disconnect (resource_requested);
-            view.web_view.navigation_policy_decision_requested.disconnect (navigation_requested);
+#endif
+            view.navigation_requested.disconnect (navigation_requested);
             view.notify["load-status"].disconnect (load_status_changed);
             view.context_menu.disconnect (context_menu);
         }
@@ -160,6 +182,7 @@
             menu.add (action);
         }
 
+#if !HAVE_WEBKIT2
         void resource_requested (WebKit.WebView web_view, WebKit.WebFrame frame,
             WebKit.WebResource resource, WebKit.NetworkRequest request, WebKit.NetworkResponse? response) {
 
@@ -167,13 +190,10 @@
                 request.set_uri ("about:blank");
             }
         }
-
-        bool navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest request,
-            WebKit.WebNavigationAction action, WebKit.WebPolicyDecision decision) {
-
-            string uri = request.uri;
+#endif
+
+        bool navigation_requested (Midori.Tab tab, string uri) {
             if (uri.has_prefix ("abp:")) {
-                decision.ignore ();
                 string parsed_uri = parse_subscription_uri (uri);
                 manager.add_subscription (parsed_uri);
                 return true;
@@ -318,7 +338,6 @@
             if (style != null)
                 view.inject_stylesheet (style);
         }
-#endif
 
         internal void init () {
             hider_selectors = new StringBuilder ();
@@ -351,7 +370,12 @@
         }
 
         void load_config () {
+#if HAVE_WEBKIT2
+            string config_dir = Path.build_filename (Environment.get_user_config_dir (), "midori", "extensions", "libadblock." + GLib.Module.SUFFIX);
+            Midori.Paths.mkdir_with_parents (config_dir);
+#else
             string config_dir = Midori.Paths.get_extension_config_dir ("adblock");
+#endif
             string presets = Midori.Paths.get_extension_preset_filename ("adblock", "config");
             string filename = Path.build_filename (config_dir, "config");
             config = new Config (filename, presets);
@@ -451,17 +475,18 @@
 }
 
 #if HAVE_WEBKIT2
+#if !HAVE_WEBKIT2_3_91
 Adblock.Extension? filter;
 public static void webkit_web_extension_initialize (WebKit.WebExtension web_extension) {
-    filter = new Adblock.Extension (web_extension);
+    filter = new Adblock.Extension.WebExtension (web_extension);
 }
-#else
+#endif
+#endif
+
 public Midori.Extension extension_init () {
     return new Adblock.Extension ();
 }
-#endif
 
-#if !HAVE_WEBKIT2
 static string? tmp_folder = null;
 string get_test_file (string contents) {
     if (tmp_folder == null)
@@ -833,5 +858,4 @@
     Test.add_func ("/extensions/adblock2/update", test_subscription_update);
     Test.add_func ("/extensions/adblock2/subsparse", test_subscription_uri_parsing);
 }
-#endif
 

=== modified file 'extensions/adblock/subscriptions.vala'
--- extensions/adblock/subscriptions.vala	2014-03-20 20:09:34 +0000
+++ extensions/adblock/subscriptions.vala	2014-03-26 21:12:29 +0000
@@ -40,7 +40,9 @@
         public Options optslist;
         public Whitelist whitelist;
         public Element element;
+#if !HAVE_WEBKIT2
         WebKit.Download? download;
+#endif
 
         public Subscription (string uri) {
             debug_parse = "adblock:parse" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
@@ -289,6 +291,7 @@
             }
         }
 
+#if !HAVE_WEBKIT2
         void download_status (ParamSpec pspec) {
             if (download.get_status () != WebKit.DownloadStatus.FINISHED)
                 return;
@@ -300,6 +303,7 @@
                 warning ("Error parsing %s: %s", uri, error.message);
             }
         }
+#endif
 
         public void parse () throws Error
         {
@@ -340,8 +344,8 @@
                     download.destination_uri = destination_uri;
                     download.notify["status"].connect (download_status);
                     download.start ();
+                }
 #endif
-                }
                 return;
             }
 

=== modified file 'extensions/notes.vala'
--- extensions/notes.vala	2014-03-20 21:42:55 +0000
+++ extensions/notes.vala	2014-03-26 21:12:29 +0000
@@ -390,8 +390,10 @@
         }
 
         void add_menu_items (Midori.Tab tab, WebKit.HitTestResult hit_test_result, Midori.ContextAction menu) {
+#if !HAVE_WEBKIT2
             if ((hit_test_result.context & WebKit.HitTestResultContext.SELECTION) == 0)
                 return;
+#endif
 
             var view = tab as Midori.View;
             var action = new Gtk.Action ("Notes", _("Copy selection as note"), null, null);

=== modified file 'extensions/open-with.vala'
--- extensions/open-with.vala	2014-03-06 22:05:06 +0000
+++ extensions/open-with.vala	2014-03-26 21:12:29 +0000
@@ -615,17 +615,12 @@
             return open_with_type (uri, get_content_type (uri, null), tab, NextStep.TRY_OPEN);
         }
 
-        bool navigation_requested (WebKit.WebView web_view, WebKit.WebFrame frame, WebKit.NetworkRequest request,
-            WebKit.WebNavigationAction action, WebKit.WebPolicyDecision decision) {
-
-            string uri = request.uri;
+        bool navigation_requested (Midori.Tab tab, string uri) {
             if (uri.has_prefix ("file://") || Midori.URI.is_http (uri) || Midori.URI.is_blank (uri))
                 return false;
 
-            decision.ignore ();
-
             string content_type = get_content_type (uri, null);
-            open_with_type (uri, content_type, web_view, NextStep.TRY_OPEN);
+            open_with_type (uri, content_type, tab, NextStep.TRY_OPEN);
             return true;
         }
 
@@ -769,13 +764,13 @@
         }
 
         public void tab_added (Midori.Browser browser, Midori.View view) {
-            view.web_view.navigation_policy_decision_requested.connect_after (navigation_requested);
+            view.navigation_requested.connect_after (navigation_requested);
             view.open_uri.connect (open_uri);
             view.context_menu.connect (context_menu);
         }
 
         public void tab_removed (Midori.Browser browser, Midori.View view) {
-            view.web_view.navigation_policy_decision_requested.disconnect (navigation_requested);
+            view.navigation_requested.disconnect (navigation_requested);
             view.open_uri.disconnect (open_uri);
             view.context_menu.disconnect (context_menu);
         }

=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2014-03-25 00:00:40 +0000
+++ katze/midori-paths.vala	2014-03-26 21:12:29 +0000
@@ -133,6 +133,11 @@
                 tmp_dir = get_runtime_dir ();
             }
             else {
+#if HAVE_WEBKIT2_3_91
+                /* Allow WebKit to spawn more than one rendering process */
+                if (!("wk2:no-multi-render-process" in (Environment.get_variable ("MIDORI_DEBUG") ?? "")))
+                    WebKit.WebContext.get_default ().set_process_model (WebKit.ProcessModel.MULTIPLE_SECONDARY_PROCESSES);
+#endif
                 string? real_config = config != null && !Path.is_absolute (config)
                     ? Path.build_filename (Environment.get_current_dir (), config) : config;
                 config_dir = real_config ?? Path.build_path (Path.DIR_SEPARATOR_S,
@@ -140,16 +145,23 @@
                 cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
                     Environment.get_user_cache_dir (), PACKAGE_NAME);
                 user_data_dir = Environment.get_user_data_dir ();
+                tmp_dir = get_runtime_dir ();
+            }
 #if HAVE_WEBKIT2
+            if (cache_dir != null) {
+                /* Cache and extension dir MUST be set no later than here to work */
+                WebKit.WebContext.get_default ().set_web_extensions_directory (
+                    Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "wk2ext"));
                 WebKit.WebContext.get_default ().set_disk_cache_directory (
                     Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "web"));
+            }
 
+            if (config_dir != null) {
                 var cookie_manager = WebKit.WebContext.get_default ().get_cookie_manager ();
-                cookie_manager.set_persistent_storage (Path.build_filename (config, "cookies.db"),
+                cookie_manager.set_persistent_storage (Path.build_filename (config_dir, "cookies.db"),
                     WebKit.CookiePersistentStorage.SQLITE);
+            }
 #endif
-                tmp_dir = get_runtime_dir ();
-            }
             if (user_data_dir != null) {
                 string folder = Path.build_filename (user_data_dir, "webkit", "icondatabase");
 #if HAVE_WEBKIT2
@@ -451,6 +463,12 @@
             remove_path (Path.build_filename (user_data_dir, "webkit", "icondatabase"));
         }
 
+        /**
+         * Looks up a pixbuf for the given @uri. If @widget is given a generic
+         * file icon is used in case there's no icon.
+         *
+         * Deprecated: 0.5.8: Use Midori.URI.Icon or Midori.URI.get_icon instead.
+         **/
         public static Gdk.Pixbuf? get_icon (string? uri, Gtk.Widget? widget) {
             if (!Midori.URI.is_resource (uri))
                 return null;
@@ -461,9 +479,7 @@
             else
                 icon_width = icon_height = 0 /* maximum size */;
 #if HAVE_WEBKIT2
-            /* TODO async
-            var database = WebKit.WebContext.get_default ().get_favicon_database ();
-            database.get_favicon.begin (uri, null); */
+            /* There is no sync API for WebKit2 */
 #else
             Gdk.Pixbuf? pixbuf = WebKit.get_favicon_database ()
                 .try_get_favicon_pixbuf (uri, icon_width, icon_height);

=== modified file 'katze/midori-uri.vala'
--- katze/midori-uri.vala	2014-02-22 23:19:22 +0000
+++ katze/midori-uri.vala	2014-03-26 21:12:29 +0000
@@ -222,5 +222,97 @@
                 fork_uri = uri;
             return fork_uri != uri;
         }
+
+        /**
+         * Returns a Glib.Icon for the given @uri.
+         *
+         * Since: 0.5.8
+         **/
+        public static async GLib.Icon? get_icon (string uri, Cancellable? cancellable=null) throws Error {
+#if HAVE_WEBKIT2
+            var database = WebKit.WebContext.get_default ().get_favicon_database ();
+            var surface = yield database.get_favicon (uri, cancellable);
+            var image = (Cairo.ImageSurface)surface;
+            var pixbuf = Gdk.pixbuf_get_from_surface (image, 0, 0, image.get_width (), image.get_height ());
+#else
+            var database = WebKit.get_favicon_database ();
+            var pixbuf = yield database.get_favicon_pixbuf (uri, 0, 0, cancellable);
+#endif
+            return pixbuf as GLib.Icon;
+        }
+
+        /**
+         * Returns a Glib.Icon for the given @uri or falls back to @fallback.
+         *
+         * Since: 0.5.8
+         **/
+        public static async GLib.Icon? get_icon_fallback (string uri, GLib.Icon? fallback=null, Cancellable? cancellable=null) {
+        try {
+                return yield get_icon (uri, cancellable);
+            } catch (Error error) {
+                debug ("Icon failed to load: %s", error.message);
+                return fallback;
+            }
+        }
+
+        /**
+         * A Glib.Icon subclass that loads the icon for a given URI.
+         * In the case of an error @fallback will be used.
+         *
+         * Since: 0.5.8
+         **/
+        public class Icon : InitiallyUnowned, GLib.Icon, LoadableIcon {
+            public string uri { get; private set; }
+            public GLib.Icon? fallback { get; private set; }
+            InputStream? stream = null;
+            public Icon (string website_uri, GLib.Icon? fallback=null) {
+                uri = website_uri;
+                /* TODO: Use fallback */
+                this.fallback = fallback;
+            }
+            public bool equal (GLib.Icon? other) {
+                return other is Icon && (other as Icon).uri == uri;
+            }
+            public uint hash () {
+                return uri.hash ();
+            }
+            public InputStream load (int size, out string? type = null, Cancellable? cancellable = null) throws Error {
+                /* Implementation notes:
+                   GTK+ up to GTK+ 3.10 loads any GLib.Icon synchronously
+                   Favicons may be cached but usually trigger loading here
+                   Only one async code path in favour of consistent results
+                 */
+                if (stream != null) {
+                    type = "image/png";
+                    return stream;
+                }
+                load_async.begin (size, cancellable, (obj, res)=>{
+                    try {
+                        stream = load_async.end (res);
+                    }
+                    catch (Error error) {
+                       debug ("Icon failed to load: %s", error.message);
+                    }
+                });
+                throw new FileError.EXIST ("Triggered load - no data yet");
+            }
+
+            public async InputStream load_async (int size, Cancellable? cancellable = null, out string? type = null) throws Error {
+                type = "image/png";
+                if (stream != null)
+                    return stream;
+                var icon = yield get_icon (uri, cancellable);
+                if (icon != null && icon is Gdk.Pixbuf) {
+                    var pixbuf = icon as Gdk.Pixbuf;
+                    // TODO: scale it to "size" here
+                    uint8[] buffer;
+                    pixbuf.save_to_buffer (out buffer, "png");
+                    stream = new MemoryInputStream.from_data (buffer, null);
+                }
+                else
+                    throw new FileError.EXIST ("No icon available");
+                return stream;
+            }
+        }
     }
 }

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2014-03-20 20:30:46 +0000
+++ midori/midori-app.c	2014-03-26 21:12:29 +0000
@@ -1254,7 +1254,7 @@
 midori_debug (const gchar* token)
 {
     static const gchar* debug_token = NULL;
-    const gchar* debug_tokens = "adblock:match adblock:parse adblock:time adblock:element adblock:css startup headers body referer cookies paths hsts unarmed db:bookmarks db:history db:tabby mouse app database ";
+    const gchar* debug_tokens = "wk2:no-multi-render-process adblock:match adblock:parse adblock:time adblock:element adblock:css startup headers body referer cookies paths hsts unarmed db:bookmarks db:history db:tabby mouse app database ";
     if (debug_token == NULL)
     {
         gchar* found_token;

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-03-25 01:00:38 +0000
+++ midori/midori-browser.c	2014-03-26 21:12:29 +0000
@@ -2785,15 +2785,8 @@
 
     if (WEBKIT_IS_WEB_VIEW (widget))
     {
-#ifndef HAVE_WEBKIT2
-        WebKitWebView* view = WEBKIT_WEB_VIEW (widget);
-        can_undo = webkit_web_view_can_undo (view);
-        can_redo = webkit_web_view_can_redo (view);
-        can_cut = webkit_web_view_can_cut_clipboard (view);
-        can_copy = webkit_web_view_can_copy_clipboard (view);
-        can_paste = webkit_web_view_can_paste_clipboard (view);
-        can_select_all = TRUE;
-#endif
+        midori_tab_update_actions (MIDORI_TAB (widget), browser->action_group, NULL, NULL);
+        return;
     }
     else if (GTK_IS_EDITABLE (widget))
     {
@@ -2828,9 +2821,11 @@
 _action_undo_activate (GtkAction*     action,
                        MidoriBrowser* browser)
 {
-#ifndef HAVE_WEBKIT2
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (WEBKIT_IS_WEB_VIEW (widget))
+#ifdef HAVE_WEBKIT2
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_UNDO);
+#else
         webkit_web_view_undo (WEBKIT_WEB_VIEW (widget));
 #endif
 }
@@ -2839,9 +2834,11 @@
 _action_redo_activate (GtkAction*     action,
                        MidoriBrowser* browser)
 {
-#ifndef HAVE_WEBKIT2
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (WEBKIT_IS_WEB_VIEW (widget))
+#ifdef HAVE_WEBKIT2
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_REDO);
+#else
         webkit_web_view_redo (WEBKIT_WEB_VIEW (widget));
 #endif
 }
@@ -2853,6 +2850,10 @@
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget) && g_signal_lookup ("cut-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "cut-clipboard");
+#ifdef HAVE_WEBKIT2
+    else if (WEBKIT_IS_WEB_VIEW (widget))
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_CUT);
+#endif
 }
 
 static void
@@ -2862,6 +2863,10 @@
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget) && g_signal_lookup ("copy-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "copy-clipboard");
+#ifdef HAVE_WEBKIT2
+    else if (WEBKIT_IS_WEB_VIEW (widget))
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_COPY);
+#endif
 }
 
 static void
@@ -2871,25 +2876,29 @@
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget) && g_signal_lookup ("paste-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "paste-clipboard");
+#ifdef HAVE_WEBKIT2
+    else if (WEBKIT_IS_WEB_VIEW (widget))
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_PASTE);
+#endif
 }
 
 static void
 _action_delete_activate (GtkAction*     action,
                          MidoriBrowser* browser)
 {
-#ifndef HAVE_WEBKIT2
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget))
     {
-        if (WEBKIT_IS_WEB_VIEW (widget))
+        if (GTK_IS_EDITABLE (widget))
+            gtk_editable_delete_selection (GTK_EDITABLE (widget));
+#ifndef HAVE_WEBKIT2
+        else if (WEBKIT_IS_WEB_VIEW (widget))
             webkit_web_view_delete_selection (WEBKIT_WEB_VIEW (widget));
-        else if (GTK_IS_EDITABLE (widget))
-            gtk_editable_delete_selection (GTK_EDITABLE (widget));
+#endif
         else if (GTK_IS_TEXT_VIEW (widget))
             gtk_text_buffer_delete_selection (
                 gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)), TRUE, FALSE);
     }
-#endif
 }
 
 static void
@@ -2901,6 +2910,10 @@
     {
         if (GTK_IS_EDITABLE (widget))
             gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1);
+#ifdef HAVE_WEBKIT2
+        else if (WEBKIT_IS_WEB_VIEW (widget))
+            webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_SELECT_ALL);
+#endif
         else if (g_signal_lookup ("select-all", G_OBJECT_TYPE (widget)))
         {
             if (GTK_IS_TEXT_VIEW (widget))
@@ -3484,11 +3497,18 @@
                      MidoriBrowser* browser,
                      gboolean       use_dom)
 {
-    GtkWidget* view;
+    GtkWidget* view = midori_browser_get_current_tab (browser);
+    #ifdef HAVE_WEBKIT2
+    /* TODO: midori_view_save_source isn't async and not WebKit2-friendly */
+    GtkWidget* source = midori_view_new_with_item (NULL, browser->settings);
+    GtkWidget* source_view = midori_view_get_web_view (MIDORI_VIEW (source));
+    midori_tab_set_view_source (MIDORI_TAB (source), TRUE);
+    webkit_web_view_load_uri (WEBKIT_WEB_VIEW (source_view), midori_tab_get_uri (MIDORI_TAB (view)));
+    midori_browser_add_tab (browser, source);
+    #else
     gchar* text_editor;
     gchar* filename = NULL;
 
-    view = midori_browser_get_current_tab (browser);
     filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL, use_dom);
     g_object_get (browser->settings, "text-editor", &text_editor, NULL);
     if (!(text_editor && *text_editor))
@@ -3512,6 +3532,7 @@
         g_free (filename);
     }
     g_free (text_editor);
+    #endif
 }
 
 static void

=== modified file 'midori/midori-historycompletion.vala'
--- midori/midori-historycompletion.vala	2014-02-11 23:01:05 +0000
+++ midori/midori-historycompletion.vala	2014-03-26 21:12:29 +0000
@@ -46,12 +46,12 @@
                 if (item is Midori.HistoryWebsite) {
                     var website = item as Midori.HistoryWebsite;
                     suggestions.append (new Suggestion (website.uri, website.title,
-                        false, null, Midori.Paths.get_icon (website.uri, null)));
+                        false, null, yield Midori.URI.get_icon_fallback (website.uri, null, cancellable), this.position));
                 }
                 else if (item is Midori.HistorySearch) {
                     var search = item as Midori.HistorySearch;
                     suggestions.append (new Suggestion (search.uri, search.title + "\n" + search.uri,
-                        false, "gray", Midori.Paths.get_icon (search.uri, null), this.position));
+                        false, "gray", yield Midori.URI.get_icon_fallback (search.uri, null, cancellable), this.position));
                 }
                 else
                     warn_if_reached ();

=== modified file 'midori/midori-searchcompletion.vala'
--- midori/midori-searchcompletion.vala	2014-02-11 23:01:05 +0000
+++ midori/midori-searchcompletion.vala	2014-03-26 21:12:29 +0000
@@ -45,11 +45,11 @@
                 item.get ("text", out desc);
                 string search_uri = URI.for_search (uri, text);
                 string search_title = _("Search with %s").printf (title);
-                Gdk.Pixbuf? pixbuf = Midori.Paths.get_icon (uri, null);
+                Icon? icon = yield Midori.URI.get_icon_fallback (uri, null, cancellable);
                 string search_desc = search_title + "\n" + desc ?? uri;
                 /* FIXME: Theming? Win32? */
                 string background = "gray";
-                var suggestion = new Suggestion (search_uri, search_desc, false, background, pixbuf);
+                var suggestion = new Suggestion (search_uri, search_desc, false, background, icon);
                 suggestions.append (suggestion);
 
                 n++;

=== modified file 'midori/midori-tab.vala'
--- midori/midori-tab.vala	2014-03-18 16:56:38 +0000
+++ midori/midori-tab.vala	2014-03-26 21:12:29 +0000
@@ -34,6 +34,7 @@
     }
 
     public class Tab : Gtk.VBox {
+        public Tab related { get; set construct; }
         public WebKit.WebView web_view { get; private set; }
 
         private string current_uri = "about:blank";
@@ -94,6 +95,8 @@
            Since: 0.5.8
          */
         public signal bool open_uri (string uri);
+        /* Since: 0.5.8 */
+        public signal bool navigation_requested (string uri);
         public signal void console_message (string message, int line, string source_id);
         public signal void attach_inspector (WebKit.WebView inspector_view);
         /* Emitted when an open inspector that was previously
@@ -120,7 +123,12 @@
             orientation = Gtk.Orientation.VERTICAL;
             #endif
 
+#if HAVE_WEBKIT2_3_91
+            web_view = related != null ?
+              new WebKit.WebView.with_related_view (related.web_view) : new WebKit.WebView ();
+#else
             web_view = new WebKit.WebView ();
+#endif
             /* Load something to avoid a bug where WebKit might not set a main frame */
             web_view.load_uri ("");
         }
@@ -260,5 +268,34 @@
             return found;
 #endif
         }
+
+        /*
+          Updates all editing actions with regard to text selection.
+
+          Since: 0.5.8
+         */
+        public async void update_actions (Gtk.ActionGroup actions) {
+#if HAVE_WEBKIT2
+            try {
+                actions.get_action ("Undo").sensitive = yield web_view.can_execute_editing_command ("Undo", null);
+                actions.get_action ("Redo").sensitive = yield web_view.can_execute_editing_command ("Redo", null);
+                actions.get_action ("Cut").sensitive = yield web_view.can_execute_editing_command ("Cut", null);
+                actions.get_action ("Copy").sensitive = yield web_view.can_execute_editing_command ("Copy", null);
+                actions.get_action ("Paste").sensitive = yield web_view.can_execute_editing_command ("Paste", null);
+                actions.get_action ("Delete").sensitive = yield web_view.can_execute_editing_command ("Cut", null);
+                actions.get_action ("SelectAll").sensitive = yield web_view.can_execute_editing_command ("SelectAll", null);
+            } catch (Error error) {
+                critical ("Failed to update actions: %s", error.message);
+            }
+#else
+            actions.get_action ("Undo").sensitive = web_view.can_undo ();
+            actions.get_action ("Redo").sensitive = web_view.can_redo ();
+            actions.get_action ("Cut").sensitive = web_view.can_cut_clipboard ();
+            actions.get_action ("Copy").sensitive = web_view.can_copy_clipboard ();
+            actions.get_action ("Paste").sensitive = web_view.can_paste_clipboard ();
+            actions.get_action ("Delete").sensitive = true;
+            actions.get_action ("SelectAll").sensitive = true;
+#endif
+        }
     }
 }

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-03-18 18:45:32 +0000
+++ midori/midori-view.c	2014-03-26 21:12:29 +0000
@@ -544,10 +544,24 @@
             webkit_policy_decision_download (decision);
             return TRUE;
         }
+        webkit_policy_decision_use (decision);
+        return TRUE;
+    }
+    else if (decision_type == WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION)
+    {
+    }
+    else if (decision_type == WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION)
+    {
+    }
+    else
+    {
+        g_debug ("Unhandled policy decision type %d", decision_type);
+        return FALSE;
     }
 
     void* request = NULL;
-    const gchar* uri = webkit_web_view_get_uri (web_view);
+    const gchar* uri = webkit_uri_request_get_uri (
+        webkit_navigation_policy_decision_get_request (WEBKIT_NAVIGATION_POLICY_DECISION (decision)));
     #else
     const gchar* uri = webkit_network_request_get_uri (request);
     #endif
@@ -648,6 +662,19 @@
     g_free (result);
     view->find_links = -1;
     #endif
+
+    gboolean handled = FALSE;
+    g_signal_emit_by_name (view, "navigation-requested", uri, &handled);
+    if (handled)
+    {
+        #ifdef HAVE_WEBKIT2
+        webkit_policy_decision_ignore (decision);
+        #else
+        webkit_web_policy_decision_ignore (decision);
+        #endif
+        return TRUE;
+    }
+
     return FALSE;
 }
 
@@ -2246,21 +2273,7 @@
     if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE)
     {
         /* Enforce update of actions - there's no "selection-changed" signal */
-        #ifndef HAVE_WEBKIT2
-        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Undo"),
-            webkit_web_view_can_undo (WEBKIT_WEB_VIEW (view->web_view)));
-        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Redo"),
-            webkit_web_view_can_redo (WEBKIT_WEB_VIEW (view->web_view)));
-        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Cut"),
-            webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
-        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Copy"),
-            webkit_web_view_can_copy_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
-        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Paste"),
-            webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
-        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Delete"),
-            webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
-        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "SelectAll"), TRUE);
-        #endif
+        midori_tab_update_actions (MIDORI_TAB (view), actions, NULL, NULL);
         midori_context_action_add_by_name (menu, "Undo");
         midori_context_action_add_by_name (menu, "Redo");
         midori_context_action_add (menu, NULL);
@@ -2348,15 +2361,6 @@
         if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
             midori_context_action_add (menu, NULL);
 
-        /* No need to have Copy twice, which is already in the editable menu */
-        if (!(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE))
-        {
-            /* Enforce update of copy action - there's no "selection-changed" signal */
-            midori_context_action_add_by_name (menu, "Copy");
-            gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Copy"),
-                webkit_web_view_can_copy_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
-        }
-
         /* Ensure view->selected_text */
         midori_view_has_selection (view);
         if (midori_uri_is_valid (view->selected_text))
@@ -2422,16 +2426,28 @@
         midori_context_action_add_by_name (menu, "Forward");
         midori_context_action_add_by_name (menu, "Stop");
         midori_context_action_add_by_name (menu, "Reload");
+    }
+
+    /* No need to have Copy twice, which is already in the editable menu */
+    if (!(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE))
+    {
+        midori_context_action_add (menu, NULL);
+        /* Enforce update of actions - there's no "selection-changed" signal */
+        midori_tab_update_actions (MIDORI_TAB (view), actions, NULL, NULL);
+        midori_context_action_add_by_name (menu, "Copy");
+        midori_context_action_add_by_name (menu, "SelectAll");
+    }
+
+    if (context == WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT)
+    {
         midori_context_action_add (menu, NULL);
         midori_context_action_add_by_name (menu, "UndoTabClose");
-
         #ifndef HAVE_WEBKIT2
         WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
         if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view))
             midori_context_action_add_simple (menu, "OpenFrameInNewTab", _("Open _Frame in New Tab"), NULL, NULL,
                 midori_web_view_open_frame_in_new_tab_cb, view);
         #endif
-
         midori_context_action_add_simple (menu, "OpenInNewWindow", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW,
             midori_view_tab_label_menu_window_new_cb, view);
         midori_context_action_add_by_name (menu, "ZoomIn");
@@ -2534,7 +2550,6 @@
 }
 #endif
 
-#ifndef HAVE_WEBKIT2
 static gboolean
 midori_view_web_view_close_cb (WebKitWebView* web_view,
                                GtkWidget*     view)
@@ -2550,7 +2565,11 @@
     MidoriNewView where = MIDORI_NEW_VIEW_TAB;
     GtkWidget* new_view = GTK_WIDGET (midori_view_get_for_widget (web_view));
 
+#ifdef HAVE_WEBKIT2
+    WebKitWindowProperties* features = webkit_web_view_get_window_properties (WEBKIT_WEB_VIEW (web_view));
+#else
     WebKitWebWindowFeatures* features = webkit_web_view_get_window_features (WEBKIT_WEB_VIEW (web_view));
+#endif
     gboolean locationbar_visible, menubar_visible, toolbar_visible;
     gint width, height;
     g_object_get (features,
@@ -2586,8 +2605,13 @@
         GtkWidget* toplevel = gtk_widget_get_toplevel (new_view);
         if (width > 0 && height > 0)
             gtk_widget_set_size_request (toplevel, width, height);
+#ifdef HAVE_WEBKIT2
+        g_signal_connect (web_view, "close",
+                          G_CALLBACK (midori_view_web_view_close_cb), new_view);
+#else
         g_signal_connect (web_view, "close-web-view",
                           G_CALLBACK (midori_view_web_view_close_cb), new_view);
+#endif
     }
 
     return TRUE;
@@ -2595,26 +2619,38 @@
 
 static GtkWidget*
 webkit_web_view_create_web_view_cb (GtkWidget*      web_view,
+#ifndef HAVE_WEBKIT2
                                     WebKitWebFrame* web_frame,
+#endif
                                     MidoriView*     view)
 {
     MidoriView* new_view;
 
+#ifdef HAVE_WEBKIT2
+    const gchar* uri = webkit_web_view_get_uri (WEBKIT_WEB_VIEW (web_view));
+#else
+    const gchar* uri = webkit_web_frame_get_uri (web_frame);
+#endif
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT)
         new_view = view;
     else
     {
         KatzeItem* item = katze_item_new ();
-        item->uri = g_strdup (webkit_web_frame_get_uri (web_frame));
-        new_view = (MidoriView*)midori_view_new_with_item (item, view->settings);
+        item->uri = g_strdup (uri);
+        new_view = (MidoriView*)midori_view_new_from_view (view, item, NULL);
+#ifdef HAVE_WEBKIT2
+        g_signal_connect (new_view->web_view, "ready-to-show",
+                          G_CALLBACK (webkit_web_view_web_view_ready_cb), view);
+#else
         g_signal_connect (new_view->web_view, "web-view-ready",
                           G_CALLBACK (webkit_web_view_web_view_ready_cb), view);
+#endif
     }
-    g_object_set_data_full (G_OBJECT (new_view), "opener-uri",
-        g_strdup (webkit_web_frame_get_uri (web_frame)), g_free);
+    g_object_set_data_full (G_OBJECT (new_view), "opener-uri", g_strdup (uri), g_free);
     return new_view->web_view;
 }
 
+#ifndef HAVE_WEBKIT2
 static gboolean
 webkit_web_view_mime_type_decision_cb (GtkWidget*               web_view,
                                        WebKitWebFrame*          web_frame,
@@ -3144,14 +3180,55 @@
  * Return value: a new #MidoriView
  *
  * Since: 0.4.3
+ * Deprecated: 0.5.8: Use midori_view_new_from_view instead.
  **/
 GtkWidget*
 midori_view_new_with_item (KatzeItem*         item,
                            MidoriWebSettings* settings)
 {
+    return midori_view_new_from_view (NULL, item, settings);
+}
+
+/**
+ * midori_view_new_with_item:
+ * @view: a predating, related #MidoriView, or %NULL
+ * @item: a #KatzeItem, or %NULL
+ * @settings: a #MidoriWebSettings, or %NULL
+ *
+ * Creates a new view, visible by default.
+ *
+ * If a @view is specified the returned new view will share
+ * its settings and if applicable re-use the rendering process.
+ *
+ * When @view should be passed:
+ *     The new one created is a new tab/ window for the old @view
+ *     A tab was duplicated
+ *
+ * When @view may be passed:
+ *     Old and new view belong to the same website or group
+ *
+ * Don't pass a @view if:
+ *     The new view is a completely new website
+ *
+ * The @item may contain title, URI and minimized status and will be copied.
+ *
+ * Usually @settings should be passed from an existing view or browser.
+ *
+ * Return value: a new #MidoriView
+ *
+ * Since: 0.5.8
+ **/
+GtkWidget*
+midori_view_new_from_view (MidoriView*        related,
+                           KatzeItem*         item,
+                           MidoriWebSettings* settings)
+{
     MidoriView* view = g_object_new (MIDORI_TYPE_VIEW,
+                                     "related", MIDORI_TAB (related),
                                      "title", item ? katze_item_get_name (item) : NULL,
                                      NULL);
+    if (!settings && related)
+        settings = related->settings;
     if (settings)
         _midori_view_set_settings (view, settings);
     if (item)
@@ -3427,6 +3504,8 @@
                       midori_view_web_view_permission_request_cb, view,
                       "signal::context-menu",
                       midori_view_web_view_context_menu_cb, view,
+                      "signal::create",
+                      webkit_web_view_create_web_view_cb, view,
                       #else
                       "signal::notify::load-status",
                       midori_view_web_view_notify_load_status_cb, view,

=== modified file 'midori/midori-view.h'
--- midori/midori-view.h	2014-03-16 12:11:56 +0000
+++ midori/midori-view.h	2014-03-26 21:12:29 +0000
@@ -64,6 +64,11 @@
 midori_view_new_with_item              (KatzeItem*         item,
                                         MidoriWebSettings* settings);
 
+GtkWidget*
+midori_view_new_from_view              (MidoriView*        view,
+                                        KatzeItem*         item,
+                                        MidoriWebSettings* settings);
+
 void
 midori_view_set_settings               (MidoriView*        view,
                                         MidoriWebSettings* settings);

=== modified file 'midori/webkit2gtk-3.0.vapi'
--- midori/webkit2gtk-3.0.vapi	2013-08-02 17:20:37 +0000
+++ midori/webkit2gtk-3.0.vapi	2014-03-26 21:12:29 +0000
@@ -436,6 +436,7 @@
 		public unowned string[] get_spell_checking_languages ();
 		public void register_uri_scheme (string scheme, owned WebKit.URISchemeRequestCallback callback);
 		public void set_additional_plugins_directory (string directory);
+		public void set_process_model (WebKit.ProcessModel process_model);
 		public void set_cache_model (WebKit.CacheModel cache_model);
 		public void set_spell_checking_enabled (bool enabled);
 		public void set_spell_checking_languages (string[] languages);
@@ -486,6 +487,7 @@
 	public class WebView : WebKit.WebViewBase, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public WebView ();
+		public WebView.with_related_view (WebKit.WebView related);
 		public async bool can_execute_editing_command (string command, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool can_go_back ();
 		public bool can_go_forward ();
@@ -594,6 +596,11 @@
 		public abstract void allow ();
 		public abstract void deny ();
 	}
+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PROCESS_MODEL_")]
+	public enum ProcessModel {
+		SHARED_SECONDARY_PROCESS,
+		MULTIPLE_SECONDARY_PROCESSES
+	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_CACHE_MODEL_")]
 	public enum CacheModel {
 		DOCUMENT_VIEWER,

=== modified file 'midori/webkitgtk-3.0.vapi'
--- midori/webkitgtk-3.0.vapi	2012-12-16 18:40:10 +0000
+++ midori/webkitgtk-3.0.vapi	2014-03-26 21:12:29 +0000
@@ -6,6 +6,7 @@
 	public class FaviconDatabase : GLib.Object {
 		public signal void icon_loaded (string frame_uri);
 		public Gdk.Pixbuf? try_get_favicon_pixbuf (string page_uri, uint width, uint height);
+		public async Gdk.Pixbuf? get_favicon_pixbuf (string page_uri, uint width, uint height, GLib.Cancellable cancellable) throws GLib.Error;
 		public void set_path (string? path);
 		public void clear ();
 	}