Add support for not owning distilled WebContents

chrome/browser/dom_distiller/tab_utils.cc

 // Copyright 2014 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 "chrome/browser/dom_distiller/tab_utils.h"
 
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
@@ skipping 92 matching lines @@
 // Start loading the viewer URL of the current page in |web_contents|.
 void StartNavigationToDistillerViewer(content::WebContents* web_contents,
                                       const GURL& url) {
   GURL viewer_url = dom_distiller::url_utils::GetDistillerViewUrlFromUrl(
       dom_distiller::kDomDistillerScheme, url);
   content::NavigationController::LoadURLParams params(viewer_url);
   params.transition_type = ui::PAGE_TRANSITION_AUTO_BOOKMARK;
   web_contents->GetController().LoadURLWithParams(params);
 }
 
-void MaybeStartDistillation(content::WebContents* web_contents) {
+void MaybeStartDistillation(content::WebContents* web_contents, bool owned) {
   const GURL& last_committed_url = web_contents->GetLastCommittedURL();
   if (!dom_distiller::url_utils::IsUrlDistillable(last_committed_url)) {
-    delete web_contents;
+    if (owned)
+      delete web_contents;
     return;
   }
 
   // Start distillation using |web_contents|, and ensure ViewerHandle stays
   // around until the viewer requests distillation.
   SelfDeletingRequestDelegate* view_request_delegate =
       new SelfDeletingRequestDelegate(web_contents);
-  scoped_ptr<content::WebContents> old_web_contents_sptr(web_contents);
   scoped_ptr<SourcePageHandleWebContents> source_page_handle(
-      new SourcePageHandleWebContents(old_web_contents_sptr.Pass()));
+      new SourcePageHandleWebContents(web_contents, owned));

[cjhopman, 2015/05/12 21:18:42]

If you wrap this in the sourcepagehandle at the beginning of the function, you
don't need the explicit delete in the early return.

Or maybe, this function could just take a scoped_ptr<SPHWC> and then it doesn't
ever care about owned vs unowned

[nyquist, 2015/05/13 00:06:52]

Done.

   DomDistillerService* dom_distiller_service =
       DomDistillerServiceFactory::GetForBrowserContext(
           web_contents->GetBrowserContext());
   scoped_ptr<DistillerPage> distiller_page =
       dom_distiller_service->CreateDefaultDistillerPageWithHandle(
                                  source_page_handle.Pass()).Pass();
 
   scoped_ptr<ViewerHandle> viewer_handle = dom_distiller_service->ViewUrl(
       view_request_delegate, distiller_page.Pass(), last_committed_url);
   view_request_delegate->TakeViewerHandle(viewer_handle.Pass());
@@ skipping 17 matching lines @@
   // StartNavigationToDistillerViewer must come before swapping the tab contents
   // to avoid triggering a reload of the page.  This reloadmakes it very
   // difficult to distinguish between the intermediate reload and a user hitting
   // the back button.
   StartNavigationToDistillerViewer(new_web_contents,
                                    old_web_contents->GetLastCommittedURL());
 
   CoreTabHelper::FromWebContents(old_web_contents)->delegate()->SwapTabContents(
       old_web_contents, new_web_contents, false, false);
 
-  MaybeStartDistillation(old_web_contents);
+  MaybeStartDistillation(old_web_contents, true);
 }
+
+void DistillAndView(content::WebContents* source_web_contents,
+                    content::WebContents* destination_web_contents) {
+  DCHECK(source_web_contents);
+  DCHECK(destination_web_contents);
+
+  MaybeStartDistillation(source_web_contents, false);
+  StartNavigationToDistillerViewer(destination_web_contents,
+                                   source_web_contents->GetLastCommittedURL());
+}