diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-27 18:24:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-28 02:26:02 +0000 |
| commit | e486004502c17ab80953ef324926a536b8030d1e (patch) | |
| tree | 9f51129a18a65823dfa8242491756a0697ea274a /gin/modules | |
| parent | 03b487d118b5b1c0e5651a889cc56b443ba1d526 (diff) | |
| download | chromium_src-e486004502c17ab80953ef324926a536b8030d1e.zip chromium_src-e486004502c17ab80953ef324926a536b8030d1e.tar.gz chromium_src-e486004502c17ab80953ef324926a536b8030d1e.tar.bz2 | |
Global conversion of Pass()→std::move() on OS==linux
❆(੭ु ◜◡‾)੭ु⁾☃❆
BUG=557422
R=avi@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1550693002
Cr-Commit-Position: refs/heads/master@{#366956}
Diffstat (limited to 'gin/modules')
| -rw-r--r-- | gin/modules/module_registry.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gin/modules/module_registry.cc b/gin/modules/module_registry.cc index 10d5464..deec187 100644 --- a/gin/modules/module_registry.cc +++ b/gin/modules/module_registry.cc @@ -6,8 +6,8 @@ #include <stddef.h> #include <stdint.h> - #include <string> +#include <utility> #include <vector> #include "base/logging.h" @@ -83,7 +83,7 @@ void Define(const v8::FunctionCallbackInfo<Value>& info) { ModuleRegistry* registry = ModuleRegistry::From(args.isolate()->GetCurrentContext()); - registry->AddPendingModule(args.isolate(), pending.Pass()); + registry->AddPendingModule(args.isolate(), std::move(pending)); } WrapperInfo g_wrapper_info = { kEmbedderNativeGin }; @@ -161,7 +161,7 @@ void ModuleRegistry::AddPendingModule(Isolate* isolate, scoped_ptr<PendingModule> pending) { const std::string pending_id = pending->id; const std::vector<std::string> pending_dependencies = pending->dependencies; - AttemptToLoad(isolate, pending.Pass()); + AttemptToLoad(isolate, std::move(pending)); FOR_EACH_OBSERVER(ModuleRegistryObserver, observer_list_, OnDidAddPendingModule(pending_id, pending_dependencies)); } @@ -258,7 +258,7 @@ bool ModuleRegistry::AttemptToLoad(Isolate* isolate, pending_modules_.push_back(pending.release()); return false; } - return Load(isolate, pending.Pass()); + return Load(isolate, std::move(pending)); } v8::Local<v8::Value> ModuleRegistry::GetModule(v8::Isolate* isolate, @@ -278,7 +278,7 @@ void ModuleRegistry::AttemptToLoadMoreModules(Isolate* isolate) { for (size_t i = 0; i < pending_modules.size(); ++i) { scoped_ptr<PendingModule> pending(pending_modules[i]); pending_modules[i] = NULL; - if (AttemptToLoad(isolate, pending.Pass())) + if (AttemptToLoad(isolate, std::move(pending))) keep_trying = true; } } |