backport fix

rogerwang · rogerwang · commit b153be5f6ffa · 2014-02-21T16:06:40.000+08:00
diff --git a/src/api/dispatcher.cc b/src/api/dispatcher.cc
@@ -35,7 +35,7 @@
 #undef LOG
 #undef ASSERT
 #include "third_party/WebKit/Source/config.h"
-#include "third_party/WebKit/Source/core/frame/Frame.h"
+#include "third_party/WebKit/Source/core/page/Frame.h"
 #include "third_party/WebKit/Source/web/WebFrameImpl.h"
 #include "V8HTMLElement.h"
 
@@ -165,7 +165,7 @@ void Dispatcher::documentCallback(const char* ev, WebKit::WebFrame* frame) {
 
   v8::Local<v8::Array> args = v8::Array::New();
   v8::Handle<v8::Value> element = v8::Null();
-  WebCore::Frame* core_frame = WebKit::toWebFrameImpl(frame)->frame();
+  WebCore::Frame* core_frame = static_cast<WebKit::WebFrameImpl*>(frame)->frame();
   if (core_frame->ownerElement()) {
     element = WebCore::toV8((WebCore::HTMLElement*)core_frame->ownerElement(),
                             frame->mainWorldScriptContext()->Global(),
@@ -202,7 +202,7 @@ void Dispatcher::willHandleNavigationPolicy(
   v8::Handle<v8::Value> element = v8::Null();
   v8::Handle<v8::Object> policy_obj = v8::Object::New();
 
-  WebCore::Frame* core_frame = WebKit::toWebFrameImpl(frame)->frame();
+  WebCore::Frame* core_frame = static_cast<WebKit::WebFrameImpl*>(frame)->frame();
   if (core_frame->ownerElement()) {
     element = WebCore::toV8((WebCore::HTMLElement*)core_frame->ownerElement(),
                             frame->mainWorldScriptContext()->Global(),
diff --git a/src/net/app_protocol_handler.cc b/src/net/app_protocol_handler.cc
@@ -103,11 +103,7 @@ class URLRequestNWAppJob : public net::URLRequestFileJob {
                          const base::FilePath& file_path,
                          const std::string& content_security_policy,
                          bool send_cors_header)
-    : net::URLRequestFileJob(
-          request, network_delegate, base::FilePath(),
-          content::BrowserThread::GetBlockingPool()->
-              GetTaskRunnerWithShutdownBehavior(
-                  base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)),
+    : net::URLRequestFileJob(request, network_delegate, base::FilePath()),
       content_security_policy_(content_security_policy),
       send_cors_header_(send_cors_header),
       weak_factory_(this) {
diff --git a/src/renderer/nw_render_view_observer.cc b/src/renderer/nw_render_view_observer.cc
@@ -103,7 +103,7 @@ void NwRenderViewObserver::OnDocumentCallback(RenderViewImpl* rv,
     return;
   std::string content;
   base::FilePath path = rv->renderer_preferences_.nw_app_root_path.Append(js_fn);
-  if (!base::ReadFileToString(path, &content)) {
+  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
`@@ -103,7 +103,7 @@ void NwRenderViewObserver::OnDocumentCallback(RenderViewImpl* rv,`
`103`	`103`	`return;`
`104`	`104`	`std::string content;`
`105`	`105`	`base::FilePath path = rv->renderer_preferences_.nw_app_root_path.Append(js_fn);`
`106`		`- if (!base::ReadFileToString(path, &content)) {`
	`106`	`+ if (!file_util::ReadFileToString(path, &content)) {`
`107`	`107`	`LOG(WARNING) << "Failed to load js script file: " << path.value();`
`108`	`108`	`return;`
`109`	`109`	`}`