| 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 "sky/engine/config.h" | 5 #include "sky/engine/config.h" |
| 6 #include "sky/engine/core/app/AbstractModule.h" | 6 #include "sky/engine/core/app/AbstractModule.h" |
| 7 | 7 |
| 8 #include "sky/engine/core/app/Module.h" | 8 #include "sky/engine/core/app/Module.h" |
| 9 | 9 |
| 10 namespace blink { | 10 namespace blink { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 OwnPtr<ModuleLoader> loader = | 34 OwnPtr<ModuleLoader> loader = |
| 35 adoptPtr(new ModuleLoader(this, GetApplication(), url)); | 35 adoptPtr(new ModuleLoader(this, GetApplication(), url)); |
| 36 loaders_.set(loader.release(), resolver); | 36 loaders_.set(loader.release(), resolver); |
| 37 return resolver->promise(); | 37 return resolver->promise(); |
| 38 } | 38 } |
| 39 | 39 |
| 40 void AbstractModule::OnModuleLoadComplete(ModuleLoader* loader, | 40 void AbstractModule::OnModuleLoadComplete(ModuleLoader* loader, |
| 41 Module* module) { | 41 Module* module) { |
| 42 RefPtr<ScriptPromiseResolver> resolver = loaders_.take(loader); | 42 RefPtr<ScriptPromiseResolver> resolver = loaders_.take(loader); |
| 43 ScriptState::Scope scope(resolver->scriptState()); | 43 ScriptState::Scope scope(resolver->scriptState()); |
| 44 resolver->resolve(module->exports().v8Value()); | 44 resolver->resolve(module->exports(resolver->scriptState()).v8Value()); |
| 45 } | 45 } |
| 46 | 46 |
| 47 } // namespace blink | 47 } // namespace blink |
| OLD | NEW |