Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: sky/engine/core/app/AbstractModule.cpp

Issue 872043003: module.exports should default to an empty object. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sky/engine/bindings/templates/attributes.cpp ('k') | sky/engine/core/app/Module.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « sky/engine/bindings/templates/attributes.cpp ('k') | sky/engine/core/app/Module.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698