Merge pull request #504 from brave/fix/tabs-discard-dead-tab

Fix/tabs discard dead tab
brave · Feb 22, 2018 · e173a2d · e173a2d
1 parent f4191b1
commit e173a2d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 12 deletions.
diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
@@ -66,6 +66,7 @@
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_impl.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
@@ -808,7 +809,7 @@ void WebContents::AddNewContents(content::WebContents* source,
   if (was_blocked)
     *was_blocked = blocked;
 
-  if (blocked) {
+  if (was_blocked && *was_blocked) {
     auto guest = brave::TabViewGuest::FromWebContents(new_contents);
     if (guest) {
       guest->Destroy(true);
@@ -862,8 +863,9 @@ void WebContents::IsPlaceholder(mate::Arguments* args) {
   auto tab_helper = extensions::TabHelper::FromWebContents(web_contents());
   if (tab_helper) {
     args->Return(tab_helper->is_placeholder());
+  } else {
+    args->Return(false);
   }
-  args->Return(false);
 }
 
 void WebContents::AttachGuest(mate::Arguments* args) {
@@ -1219,6 +1221,23 @@ void WebContents::TabSelectionChanged(TabStripModel* tab_strip_model,
   Emit("tab-selection-changed");
 }
 
+void WebContents::TabReplacedAt(TabStripModel* tab_strip_model,
+                                content::WebContents* old_contents,
+                                content::WebContents* new_contents,
+                                int index) {
+  if (old_contents == web_contents()) {
+    ::Browser* browser = nullptr;
+    for (auto* b : *BrowserList::GetInstance()) {
+      if (b->tab_strip_model() == tab_strip_model) {
+        browser = b;
+        break;
+      }
+    }
+
+    Emit("tab-replaced-at",
+        browser->session_id().id(), index, new_contents);
+  }
+}
 
 bool WebContents::OnGoToEntryOffset(int offset) {
   GoToOffset(offset);

diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
@@ -361,6 +361,10 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void TabStripEmpty() override;
   void TabSelectionChanged(TabStripModel* tab_strip_model,
                            const ui::ListSelectionModel& old_model) override;
+  void TabReplacedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* old_contents,
+                     content::WebContents* new_contents,
+                     int index) override;
 
   // content::WebContentsDelegate:
   void RegisterProtocolHandler(content::WebContents* web_contents,

diff --git a/atom/browser/extensions/tab_helper.cc b/atom/browser/extensions/tab_helper.cc
@@ -382,11 +382,11 @@ void TabHelper::SetActive(bool active) {
 }
 
 void TabHelper::WasShown() {
-  if (discarded_) {
+  auto helper = content::RestoreHelper::FromWebContents(web_contents());
+  if (helper) {
     // load the tab if it is shown without being activate (tab preview)
     discarded_ = false;
     SetAutoDiscardable(true);
-    auto helper = content::RestoreHelper::FromWebContents(web_contents());
     if (helper) {
       helper->RemoveRestoreHelper();
     }
@@ -470,11 +470,7 @@ void TabHelper::SetAutoDiscardable(bool auto_discardable) {
 }
 
 bool TabHelper::Discard() {
-  if (guest()->attached()) {
-    int64_t web_contents_id = TabManager::IdFromWebContents(web_contents());
-    return !!GetTabManager()->DiscardTabById(
-        web_contents_id, resource_coordinator::DiscardReason::kProactive);
-  } else {
+  if (web_contents()->GetController().IsInitialNavigation()) {
     discarded_ = true;
     content::RestoreHelper::CreateForWebContents(web_contents());
     auto helper = content::RestoreHelper::FromWebContents(web_contents());
@@ -483,6 +479,12 @@ bool TabHelper::Discard() {
     // registered as a discarded tab
     SetAutoDiscardable(false);
     return true;
+  } else {
+    if (guest()->attached()) {
+      int64_t web_contents_id = TabManager::IdFromWebContents(web_contents());
+      return !!GetTabManager()->DiscardTabById(
+          web_contents_id, resource_coordinator::DiscardReason::kProactive);
+    }
   }
 }
 

diff --git a/atom/common/api/resources/web_view_api_bindings.js b/atom/common/api/resources/web_view_api_bindings.js
@@ -99,9 +99,7 @@ WebViewImpl.prototype.attachWindow$ = function (opt_guestInstanceId) {
 
 WebViewImpl.prototype.detachGuest = function () {
   if (this.guest.getState() === GuestViewImpl.GuestState.GUEST_STATE_ATTACHED) {
-    this.guest.detach(() => {
-      this.guest = new GuestView('webview')
-    })
+    this.guest.detach()
   }
 }
 

diff --git a/brave/browser/guest_view/tab_view/tab_view_guest.cc b/brave/browser/guest_view/tab_view/tab_view_guest.cc
@@ -318,6 +318,11 @@ void TabViewGuest::ApplyAttributes(const base::DictionaryValue& params) {
 
       if (attached() &&
           web_contents()->GetController().IsInitialNavigation()) {
+        // don't reload if we're already loading
+        if (web_contents()->GetController().GetPendingEntry() &&
+            web_contents()->GetController().GetPendingEntry()->GetURL() == src_) {
+          return;
+        }
         NavigateGuest(src_.spec(), true);
       }
     }