Window.eval() implementation

rogerwang · rogerwang · commit 08094e48bb4d · 2014-02-21T13:37:19.000+08:00
Conflicts:
	src/api/window_bindings.cc
diff --git a/src/api/window_bindings.cc b/src/api/window_bindings.cc
@@ -33,7 +33,13 @@ using namespace WebCore;
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/Source/web/WebFrameImpl.h"
+#include "third_party/WebKit/public/web/WebScriptSource.h"
 
+#undef CHECK
+#include "V8HTMLIFrameElement.h"
+
+using WebKit::WebScriptSource;
+using WebKit::WebFrame;
 
 namespace nwapi {
 
@@ -103,8 +109,24 @@ WindowBindings::CallObjectMethod(const v8::FunctionCallbackInfo<v8::Value>& args
     return;
   }
 
-  if (method == "setDevToolsJail") {
-    WebKit::WebFrame* main_frame = render_view->GetWebView()->mainFrame();
+  WebFrame* main_frame = render_view->GetWebView()->mainFrame();
+  if (method == "EvaluateScript") {
+    v8::Handle<v8::Value> result;
+    v8::Handle<v8::Object> frm = v8::Handle<v8::Object>::Cast(args[2]);
+    WebFrame* web_frame = NULL;
+    if (frm->IsNull()) {
+      web_frame = main_frame;
+    }else{
+      WebCore::HTMLIFrameElement* iframe = WebCore::V8HTMLIFrameElement::toNative(frm);
+      web_frame = WebKit::WebFrameImpl::fromFrame(iframe->contentFrame());
+    }
+    base::string16 jscript = *v8::String::Value(args[3]);
+    if (web_frame) {
+      result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript));
+    }
+    args.GetReturnValue().Set(result);
+    return;
+  } else if (method == "setDevToolsJail") {
     v8::Handle<v8::Object> frm = v8::Handle<v8::Object>::Cast(args[2]);
     if (frm->IsNull()) {
       main_frame->setDevtoolsJail(NULL);
diff --git a/src/api/window_bindings.js b/src/api/window_bindings.js
@@ -434,6 +434,10 @@ Window.prototype.capturePage = function(callback, image_format) {
   }
 
   CallObjectMethod(this, 'CapturePage', [image_format]);
-}
+};
+
+    Window.prototype.eval = function(frame, script) {
+        return CallObjectMethod(this, 'EvaluateScript', frame, script);
+    };
 
 }  // function Window.init
