Use entered context only for static call

rogerwang · rogerwang · commit 74f3f7360667 · 2013-10-21T08:35:52.000+08:00
Fix a1d382d
diff --git a/src/api/bindings_common.cc b/src/api/bindings_common.cc
@@ -36,8 +36,8 @@ using content::V8ValueConverter;
 using WebKit::WebFrame;
 using WebKit::WebView;
 
-RenderView* GetCurrentRenderView() {
-  v8::Local<v8::Context> ctx = v8::Context::GetEntered();
+namespace {
+RenderView* GetRenderView(v8::Handle<v8::Context> ctx) {
   WebFrame* frame = WebFrame::frameForContext(ctx);
   if (!frame)
     return NULL;
@@ -50,6 +50,18 @@ RenderView* GetCurrentRenderView() {
   return render_view;
 }
 
+}
+
+RenderView* GetCurrentRenderView() {
+  v8::Local<v8::Context> ctx = v8::Context::GetCurrent();
+  return GetRenderView(ctx);
+}
+
+RenderView* GetEnteredRenderView() {
+  v8::Local<v8::Context> ctx = v8::Context::GetEntered();
+  return GetRenderView(ctx);
+}
+
 base::StringPiece GetStringResource(int resource_id) {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
 }
diff --git a/src/api/bindings_common.h b/src/api/bindings_common.h
@@ -30,6 +30,7 @@ class RenderView;
 
 // Get RenderView from current js context (only works under window context).
 content::RenderView* GetCurrentRenderView();
+content::RenderView* GetEnteredRenderView();
 
 // Get string from resource_id.
 base::StringPiece GetStringResource(int resource_id);
diff --git a/src/api/dispatcher_bindings.cc b/src/api/dispatcher_bindings.cc
@@ -408,7 +408,7 @@ void DispatcherBindings::CallStaticMethodSync(
 
   scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
 
-  RenderView* render_view = GetCurrentRenderView();
+  RenderView* render_view = GetEnteredRenderView();
   if (!render_view) {
     args.GetReturnValue().Set(v8::ThrowException(v8::Exception::Error(v8::String::New(
                                      "Unable to get render view in CallStaticMethodSync"))));
