Fix previous commit

rogerwang · rogerwang · commit 64c064e09fda · 2014-02-25T13:18:49.000+08:00
Conflicts:

	src/api/window_bindings.cc
diff --git a/src/api/window_bindings.cc b/src/api/window_bindings.cc
@@ -120,7 +120,11 @@ WindowBindings::CallObjectMethod(const v8::FunctionCallbackInfo<v8::Value>& args
       WebCore::HTMLIFrameElement* iframe = WebCore::V8HTMLIFrameElement::toNative(frm);
       web_frame = WebKit::WebFrameImpl::fromFrame(iframe->contentFrame());
     }
+#if defined(OS_WIN)
+    base::string16 jscript((WCHAR*)*v8::String::Value(args[3]));
+#else
     base::string16 jscript = *v8::String::Value(args[3]);
+#endif
     if (web_frame) {
       result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript));
     }
diff --git a/src/renderer/nw_render_view_observer.cc b/src/renderer/nw_render_view_observer.cc
@@ -102,7 +102,7 @@ void NwRenderViewObserver::OnDocumentCallback(RenderViewImpl* rv,
   if (js_fn.empty())
     return;
   std::string content;
-  base::FilePath path = rv->renderer_preferences_.nw_app_root_path.Append(js_fn);
+  base::FilePath path = rv->renderer_preferences_.nw_app_root_path.AppendASCII(js_fn);
   if (!file_util::ReadFileToString(path, &content)) {
     LOG(WARNING) << "Failed to load js script file: " << path.value();
     return;

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,11 @@ WindowBindings::CallObjectMethod(const v8::FunctionCallbackInfo<v8::Value>& args`
`120`	`120`	`WebCore::HTMLIFrameElement* iframe = WebCore::V8HTMLIFrameElement::toNative(frm);`
`121`	`121`	`web_frame = WebKit::WebFrameImpl::fromFrame(iframe->contentFrame());`
`122`	`122`	`}`
	`123`	`+#if defined(OS_WIN)`
	`124`	`+ base::string16 jscript((WCHAR)v8::String::Value(args[3]));`
	`125`	`+#else`
`123`	`126`	`base::string16 jscript = *v8::String::Value(args[3]);`
	`127`	`+#endif`
`124`	`128`	`if (web_frame) {`
`125`	`129`	`result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript));`
`126`	`130`	`}`