Disable pinning process for dev reload

rogerwang · rogerwang · commit fc2ea436a6b2 · 2012-12-27T13:49:21.000+08:00
Fix nwjs#294. And previous process pinning commit a6493b3 breaks dev reload
diff --git a/src/api/window/window.cc b/src/api/window/window.cc
@@ -39,6 +39,10 @@ Window::Window(int id,
 }
 
 Window::~Window() {
+  // Window object got deleted when we launch new render view host and
+  // delete the old one; at this time the Shell should be decoupled
+  // with the renderer side
+  shell_->set_id(-1);
 }
 
 void Window::Call(const std::string& method,
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -48,6 +48,7 @@
 #include "content/nw/src/common/shell_switches.h"
 #include "content/nw/src/media/media_stream_devices_controller.h"
 #include "content/nw/src/nw_package.h"
+#include "content/nw/src/shell_browser_context.h"
 #include "content/nw/src/shell_browser_main_parts.h"
 #include "content/nw/src/shell_content_browser_client.h"
 #include "grit/nw_resources.h"
@@ -208,6 +209,9 @@ void Shell::GoBackOrForward(int offset) {
 }
 
 void Shell::Reload(ReloadType type) {
+  ShellBrowserContext* browser_context =
+      static_cast<ShellBrowserContext*>(web_contents_->GetBrowserContext());
+
   switch (type) {
     case RELOAD:
       web_contents_->GetController().Reload(false);
@@ -219,7 +223,11 @@ void Shell::Reload(ReloadType type) {
       web_contents_->GetController().ReloadOriginalRequestURL(false);
       break;
     case RELOAD_DEV:
+      // ShellContentBrowserClient always tries to use the existing
+      // process so we need to overwrite it here
+      browser_context->set_pending_devreload(true);
       web_contents_->GetController().ReloadDev(false);
+      browser_context->set_pending_devreload(false);
       break;
   }
 
diff --git a/src/shell_browser_context.cc b/src/shell_browser_context.cc
@@ -44,8 +44,9 @@ namespace content {
 
 ShellBrowserContext::ShellBrowserContext(bool off_the_record,
                                          nw::Package* package)
-    : off_the_record_(off_the_record),
-      package_(package) {
+  : is_pending_devreload_(false),
+    off_the_record_(off_the_record),
+    package_(package) {
   InitWhileIOAllowed();
 }
 
diff --git a/src/shell_browser_context.h b/src/shell_browser_context.h
@@ -52,11 +52,14 @@ class ShellBrowserContext : public BrowserContext {
       GetSpeechRecognitionPreferences() OVERRIDE;
   virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
 
+  bool pending_devreload() { return is_pending_devreload_; }
+  void set_pending_devreload(bool val) { is_pending_devreload_ = val; }
  private:
   // Performs initialization of the ShellBrowserContext while IO is still
   // allowed on the current thread.
   void InitWhileIOAllowed();
 
+  bool is_pending_devreload_;  // whether dev reload is in process
   bool off_the_record_;
   nw::Package* package_;
   ScopedTempDir testing_path_;
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -179,7 +179,12 @@ void ShellContentBrowserClient::OverrideWebkitPrefs(
 
 bool ShellContentBrowserClient::ShouldTryToUseExistingProcessHost(
       BrowserContext* browser_context, const GURL& url) {
-  return true;
+  ShellBrowserContext* shell_browser_context =
+    static_cast<ShellBrowserContext*>(browser_context);
+  if (shell_browser_context->pending_devreload())
+    return false;
+  else
+    return true;
 }
 
 bool ShellContentBrowserClient::IsSuitableHost(RenderProcessHost* process_host,

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ Window::Window(int id,`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`Window::~Window() {`
	`42`	`+ // Window object got deleted when we launch new render view host and`
	`43`	`+ // delete the old one; at this time the Shell should be decoupled`
	`44`	`+ // with the renderer side`
	`45`	`+ shell_->set_id(-1);`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`void Window::Call(const std::string& method,`