summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2014-05-06 16:06:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-07 13:00:34 +0200
commit3339e2857ecd574cca5b5f96c3a2bb7fa7b5dfc5 (patch)
tree0bdab20a51a4735086c33dec0ad67f0e49aa16a6
parentcb74d88037aa4949f1c1a9ec8bd83b15b01b2dea (diff)
Windows: Fix yet another crash in ContantMainRunnerImpl::Initialize
Without initialization of the SandboxInfo it still crashes: g_broker_services is null. Change-Id: Ib4bc0666fefe0f81b489e0ef3c179eae866f804f Reviewed-by: Michael Bruning <michael.bruning@digia.com>
-rw-r--r--src/core/web_engine_context.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 95bdce81..2d2a8463 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -63,8 +63,11 @@
#include "ui/events/event_switches.h"
#include "ui/gl/gl_switches.h"
#include "gpu/command_buffer/service/gpu_switches.h"
-#include "sandbox/win/src/sandbox_types.h"
#include "webkit/common/user_agent/user_agent_util.h"
+#if defined(OS_WIN)
+#include "sandbox/win/src/sandbox_types.h"
+#include "content/public/app/startup_helper_win.h"
+#endif // OS_WIN
#include "content_browser_client_qt.h"
#include "content_client_qt.h"
@@ -170,6 +173,7 @@ WebEngineContext::WebEngineContext()
#if defined(OS_WIN)
sandbox::SandboxInterfaceInfo sandbox_info = {0};
+ content::InitializeSandboxInfo(&sandbox_info);
m_contentRunner->Initialize(0, &sandbox_info, m_mainDelegate.get());
#else
m_contentRunner->Initialize(0, 0, m_mainDelegate.get());