Expand all Wikipedia sections on distillation.

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"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/favicon/ios/web_favicon_driver.h"
 #include "components/google/core/browser/google_util.h"
 #include "ios/chrome/browser/reading_list/favicon_web_state_dispatcher_impl.h"
 #import "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/ssl_status.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
 #import "ios/web/public/web_state/web_state.h"
@@ skipping 13 matching lines @@
     "  var link = document.evaluate('//link[@rel=\"amphtml\"]',"
     "                               document,"
     "                               null,"
     "                               XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,"
     "                               null ).snapshotItem(0);"
     "  if (link !== null) {"
     "    return link.getAttribute('href');"
     "  }"
     "  return document.getElementsByTagName('iframe')[0].src;"
     "})()";
+
+const char* kWikipediaWorkaround =
+    "(() => {"
+    "  var s = document.createElement('style');"
+    "  s.innerHTML='.client-js .collapsible-block { display: block }';"
+    "  document.head.appendChild(s);"
+    "})()";
 }  // namespace
 
 namespace reading_list {
 
 ReadingListDistillerPageDelegate::ReadingListDistillerPageDelegate() {}
 ReadingListDistillerPageDelegate::~ReadingListDistillerPageDelegate() {}
 
 ReadingListDistillerPage::ReadingListDistillerPage(
     web::BrowserState* browser_state,
     FaviconWebStateDispatcher* web_state_dispatcher,
@@ skipping 116 matching lines @@
 
 void ReadingListDistillerPage::DelayedOnLoadURLDone(int delayed_task_id) {
   if (!CurrentWebState() || delayed_task_id != delayed_task_id_) {
     // Something interrupted the distillation.
     // Abort here.
     return;
   }
   if (IsGoogleCachedAMPPage()) {
     // Workaround for Google AMP pages.
     HandleGoogleCachedAMPPage();
-  } else {
-    ContinuePageDistillation();
+    return;
   }
+  if (IsWikipediaPage()) {
+    // Workaround for Wikipedia pages.
+    // TODO(crbug.com/647667): remove workaround once DOM distiller handle this
+    // case.
+    HandleWikipediaPage();
+    return;
+  }
+  ContinuePageDistillation();
 }
 
 void ReadingListDistillerPage::ContinuePageDistillation() {
   // 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_) {
     delegate_->DistilledPageRedirectedToURL(original_url_, redirected_url);
   }
-  DistillerPageIOS::OnLoadURLDone(web::PageLoadCompletionStatus::SUCCESS);
+
+  [CurrentWebState()->GetJSInjectionReceiver()
+      executeJavaScript:@(kWikipediaWorkaround)
+      completionHandler:^(id response, id error) {
+        DistillerPageIOS::OnLoadURLDone(web::PageLoadCompletionStatus::SUCCESS);
+      }];

[noyau (Ping after 24h), 2017/03/03 21:52:52]

This is leftover from the initial hack you forgot to remove right?

[Olivier, 2017/03/04 09:26:23]

Done.

 }
 
 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();
   if (!url.is_valid() || !url.SchemeIs(url::kHttpsScheme)) {
     return false;
   }
@@ skipping 48 matching lines @@
   GURL new_gurl = net::GURLWithNSURL(new_url);
   if (!new_gurl.is_valid()) {
     return false;
   }
   FetchFavicon(new_gurl);
   web::NavigationManager::WebLoadParams params(new_gurl);
   CurrentWebState()->GetNavigationManager()->LoadURLWithParams(params);
   return true;
 }
 
+bool ReadingListDistillerPage::IsWikipediaPage() {
+  // All wikipedia pages are in the form "https://xxx.wikipedia.org/..."

[noyau (Ping after 24h), 2017/03/03 21:52:52]

In the cases that interest us [countrycode].m.wikipedia.org is probably more
accurate. No need to trigger on desktop pages. Note that there is no issue on
iPad, despite going to the same URL.

[Olivier, 2017/03/04 09:26:23]

Done.

+  const GURL& url = CurrentWebState()->GetLastCommittedURL();
+  if (!url.is_valid() || !url.SchemeIs(url::kHttpsScheme)) {
+    return false;
+  }
+  return (base::EndsWith(url.host(), ".wikipedia.org",
+                         base::CompareCase::SENSITIVE));
+}
+
+void ReadingListDistillerPage::HandleWikipediaPage() {
+  base::WeakPtr<ReadingListDistillerPage> weak_this =
+      weak_ptr_factory_.GetWeakPtr();
+  [CurrentWebState()->GetJSInjectionReceiver()
+      executeJavaScript:@(kWikipediaWorkaround)
+      completionHandler:^(id result, NSError* error) {
+        if (weak_this) {
+          weak_this->ContinuePageDistillation();
+        }
+      }];
+}
+
 }  // namespace reading_list