| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "gin/public/isolate_holder.h" | 6 #include "gin/public/isolate_holder.h" |
| 7 #include "mojo/apps/js/mojo_runner_delegate.h" | 7 #include "mojo/apps/js/mojo_runner_delegate.h" |
| 8 #include "mojo/public/cpp/gles2/gles2.h" | |
| 9 #include "mojo/public/cpp/system/core.h" | 8 #include "mojo/public/cpp/system/core.h" |
| 10 #include "mojo/public/cpp/system/macros.h" | 9 #include "mojo/public/cpp/system/macros.h" |
| 11 | 10 |
| 12 #if defined(WIN32) | 11 #if defined(WIN32) |
| 13 #if !defined(CDECL) | 12 #if !defined(CDECL) |
| 14 #define CDECL __cdecl | 13 #define CDECL __cdecl |
| 15 #endif | 14 #endif |
| 16 #define MOJO_APPS_JS_EXPORT __declspec(dllexport) | 15 #define MOJO_APPS_JS_EXPORT __declspec(dllexport) |
| 17 #else | 16 #else |
| 18 #define CDECL | 17 #define CDECL |
| (...skipping 11 matching lines...) Expand all Loading... |
| 30 gin::ShellRunner runner(&delegate, instance.isolate()); | 29 gin::ShellRunner runner(&delegate, instance.isolate()); |
| 31 delegate.Start(&runner, pipe, module); | 30 delegate.Start(&runner, pipe, module); |
| 32 | 31 |
| 33 base::MessageLoop::current()->Run(); | 32 base::MessageLoop::current()->Run(); |
| 34 } | 33 } |
| 35 | 34 |
| 36 } // namespace apps | 35 } // namespace apps |
| 37 } // namespace mojo | 36 } // namespace mojo |
| 38 | 37 |
| 39 extern "C" MOJO_APPS_JS_EXPORT MojoResult CDECL MojoMain(MojoHandle pipe) { | 38 extern "C" MOJO_APPS_JS_EXPORT MojoResult CDECL MojoMain(MojoHandle pipe) { |
| 40 mojo::GLES2Initializer gles2; | |
| 41 mojo::apps::Start(pipe, "mojo/apps/js/main"); | 39 mojo::apps::Start(pipe, "mojo/apps/js/main"); |
| 42 return MOJO_RESULT_OK; | 40 return MOJO_RESULT_OK; |
| 43 } | 41 } |
| OLD | NEW |