Reading List iOS: Handle multiple pages.

ios/chrome/browser/reading_list/reading_list_distiller_page.mm

 // Copyright 2016 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 "ios/chrome/browser/reading_list/reading_list_distiller_page.h"
 
 #include "base/bind.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 37 matching lines @@
     "  document.head.appendChild(s);"
     "})()";
 }  // namespace
 
 namespace reading_list {
 
 ReadingListDistillerPageDelegate::ReadingListDistillerPageDelegate() {}
 ReadingListDistillerPageDelegate::~ReadingListDistillerPageDelegate() {}
 
 ReadingListDistillerPage::ReadingListDistillerPage(
+    const GURL& url,
     web::BrowserState* browser_state,
     FaviconWebStateDispatcher* web_state_dispatcher,
     ReadingListDistillerPageDelegate* delegate)
     : dom_distiller::DistillerPageIOS(browser_state),
+      original_url_(url),
       web_state_dispatcher_(web_state_dispatcher),
       delegate_(delegate),
       delayed_task_id_(0),
       weak_ptr_factory_(this) {
   DCHECK(delegate);
 }
 
 ReadingListDistillerPage::~ReadingListDistillerPage() {}
 
 void ReadingListDistillerPage::DistillPageImpl(const GURL& url,
                                                const std::string& script) {
   std::unique_ptr<web::WebState> old_web_state = DetachWebState();
   if (old_web_state) {
     web_state_dispatcher_->ReturnWebState(std::move(old_web_state));
   }
   std::unique_ptr<web::WebState> new_web_state =
       web_state_dispatcher_->RequestWebState();
   AttachWebState(std::move(new_web_state));
-  original_url_ = url;
+
   delayed_task_id_++;
+  distilling_main_page_ = url == original_url_;
   FetchFavicon(url);
 
   DistillerPageIOS::DistillPageImpl(url, script);
 
   // WKWebView sets the document.hidden property to true and the
   // document.visibilityState to prerender if the page is not added to a view
   // hierarchy. Some pages may not render their content in these conditions.
   // Add the view and move it out of the screen far in the top left corner of
   // the coordinate space.
   CGRect frame = [[[UIApplication sharedApplication] keyWindow] frame];
@@ skipping 54 matching lines @@
   }
   return true;
 }
 
 void ReadingListDistillerPage::OnLoadURLDone(
     web::PageLoadCompletionStatus load_completion_status) {
   if (!IsLoadingSuccess(load_completion_status)) {
     DistillerPageIOS::OnLoadURLDone(load_completion_status);
     return;
   }
-  delegate_->DistilledPageHasMimeType(original_url_,
-                                      CurrentWebState()->GetContentsMimeType());
+  if (distilling_main_page_) {
+    delegate_->DistilledPageHasMimeType(
+        original_url_, CurrentWebState()->GetContentsMimeType());
+  }
   if (!CurrentWebState()->ContentIsHTML()) {
     // If content is not HTML, distillation will fail immediatly.
     // Call the handler to make sure cleaning methods are called correctly.
     // There is no need to wait for rendering either.
     DistillerPageIOS::OnLoadURLDone(load_completion_status);
     return;
   }
   FetchFavicon(CurrentWebState()->GetVisibleURL());
 
   // Page is loaded but rendering may not be done yet. Give a delay to the page.
@@ skipping 30 matching lines @@
 void ReadingListDistillerPage::ContinuePageDistillation() {
   if (!CurrentWebState()) {
     // Something interrupted the distillation.
     // Abort here.
     return;
   }
   // The page is ready to be distilled.
   // If the visible URL is not the original URL, notify the caller that URL
   // changed.
   GURL redirected_url = CurrentWebState()->GetVisibleURL();
-  if (redirected_url != original_url_ && delegate_) {
+  if (redirected_url != original_url_ && delegate_ && distilling_main_page_) {
     delegate_->DistilledPageRedirectedToURL(original_url_, redirected_url);
   }
   DistillerPageIOS::OnLoadURLDone(web::PageLoadCompletionStatus::SUCCESS);
 }
 
 bool ReadingListDistillerPage::IsGoogleCachedAMPPage() {
   // All google AMP pages have URL in the form "https://google_domain/amp/..."
   // and a valid certificate.
   // This method checks that this is strictly the case.
   const GURL& url = CurrentWebState()->GetLastCommittedURL();
@@ skipping 74 matching lines @@
   [CurrentWebState()->GetJSInjectionReceiver()
       executeJavaScript:@(kWikipediaWorkaround)
       completionHandler:^(id result, NSError* error) {
         if (weak_this) {
           weak_this->ContinuePageDistillation();
         }
       }];
 }
 
 }  // namespace reading_list