Once created, keep the WebEngineContext until shutdown.

Chromium isn't expecting the destruction and reconstruction of the
ContentMainRunner and BrowserMainRunner. This will need a few tweaks
before we can do this without hitting asserts in debug builds.

Change-Id: I0c46a2db27350b3f6352e3eb8a5ec7ecff06784e
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 4 insertions, 15 deletions

diff --git a/lib/web_engine_context.cpp b/lib/web_engine_context.cpp
index 67202a9c2..49f38c682 100644
--- a/lib/web_engine_context.cpp
+++ b/lib/web_engine_context.cpp
@@ -63,7 +63,7 @@
 
 namespace {
 
-static WebEngineContext* sContext = 0;
+scoped_refptr<WebEngineContext> sContext;
 
 static QByteArray subProcessPath() {
     static bool initialized = false;
@@ -112,9 +112,6 @@ WebEngineContext::WebEngineContext()
     , m_contentRunner(content::ContentMainRunner::Create())
     , m_browserRunner(content::BrowserMainRunner::Create())
 {
-    Q_ASSERT(!sContext);
-    sContext = this;
-
     QList<QByteArray> args;
     Q_FOREACH (const QString& arg, QCoreApplication::arguments())
         args << arg.toUtf8();
@@ -140,19 +137,11 @@ WebEngineContext::WebEngineContext()
 WebEngineContext::~WebEngineContext()
 {
     m_runLoop->AfterRun();
-
-    Q_ASSERT(sContext == this);
-    sContext = 0;
-
-    m_browserRunner.reset();
-    m_contentRunner.reset();
 }
 
 scoped_refptr<WebEngineContext> WebEngineContext::current()
 {
-    scoped_refptr<WebEngineContext> current = sContext;
-    if (!current)
-        current = new WebEngineContext;
-    Q_ASSERT(sContext == current);
-    return current;
+    if (!sContext)
+        sContext = new WebEngineContext;
+    return sContext;
 }