[geary/mjog/558-webkit-shared-process: 5/11] Remove WebKitGTK 2.24 shared process workaround

[Michael Gratton <mjog src gnome org>]

commit 7b35e533438ef7786f1231775cec5ed253ee3923
Author: Michael Gratton <mike vee net>
Date:   Mon Nov 25 22:21:24 2019 +1100

    Remove WebKitGTK 2.24 shared process workaround
    
    See #558

 src/client/application/main.vala               |  6 ------
 src/client/components/components-web-view.vala |  5 -----
 src/client/meson.build                         | 10 ----------
 3 files changed, 21 deletions(-)
---
diff --git a/src/client/application/main.vala b/src/client/application/main.vala
index 0df87838..f6f971f3 100644
--- a/src/client/application/main.vala
+++ b/src/client/application/main.vala
@@ -20,12 +20,6 @@ int main(string[] args) {
     Environment.set_variable("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", false);
 #endif
 
-    // Temporary workaround for WebKitGTK deprecation of the
-    // shared-secondary process model. Pull this out in 3.36 when the
-    // proper fix lands. See GNOME/geary#558.
-    Environment.set_variable("WEBKIT_USE_SINGLE_WEB_PROCESS", "1", true);
-
-
     // Init logging right up front so as to capture as many log
     // messages as possible
     Geary.Logging.init();
diff --git a/src/client/components/components-web-view.vala b/src/client/components/components-web-view.vala
index e4c3581c..7d6cdcb1 100644
--- a/src/client/components/components-web-view.vala
+++ b/src/client/components/components-web-view.vala
@@ -76,11 +76,6 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
                                         File cache_dir) {
         WebsiteDataManager data_manager = new WebsiteDataManager(cache_dir.get_path());
         WebKit.WebContext context = new WebKit.WebContext.with_website_data_manager(data_manager);
-#if HAS_WEBKIT_SHARED_PROC
-        // Use a shared process so we don't spawn N WebProcess instances
-        // when showing N messages in a conversation.
-        context.set_process_model(WebKit.ProcessModel.SHARED_SECONDARY_PROCESS);
-#endif
         // Use the doc viewer model since each web view instance only
         // ever shows a single HTML document.
         context.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER);
diff --git a/src/client/meson.build b/src/client/meson.build
index a7c85817..92784c99 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -141,16 +141,6 @@ geary_client_dependencies = [
 
 geary_client_vala_args = geary_vala_args
 
-# Enable shared shecondary process if available.
-# See issues #558 and #559
-webkit_version = webkit2gtk.version().split('.')
-if webkit_version[0].to_int() <= 2 and webkit_version[1].to_int() <= 24
-  message('Enabling WebKitGTK shared process model')
-  geary_client_vala_args += [
-    '-D', 'HAS_WEBKIT_SHARED_PROC'
-  ]
-endif
-
 # Main client application library
 geary_client_lib = static_library('geary-client',
   geary_client_sources,