Chromium Code Reviews| Index: gin/modules/module_registry.cc |
| diff --git a/gin/modules/module_registry.cc b/gin/modules/module_registry.cc |
| index a92a5461af1a20910415b32111118ce73e9a136c..8341337829d18dc3b08d72a052cc5b345b233b8f 100644 |
| --- a/gin/modules/module_registry.cc |
| +++ b/gin/modules/module_registry.cc |
| @@ -168,6 +168,12 @@ void ModuleRegistry::LoadModule(Isolate* isolate, |
| return; |
| } |
| waiting_callbacks_.insert(std::make_pair(id, callback)); |
| + |
| + for (size_t i = 0; i < pending_modules_.size(); ++i) { |
| + if (pending_modules_[i]->id == id) |
| + return; |
| + } |
|
abarth-chromium
2014/11/24 23:47:24
I think we copy gin from Chromium. We probably ne
hansmuller
2014/11/25 00:31:54
I'll coordinate with the person who's rolling Mojo
|
| + |
| unsatisfied_dependencies_.insert(id); |
| } |