Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / shell / desktop / mojo_main.cc

diff --git a/src/mojo/shell/desktop/mojo_main.cc b/src/mojo/shell/desktop/mojo_main.cc
index 38017cb..3dac7c7 100644 (file)
--- a/src/mojo/shell/desktop/mojo_main.cc
+++ b/src/mojo/shell/desktop/mojo_main.cc
@@ -10,13 +10,38 @@
 #include "mojo/shell/child_process.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
-#include "mojo/shell/run.h"
 #include "mojo/shell/switches.h"
+#include "ui/gfx/switches.h"
+
+#if defined(COMPONENT_BUILD)
 #include "ui/gl/gl_surface.h"
+#endif
+
+namespace {
+
+void RunApps(mojo::shell::Context* context) {
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  base::CommandLine::StringVector args = command_line.GetArgs();
+  for (base::CommandLine::StringVector::const_iterator it = args.begin();
+       it != args.end();
+       ++it) {
+    context->Run(GURL(*it));
+  }
+}
+
+}  // namespace
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
+#if defined(OS_LINUX)
+  // We use gfx::RenderText from multiple threads concurrently and the pango
+  // backend (currently the default on linux) is not close to threadsafe. Force
+  // use of the harfbuzz backend for now.
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableHarfBuzzRenderText);
+#endif
   mojo::shell::InitializeLogging();
 
   // TODO(vtl): Unify parent and child process cases to the extent possible.
@@ -25,8 +50,9 @@ int main(int argc, char** argv) {
               *base::CommandLine::ForCurrentProcess())) {
     child_process->Main();
   } else {
+#if defined(COMPONENT_BUILD)
     gfx::GLSurface::InitializeOneOff();
-
+#endif
     // We want the shell::Context to outlive the MessageLoop so that pipes are
     // all gracefully closed / error-out before we try to shut the Context down.
     mojo::shell::Context shell_context;
@@ -41,17 +67,7 @@ int main(int argc, char** argv) {
             GURL(command_line.GetSwitchValueASCII(switches::kOrigin)));
       }
 
-      std::vector<GURL> app_urls;
-      base::CommandLine::StringVector args = command_line.GetArgs();
-      for (base::CommandLine::StringVector::const_iterator it = args.begin();
-           it != args.end();
-           ++it)
-        app_urls.push_back(GURL(*it));
-
-      message_loop.PostTask(FROM_HERE,
-                            base::Bind(mojo::shell::Run,
-                                       &shell_context,
-                                       app_urls));
+      message_loop.PostTask(FROM_HERE, base::Bind(RunApps, &shell_context));
       message_loop.Run();
     }
   }