From: Cheng Zhao Date: Fri, 10 Jan 2014 08:29:38 +0000 (+0800) Subject: :lipstick: get_uv_env() => uv_env(). X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3747048218bd73223ce6ef74366d2c154cad2133;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git :lipstick: get_uv_env() => uv_env(). --- diff --git a/common/node_bindings.cc b/common/node_bindings.cc index 247ca07..e36ba9b 100644 --- a/common/node_bindings.cc +++ b/common/node_bindings.cc @@ -199,7 +199,7 @@ void NodeBindings::UvRunOnce() { // Enter node context while dealing with uv events, by default the global // env would be used unless user specified another one (this happens for // renderer process, which wraps the uv loop with web page context). - node::Environment* env = get_uv_env() ? get_uv_env() : global_env; + node::Environment* env = uv_env() ? uv_env() : global_env; v8::Context::Scope context_scope(env->context()); // Deal with uv events. diff --git a/common/node_bindings.h b/common/node_bindings.h index 7370495..7f61ed4 100644 --- a/common/node_bindings.h +++ b/common/node_bindings.h @@ -40,7 +40,7 @@ class NodeBindings { // Gets/sets the environment to wrap uv loop. void set_uv_env(node::Environment* env) { uv_env_ = env; } - node::Environment* get_uv_env() const { return uv_env_; } + node::Environment* uv_env() const { return uv_env_; } protected: explicit NodeBindings(bool is_browser); diff --git a/renderer/atom_renderer_client.cc b/renderer/atom_renderer_client.cc index 770a449..176ca28 100644 --- a/renderer/atom_renderer_client.cc +++ b/renderer/atom_renderer_client.cc @@ -62,7 +62,7 @@ void AtomRendererClient::DidCreateScriptContext(WebKit::WebFrame* frame, web_page_envs_.push_back(env); // Make uv loop being wrapped by window context. - if (node_bindings_->get_uv_env() == NULL) + if (node_bindings_->uv_env() == NULL) node_bindings_->set_uv_env(env); } @@ -91,7 +91,7 @@ void AtomRendererClient::WillReleaseScriptContext( // env->Dispose(); // Wrap the uv loop with another environment. - if (env == node_bindings_->get_uv_env()) { + if (env == node_bindings_->uv_env()) { node::Environment* env = web_page_envs_.size() > 0 ? web_page_envs_[0] : NULL; node_bindings_->set_uv_env(env);