| 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 "mojo/runner/in_process_native_runner.h" | 5 #include "mojo/runner/in_process_native_runner.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
| 11 #include "base/threading/platform_thread.h" | 11 #include "base/threading/platform_thread.h" |
| 12 #include "mojo/runner/native_application_support.h" | 12 #include "mojo/runner/native_application_support.h" |
| 13 | 13 |
| 14 namespace mojo { | 14 namespace mojo { |
| 15 namespace shell { | 15 namespace runner { |
| 16 | 16 |
| 17 InProcessNativeRunner::InProcessNativeRunner(Context* context) | 17 InProcessNativeRunner::InProcessNativeRunner(Context* context) |
| 18 : cleanup_(NativeApplicationCleanup::DONT_DELETE), app_library_(nullptr) { | 18 : cleanup_(shell::NativeApplicationCleanup::DONT_DELETE), |
| 19 app_library_(nullptr) { |
| 19 } | 20 } |
| 20 | 21 |
| 21 InProcessNativeRunner::~InProcessNativeRunner() { | 22 InProcessNativeRunner::~InProcessNativeRunner() { |
| 22 // It is important to let the thread exit before unloading the DSO (when | 23 // It is important to let the thread exit before unloading the DSO (when |
| 23 // app_library_ is destructed), because the library may have registered | 24 // app_library_ is destructed), because the library may have registered |
| 24 // thread-local data and destructors to run on thread termination. | 25 // thread-local data and destructors to run on thread termination. |
| 25 if (thread_) { | 26 if (thread_) { |
| 26 DCHECK(thread_->HasBeenStarted()); | 27 DCHECK(thread_->HasBeenStarted()); |
| 27 DCHECK(!thread_->HasBeenJoined()); | 28 DCHECK(!thread_->HasBeenJoined()); |
| 28 thread_->Join(); | 29 thread_->Join(); |
| 29 } | 30 } |
| 30 } | 31 } |
| 31 | 32 |
| 32 void InProcessNativeRunner::Start( | 33 void InProcessNativeRunner::Start( |
| 33 const base::FilePath& app_path, | 34 const base::FilePath& app_path, |
| 34 NativeApplicationCleanup cleanup, | 35 shell::NativeApplicationCleanup cleanup, |
| 35 InterfaceRequest<Application> application_request, | 36 InterfaceRequest<Application> application_request, |
| 36 const base::Closure& app_completed_callback) { | 37 const base::Closure& app_completed_callback) { |
| 37 app_path_ = app_path; | 38 app_path_ = app_path; |
| 38 cleanup_ = cleanup; | 39 cleanup_ = cleanup; |
| 39 | 40 |
| 40 DCHECK(!application_request_.is_pending()); | 41 DCHECK(!application_request_.is_pending()); |
| 41 application_request_ = application_request.Pass(); | 42 application_request_ = application_request.Pass(); |
| 42 | 43 |
| 43 DCHECK(app_completed_callback_runner_.is_null()); | 44 DCHECK(app_completed_callback_runner_.is_null()); |
| 44 app_completed_callback_runner_ = | 45 app_completed_callback_runner_ = |
| (...skipping 11 matching lines...) Expand all Loading... |
| 56 << " thread id=" << base::PlatformThread::CurrentId(); | 57 << " thread id=" << base::PlatformThread::CurrentId(); |
| 57 | 58 |
| 58 // TODO(vtl): ScopedNativeLibrary doesn't have a .get() method! | 59 // TODO(vtl): ScopedNativeLibrary doesn't have a .get() method! |
| 59 base::NativeLibrary app_library = LoadNativeApplication(app_path_, cleanup_); | 60 base::NativeLibrary app_library = LoadNativeApplication(app_path_, cleanup_); |
| 60 app_library_.Reset(app_library); | 61 app_library_.Reset(app_library); |
| 61 RunNativeApplication(app_library, application_request_.Pass()); | 62 RunNativeApplication(app_library, application_request_.Pass()); |
| 62 app_completed_callback_runner_.Run(); | 63 app_completed_callback_runner_.Run(); |
| 63 app_completed_callback_runner_.Reset(); | 64 app_completed_callback_runner_.Reset(); |
| 64 } | 65 } |
| 65 | 66 |
| 66 scoped_ptr<NativeRunner> InProcessNativeRunnerFactory::Create( | 67 scoped_ptr<shell::NativeRunner> InProcessNativeRunnerFactory::Create( |
| 67 const Options& options) { | 68 const Options& options) { |
| 68 return make_scoped_ptr(new InProcessNativeRunner(context_)); | 69 return make_scoped_ptr(new InProcessNativeRunner(context_)); |
| 69 } | 70 } |
| 70 | 71 |
| 71 } // namespace shell | 72 } // namespace runner |
| 72 } // namespace mojo | 73 } // namespace mojo |
| OLD | NEW |