runscript example & context support

rogerwang · rogerwang · commit ce5d41767f6b · 2011-12-14T13:57:42.000+08:00
diff --git a/src/context_wrap.cc b/src/context_wrap.cc
@@ -56,10 +56,16 @@ void ContextWrap::Initialize(Handle<Object> target) {
   NODE_SET_PROTOTYPE_METHOD(constructor_template,
                             "onContextCreationFromWebKit",
                             ContextWrap::OnContextCreationFromWebKit);
+  NODE_SET_PROTOTYPE_METHOD(constructor_template,
+                            "runScript",
+                            ContextWrap::RunScript);
 
   NODE_SET_METHOD(constructor_template,
 		  "onContextCreationFromWebKit",
 		  ContextWrap::OnContextCreationFromWebKit);
+  NODE_SET_METHOD(constructor_template,
+		  "runScript",
+		  ContextWrap::RunScript);
 
   target->Set(String::NewSymbol("Context"),
               constructor_template->GetFunction());
@@ -103,10 +109,6 @@ Persistent<Context> ContextWrap::GetV8Context() {
 Handle<Value> ContextWrap::OnContextCreationFromWebKit(const Arguments& args) {
   HandleScope scope;
 
-  if (args.Length() > 0) {
-    Local<Object> sandbox = args[0]->ToObject();
-  }
-
   ContextWrap* context_wrap = ObjectWrap::Unwrap<ContextWrap> (args.Holder());
   v8::Context* p = static_cast<v8::Context*>(args.Holder()->GetPointerFromInternalField (1));
   context_wrap->context_ = p;
@@ -115,4 +117,32 @@ Handle<Value> ContextWrap::OnContextCreationFromWebKit(const Arguments& args) {
   return v8::Undefined();
 }
 
+  Handle<Value> ContextWrap::RunScript(const Arguments& args) {
+    HandleScope scope;
+
+    ContextWrap* context_wrap = ObjectWrap::Unwrap<ContextWrap> (args.Holder());
+    if (!context_wrap->context_valid) {
+      return v8::Undefined();
+    }
+
+    TryCatch try_catch;
+    Local<String> code = args[0]->ToString();
+    context_wrap->context_->Enter();
+    Handle<Script> script = Script::Compile (code, String::New("nwebkit.<anonymous>"));
+    if (script.IsEmpty()) {
+      // FIXME UGLY HACK TO DISPLAY SYNTAX ERRORS.
+      node::DisplayExceptionLine(try_catch);
+
+      // Hack because I can't get a proper stacktrace on SyntaxError
+      return try_catch.ReThrow();
+    }
+    Handle<Value> result;
+    result = script->Run();
+    context_wrap->context_->Exit();
+    if (result.IsEmpty()) {
+      return try_catch.ReThrow();
+    }
+
+    return result == args.This() ? result : scope.Close (result);
+  }
 }
diff --git a/src/context_wrap.h b/src/context_wrap.h
@@ -13,7 +13,9 @@ class ContextWrap : node::ObjectWrap {
   static v8::Local<v8::Object> NewInstance();
   static bool InstanceOf(v8::Handle<v8::Value> value);
   static v8::Handle<v8::Value> OnContextCreationFromWebKit(const v8::Arguments& args);
- protected:
+  static v8::Handle<v8::Value> RunScript(const v8::Arguments& args);
+
+  protected:
 
   static v8::Persistent<v8::FunctionTemplate> constructor_template;
 
diff --git a/tests/runscript.js b/tests/runscript.js
@@ -0,0 +1,12 @@
+var nwebkit;
+nwebkit = require('../lib');
+
+
+nwebkit.init ({'url' : "tests/testfs.html", 'width' : 800, 'height' : 600});
+// nwebkit.init({'width' : 400, 'height' : 300});
+
+setTimeout (function() {
+ 		console.log("open()");
+		nwebkit.context.runScript("document.getElementById('output').innerHTML='changed'");
+ 	    }, 2000);
+
