| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
| 6 #include "base/threading/thread.h" | 6 #include "base/threading/thread.h" |
| 7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
| 9 #include "mojo/public/cpp/application/application_connection.h" | 9 #include "mojo/public/cpp/application/application_connection.h" |
| 10 #include "mojo/public/cpp/application/application_delegate.h" | 10 #include "mojo/public/cpp/application/application_delegate.h" |
| 11 #include "mojo/public/cpp/application/application_impl.h" | 11 #include "mojo/public/cpp/application/application_impl.h" |
| 12 #include "mojo/public/cpp/application/interface_factory_impl.h" | 12 #include "mojo/public/cpp/application/interface_factory_impl.h" |
| 13 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" | 13 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" |
| 14 #include "sky/engine/public/web/Sky.h" | 14 #include "sky/engine/public/web/Sky.h" |
| 15 #include "sky/viewer/content_handler_impl.h" | 15 #include "sky/viewer/content_handler_impl.h" |
| 16 #include "sky/viewer/document_view.h" | 16 #include "sky/viewer/document_view.h" |
| 17 #include "sky/viewer/platform/platform_impl.h" | 17 #include "sky/viewer/platform/platform_impl.h" |
| 18 #include "sky/viewer/services/tracing_impl.h" | 18 #include "sky/viewer/services/tracing_impl.h" |
| 19 | 19 |
| 20 #if !defined(COMPONENT_BUILD) | 20 #if !defined(COMPONENT_BUILD) |
| 21 #include "base/i18n/icu_util.h" | 21 #include "base/i18n/icu_util.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace sky { | 24 namespace sky { |
| 25 | 25 |
| 26 class Viewer : public mojo::ApplicationDelegate, | 26 class Viewer : public mojo::ApplicationDelegate, |
| 27 public mojo::InterfaceFactory<mojo::ContentHandler> { | 27 public mojo::InterfaceFactory<mojo::ContentHandler> { |
| 28 public: | 28 public: |
| 29 Viewer() : compositor_thread_("compositor thread") {} | 29 Viewer() {} |
| 30 | 30 |
| 31 virtual ~Viewer() { blink::shutdown(); } | 31 virtual ~Viewer() { blink::shutdown(); } |
| 32 | 32 |
| 33 private: | 33 private: |
| 34 // Overridden from ApplicationDelegate: | 34 // Overridden from ApplicationDelegate: |
| 35 virtual void Initialize(mojo::ApplicationImpl* app) override { | 35 virtual void Initialize(mojo::ApplicationImpl* app) override { |
| 36 platform_impl_.reset(new PlatformImpl(app)); | 36 platform_impl_.reset(new PlatformImpl(app)); |
| 37 blink::initialize(platform_impl_.get()); | 37 blink::initialize(platform_impl_.get()); |
| 38 // FIXME: Why not in the component build? | |
| 39 #if !defined(COMPONENT_BUILD) | |
| 40 base::i18n::InitializeICU(); | 38 base::i18n::InitializeICU(); |
| 41 #endif | |
| 42 compositor_thread_.Start(); | |
| 43 } | 39 } |
| 44 | 40 |
| 45 virtual bool ConfigureIncomingConnection( | 41 virtual bool ConfigureIncomingConnection( |
| 46 mojo::ApplicationConnection* connection) override { | 42 mojo::ApplicationConnection* connection) override { |
| 47 connection->AddService(this); | 43 connection->AddService(this); |
| 48 connection->AddService(&tracing_); | 44 connection->AddService(&tracing_); |
| 49 return true; | 45 return true; |
| 50 } | 46 } |
| 51 | 47 |
| 52 // Overridden from InterfaceFactory<ContentHandler> | 48 // Overridden from InterfaceFactory<ContentHandler> |
| 53 virtual void Create(mojo::ApplicationConnection* connection, | 49 virtual void Create(mojo::ApplicationConnection* connection, |
| 54 mojo::InterfaceRequest<mojo::ContentHandler> request) over
ride { | 50 mojo::InterfaceRequest<mojo::ContentHandler> request) over
ride { |
| 55 mojo::BindToRequest( | 51 mojo::BindToRequest(new ContentHandlerImpl(), &request); |
| 56 new ContentHandlerImpl(compositor_thread_.message_loop_proxy()), | |
| 57 &request); | |
| 58 } | 52 } |
| 59 | 53 |
| 60 scoped_ptr<PlatformImpl> platform_impl_; | 54 scoped_ptr<PlatformImpl> platform_impl_; |
| 61 base::Thread compositor_thread_; | |
| 62 | |
| 63 TracingFactory tracing_; | 55 TracingFactory tracing_; |
| 64 | 56 |
| 65 DISALLOW_COPY_AND_ASSIGN(Viewer); | 57 DISALLOW_COPY_AND_ASSIGN(Viewer); |
| 66 }; | 58 }; |
| 67 | 59 |
| 68 } // namespace mojo | 60 } // namespace mojo |
| 69 | 61 |
| 70 MojoResult MojoMain(MojoHandle shell_handle) { | 62 MojoResult MojoMain(MojoHandle shell_handle) { |
| 71 mojo::ApplicationRunnerChromium runner(new sky::Viewer); | 63 mojo::ApplicationRunnerChromium runner(new sky::Viewer); |
| 72 return runner.Run(shell_handle); | 64 return runner.Run(shell_handle); |
| 73 } | 65 } |
| OLD | NEW |