rename 'inject-js' to 'inject-js-start'; add 'inject-js-end'

rogerwang · rogerwang · commit 9dd1ba67c718 · 2014-02-21T13:41:47.000+08:00
See nwjs#1372
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -253,8 +253,10 @@ void DispatcherHost::OnCreateShell(const std::string& url,
                                           new_renderer ? NULL : base_web_contents->GetSiteInstance());
 
   std::string filename;
-  if (new_manifest->GetString(switches::kmInjectJS, &filename))
-    create_params.nw_inject_js_fn = filename;
+  if (new_manifest->GetString(switches::kmInjectJSDocStart, &filename))
+    create_params.nw_inject_js_doc_start = filename;
+  if (new_manifest->GetString(switches::kmInjectJSDocEnd, &filename))
+    create_params.nw_inject_js_doc_end = filename;
   if (new_manifest->GetString(switches::kmInjectCSS, &filename))
     create_params.nw_inject_css_fn = filename;
 
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -98,7 +98,8 @@ const char kmUserAgent[] = "user-agent";
 const char kmRemotePages[] = "node-remote";
 
 const char kmNewInstance[] = "new-instance";
-const char kmInjectJS[]  = "inject-js";
+const char kmInjectJSDocStart[]  = "inject-js-start";
+const char kmInjectJSDocEnd[]  = "inject-js-end";
 const char kmInjectCSS[] = "inject-css";
 
 #if defined(OS_WIN)
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -56,7 +56,8 @@ extern const char kmPageCache[];
 extern const char kmUserAgent[];
 extern const char kmRemotePages[];
 extern const char kmNewInstance[];
-extern const char kmInjectJS[];
+extern const char kmInjectJSDocStart[];
+extern const char kmInjectJSDocEnd[];
 extern const char kmInjectCSS[];
 
 #if defined(OS_WIN)
diff --git a/src/renderer/nw_render_view_observer.cc b/src/renderer/nw_render_view_observer.cc
@@ -80,11 +80,25 @@ void NwRenderViewObserver::OnCaptureSnapshot() {
   Send(new NwViewHostMsg_Snapshot(routing_id(), snapshot));
 }
 
+void NwRenderViewObserver::DidFinishDocumentLoad(WebKit::WebFrame* frame) {
+  RenderViewImpl* rv = RenderViewImpl::FromWebView(frame->view());
+  if (!rv)
+    return;
+  std::string js_fn = rv->renderer_preferences_.nw_inject_js_doc_end;
+  OnDocumentCallback(rv, js_fn, frame);
+}
+
 void NwRenderViewObserver::DidCreateDocumentElement(WebKit::WebFrame* frame) {
   RenderViewImpl* rv = RenderViewImpl::FromWebView(frame->view());
   if (!rv)
     return;
-  std::string js_fn = rv->renderer_preferences_.nw_inject_js_fn;
+  std::string js_fn = rv->renderer_preferences_.nw_inject_js_doc_start;
+  OnDocumentCallback(rv, js_fn, frame);
+}
+
+void NwRenderViewObserver::OnDocumentCallback(RenderViewImpl* rv,
+                                              const std::string& js_fn,
+                                              WebKit::WebFrame* frame) {
   if (js_fn.empty())
     return;
   std::string content;
diff --git a/src/renderer/nw_render_view_observer.h b/src/renderer/nw_render_view_observer.h
@@ -25,6 +25,10 @@
 
 class SkBitmap;
 
+namespace content {
+class RenderViewImpl;
+}
+
 namespace WebKit {
 class WebView;
 }
@@ -39,6 +43,7 @@ class NwRenderViewObserver : public content::RenderViewObserver {
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidCreateDocumentElement(WebKit::WebFrame* frame) OVERRIDE;
+  virtual void DidFinishDocumentLoad(WebKit::WebFrame* frame) OVERRIDE;
 
  private:
 
@@ -48,6 +53,10 @@ class NwRenderViewObserver : public content::RenderViewObserver {
   // to get a snapshot of a tab using chrome.tabs.captureVisibleTab().
   bool CaptureSnapshot(WebKit::WebView* view, SkBitmap* snapshot);
 
+  void OnDocumentCallback(content::RenderViewImpl* rv,
+                          const std::string& js_fn,
+                          WebKit::WebFrame* frame);
+
   DISALLOW_COPY_AND_ASSIGN(NwRenderViewObserver);
 };
 
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -133,9 +133,10 @@ WebContentsViewPort* ShellContentBrowserClient::OverrideCreateWebContentsView(
   if (package->root()->GetString(switches::kmRemotePages, &rules))
       prefs->nw_remote_page_rules = rules;
 
-  prefs->nw_app_root_path = package->path();
-  prefs->nw_inject_css_fn = params.nw_inject_css_fn;
-  prefs->nw_inject_js_fn  = params.nw_inject_js_fn;
+  prefs->nw_app_root_path        = package->path();
+  prefs->nw_inject_css_fn        = params.nw_inject_css_fn;
+  prefs->nw_inject_js_doc_start  = params.nw_inject_js_doc_start;
+  prefs->nw_inject_js_doc_end    = params.nw_inject_js_doc_end;
   return NULL;
 }
 
