Convert view manager to surfaces with uploading shim in client lib

mojo/shell/desktop/mojo_main.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/shell/child_process.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
 #include "mojo/shell/switches.h"
+#include "ui/gfx/switches.h"
 #include "ui/gl/gl_surface.h"
 
 namespace {
 
 void RunApps(mojo::shell::Context* context, std::vector<GURL> app_urls) {
   for (std::vector<GURL>::const_iterator it = app_urls.begin();
        it != app_urls.end(); ++it) {
     context->Run(*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.
   if (scoped_ptr<mojo::shell::ChildProcess> child_process =
           mojo::shell::ChildProcess::Create(
               *base::CommandLine::ForCurrentProcess())) {
     child_process->Main();
   } else {
     gfx::GLSurface::InitializeOneOff();
 
@@ skipping 20 matching lines @@
 
       message_loop.PostTask(FROM_HERE,
                             base::Bind(RunApps,
                                        &shell_context,
                                        app_urls));
       message_loop.Run();
     }
   }
   return 0;
 }