Merge lp:~abreu-alexandre/oxide/prevent-race-webcontents-unloads into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Prevents deadlocking the ui process during the wait for unloads phase as the browser process is exiting. The issue happens quite reliably using AP tests that basically kill the whole process group and the renderers. The RVH Close() "loop" is being triggered but the flow can fail to properly complete w/ a CloseContents() in which case the UI process deadlocks.

Prevents deadlocking the ui process during the wait for unloads phase as the browser process is exiting. The issue happens quite reliably using AP tests that basically kill the whole process group and the renderers. The RVH Close() "loop" is being triggered but the flow can fail to properly complete w/ a CloseContents() in which case the UI process deadlocks.

[lp:~abreu-alexandre/oxide/prevent-race-webcontents-unloads]

1063. By Chris Coulson on 2015-05-06

Bump Chromium rev to 44.0.2391.0

[Chris Coulson (chrisccoulson)]

Thanks, I've added some comments inline

review: Needs Fixing

[lp:~abreu-alexandre/oxide/prevent-race-webcontents-unloads]

1064. By Olivier Tilloy on 2015-05-11

Add a WebView::webProcessStatus property to notify embedders when the renderer process crashed or was killed.

1065. By Chris Coulson on 2015-05-11

Add WebView.mediaAccessPermissionRequested API

1066. By Chris Coulson on 2015-05-11

Make comments more accurate

1067. By Alexandre Abreu on 2015-05-12

Merge trunk

1068. By Alexandre Abreu on 2015-05-12

Prevent unloads race when the renderer process is killed before the closecontents is called

1069. By Alexandre Abreu on 2015-05-12

clutter

1070. By Alexandre Abreu on 2015-05-12

fix build

[Alexandre Abreu (abreu-alexandre)]

updated

[Chris Coulson (chrisccoulson)]

I've added a comment inline (there's a double-free in this)

review: Needs Fixing

[lp:~abreu-alexandre/oxide/prevent-race-webcontents-unloads]

1071. By Alexandre Abreu on 2015-05-12

fix double free

[Alexandre Abreu (abreu-alexandre)]

Updated

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'shared/browser/media/oxide_media_web_contents_observer.h'
--- shared/browser/media/oxide_media_web_contents_observer.h	2015-01-19 22:49:05 +0000
+++ shared/browser/media/oxide_media_web_contents_observer.h	2015-05-12 22:48:25 +0000
@@ -32,7 +32,7 @@
       content::RenderFrameHost* render_frame_host);
 
  private:
-  typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager>
+  typedef base::ScopedPtrHashMap<uintptr_t, scoped_ptr<BrowserMediaPlayerManager>>
       MediaPlayerManagerMap;
   MediaPlayerManagerMap media_player_managers_;
 

=== modified file 'shared/browser/oxide_web_contents_unloader.cc'
--- shared/browser/oxide_web_contents_unloader.cc	2015-05-05 17:06:48 +0000
+++ shared/browser/oxide_web_contents_unloader.cc	2015-05-12 22:48:25 +0000
@@ -23,7 +23,27 @@
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/supports_user_data.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_observer.h"
+
+class WebContentsUnloaderObserver : public content::WebContentsObserver,
+                                    public base::SupportsUserData::Data {
+public:
+  explicit WebContentsUnloaderObserver(
+          content::WebContents* contents)
+      : content::WebContentsObserver(contents) {}
+  virtual ~WebContentsUnloaderObserver() {}
+
+  void RenderProcessGone(base::TerminationStatus status) override {
+    web_contents()->GetDelegate()->CloseContents(web_contents());
+  }
+};
+
+namespace {
+const char kWebContentsUnloaderObserverKey[] = "oxide_web_contents_unloader_observer_data";
+}
+
 
 namespace oxide {
 
@@ -63,6 +83,9 @@
   }
 
   content::WebContents* c = contents.get();
+  c->SetUserData(
+      kWebContentsUnloaderObserverKey,
+      new WebContentsUnloaderObserver(c));
 
   // So we can intercept CloseContents
   contents->SetDelegate(this);