Reader Mode triggers after tab crash

components/dom_distiller/content/browser/distillability_driver.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/dom_distiller/content/browser/distillability_driver.h"
 
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ skipping 22 matching lines @@
 
  private:
   mojo::StrongBinding<DistillabilityService> binding_;
   DistillabilityDriver* distillability_driver_;
 };
 
 DistillabilityDriver::DistillabilityDriver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       weak_factory_(this) {
-  if (!web_contents) return;
-  web_contents->GetMainFrame()->GetServiceRegistry()->AddService(
-      base::Bind(&DistillabilityDriver::CreateDistillabilityService,
-          weak_factory_.GetWeakPtr()));
+  SetupMojoService();
 }
 
 DistillabilityDriver::~DistillabilityDriver() {
-  CleanUp();
+  web_contents()->GetMainFrame()->GetServiceRegistry()

[wychen, 2016/04/15 06:22:21]

Would web_cotents() always be nullptr here? If the life cycle is the same as
webcontents, maybe we don't have to remove service. We could register at
DidStartProvisionalLoad() and remove at OnDistillability is_last==true, but
seems like overkill.

[mdjones, 2016/04/15 21:04:09]

Done.

+      ->RemoveService<DistillabilityService>();
+  content::WebContentsObserver::Observe(nullptr);
 }
 
 void DistillabilityDriver::CreateDistillabilityService(
     mojo::InterfaceRequest<DistillabilityService> request) {
   new DistillabilityServiceImpl(std::move(request), this);
 }
 
 void DistillabilityDriver::SetDelegate(
     const base::Callback<void(bool, bool)>& delegate) {
   m_delegate_ = delegate;
 }
 
 void DistillabilityDriver::OnDistillability(
     bool distillable, bool is_last) {
   if (m_delegate_.is_null()) return;
 
   m_delegate_.Run(distillable, is_last);
 }
 
-void DistillabilityDriver::RenderProcessGone(
-    base::TerminationStatus status) {
-  CleanUp();
+void DistillabilityDriver::DidNavigateMainFrame(
+    const content::LoadCommittedDetails& details,
+    const content::FrameNavigateParams& params) {
+  if (details.is_in_page) return;
+  SetupMojoService();
 }
 
-void DistillabilityDriver::CleanUp() {
-  web_contents()->GetMainFrame()->GetServiceRegistry()
-      ->RemoveService<DistillabilityService>();
-  content::WebContentsObserver::Observe(NULL);
+void DistillabilityDriver::SetupMojoService() {
+  web_contents()->GetMainFrame()->GetServiceRegistry()->AddService(
+      base::Bind(&DistillabilityDriver::CreateDistillabilityService,
+          weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace dom_distiller