support nwsnapshot

rogerwang · rogerwang · commit c5eda607b6d1 · 2015-02-26T14:15:36.000+08:00
diff --git a/nw.gypi b/nw.gypi
@@ -102,6 +102,7 @@
       ],
       'include_dirs': [
         '<(DEPTH)',
+        '<(DEPTH)/v8',
         '<(DEPTH)/third_party',
         '<(DEPTH)/third_party/WebKit/Source',
         '<(DEPTH)/third_party/WebKit/public/web',
@@ -206,6 +207,7 @@
         'src/api/screen/screen.cc',
         'src/api/window_bindings.cc',
         'src/api/window_bindings.h',
+        'src/api/v8_internal_helper.cc',
         'src/api/menu/menu.cc',
         'src/api/menu/menu.h',
         'src/api/menu/menu_delegate.cc',
@@ -866,7 +868,7 @@
             {
               'action_name': 'strip_nw_binaries',
               'inputs': [
-                #'<(PRODUCT_DIR)/nwsnapshot',
+                '<(PRODUCT_DIR)/nwsnapshot',
                 '<(PRODUCT_DIR)/chromedriver',
               ],
               'outputs': [
@@ -878,7 +880,7 @@
             },
           ],
           'dependencies': [
-             #'<(DEPTH)/v8/tools/gyp/v8.gyp:nwsnapshot',
+             '<(DEPTH)/v8/tools/gyp/v8.gyp:nwsnapshot',
              '<(DEPTH)/chrome/chrome.gyp:chromedriver',
           ],
         }],
diff --git a/src/api/v8_internal_helper.cc b/src/api/v8_internal_helper.cc
@@ -0,0 +1,13 @@
+#include "v8/src/v8.h"
+
+using namespace v8;
+
+
+void FixSourceNWBin(Isolate* v8_isolate, Handle<UnboundScript> script) {
+  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
+  i::Handle<i::HeapObject> obj =
+    i::Handle<i::HeapObject>::cast(v8::Utils::OpenHandle(*script));
+  i::Handle<i::SharedFunctionInfo>
+      function_info(i::SharedFunctionInfo::cast(*obj), obj->GetIsolate());
+  reinterpret_cast<i::Script*>(function_info->script())->set_source(isolate->heap()->undefined_value());
+}
diff --git a/src/api/window_bindings.cc b/src/api/window_bindings.cc
@@ -27,6 +27,7 @@
 #include "content/nw/src/api/dispatcher.h"
 #include "content/renderer/render_view_impl.h"
 #include "grit/nw_resources.h"
+
 #undef LOG
 using namespace blink;
 #if defined(OS_WIN)
@@ -55,6 +56,8 @@ using namespace blink;
 #undef CHECK
 #include "V8HTMLIFrameElement.h"
 
+extern void FixSourceNWBin(v8::Isolate* v8_isolate, v8::Handle<v8::UnboundScript> script);
+
 using blink::WebScriptSource;
 using blink::WebFrame;
 //using blink::InstrumentingAgents;
@@ -117,6 +120,8 @@ WindowBindings::AllocateId(const v8::FunctionCallbackInfo<v8::Value>& args) {
 void
 WindowBindings::CallObjectMethod(const v8::FunctionCallbackInfo<v8::Value>& args) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
+  v8::EscapableHandleScope scope(isolate);
+
   v8::Local<v8::Object> self = args[0]->ToObject();
   int routing_id = self->Get(v8::String::NewFromUtf8(isolate, "routing_id"))->Int32Value();
   int object_id = self->Get(v8::String::NewFromUtf8(isolate, "id"))->Int32Value();
@@ -153,6 +158,43 @@ WindowBindings::CallObjectMethod(const v8::FunctionCallbackInfo<v8::Value>& args
     }
     args.GetReturnValue().Set(result);
     return;
+  } else if (method == "EvaluateNWBin") {
+    base::FilePath path(*v8::String::Utf8Value(args[3]));
+    base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+    if (file.IsValid()) {
+      int64 length = file.GetLength();
+      if (length > 0 && length < INT_MAX) {
+        int size = static_cast<int>(length);
+        std::vector<unsigned char> raw_data;
+        raw_data.resize(size);
+        uint8_t* data = reinterpret_cast<uint8_t*>(&(raw_data.front()));
+        if (file.ReadAtCurrentPos((char*)data, size) == length) {
+          v8::Handle<v8::String> source_string = v8::String::NewFromUtf8(isolate, "");
+          v8::ScriptCompiler::CachedData* cache;
+          cache = new v8::ScriptCompiler::CachedData(
+                                                     data, length, v8::ScriptCompiler::CachedData::BufferNotOwned);
+          v8::ScriptCompiler::Source source(source_string, cache);
+          v8::Local<v8::UnboundScript> script;
+          script = v8::ScriptCompiler::CompileUnbound(
+                                                      isolate, &source, v8::ScriptCompiler::kConsumeCodeCache);
+          ASSERT(!cache->rejected);
+          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{
+            blink::HTMLIFrameElement* iframe = blink::V8HTMLIFrameElement::toImpl(frm);
+            web_frame = blink::WebFrame::fromFrame(iframe->contentFrame());
+          }
+          v8::Context::Scope cscope (web_frame->mainWorldScriptContext());
+          FixSourceNWBin(isolate, script);
+          result = script->BindToCurrentContext()->Run();
+          args.GetReturnValue().Set(result);
+        }
+      }
+    }
+    return;
   } else if (method == "setDevToolsJail") {
     v8::Handle<v8::Object> frm = v8::Handle<v8::Object>::Cast(args[2]);
     if (frm->IsNull()) {
diff --git a/src/api/window_bindings.js b/src/api/window_bindings.js
@@ -509,6 +509,10 @@ Window.prototype.eval = function(frame, script) {
   return CallObjectMethod(this, 'EvaluateScript', frame, script);
 };
 
+Window.prototype.evalNWBin = function(frame, script) {
+  return CallObjectMethod(this, 'EvaluateNWBin', frame, script);
+};
+
 Window.prototype.disableCache = function(flag) {
   return CallObjectMethod(this, 'setCacheDisabled', flag);
 };
diff --git a/tools/package_binaries.py b/tools/package_binaries.py
@@ -118,7 +118,7 @@ def generate_target_nw(platform_name, arch, version):
                            'credits.html',
                            'libffmpegsumo.so',
                            'nw.pak',
-#                           'nwsnapshot',
+                           'nwsnapshot',
                            'nw',
                            'icudtl.dat',
                            'locales',
@@ -134,13 +134,13 @@ def generate_target_nw(platform_name, arch, version):
                            'nw.exe',
                            'nw.pak',
                            'locales',
-#                           'nwsnapshot.exe',
+                           'nwsnapshot.exe',
                            'credits.html',
                            ]
     elif platform_name == 'osx':
         target['input'] = [
                            'nwjs.app',
-#                           'nwsnapshot',
+                           'nwsnapshot',
                            'credits.html',
                           ]
     else:
