Test distillability without JavaScript

chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

 // 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.
 
 package org.chromium.chrome.browser.dom_distiller;
 
 import android.app.Activity;
 import android.content.Context;
 import android.text.TextUtils;
 
@@ skipping 63 matching lines @@
     /**
      * Whether the page is an article or not.
      */
     private int mReaderModeStatus = NOT_POSSIBLE;
 
     /**
      * Whether the fact that the current web page was distillable or not has been recorded.
      */
     private boolean mIsUmaRecorded;
 
+    private boolean mIsCallbackSet;
+
     private WebContentsObserver mWebContentsObserver;
 
     private final Tab mTab;
 
     private final ReaderModePanel mReaderModePanel;
 
     private final ObserverList<ReaderModeManagerObserver> mObservers;
 
     private final int mHeaderBackgroundColor;
 
     public ReaderModeManager(Tab tab, Context context) {
         mTab = tab;
         mTab.addObserver(this);
         mObservers = new ObserverList<ReaderModeManagerObserver>();
         mReaderModePanel = isEnabled(context) ? new ReaderModePanel(this) : null;
         mHeaderBackgroundColor = context != null
                 ? ApiCompatibilityUtils.getColor(
                         context.getResources(), R.color.reader_mode_header_bg)
                 : 0;
+        mIsCallbackSet = false;
     }
 
     /**
      * Adds an observer to be notified about changes to the reader mode status.
      */
     public void addObserver(ReaderModeManagerObserver observer) {
         mObservers.addObserver(observer);
     }
 
     /**
@@ skipping 127 matching lines @@
         return mReaderModePanel;
     }
 
     private ReaderModeActivityDelegate getReaderModeActivityDelegate() {
         return mTab.getReaderModeActivityDelegate();
     }
 
     private WebContentsObserver createWebContentsObserver(WebContents webContents) {
         return new WebContentsObserver(webContents) {
             @Override
-            public void didFinishLoad(long frameId, String validatedUrl, boolean isMainFrame) {
-                if (!isMainFrame) return;
-                if (DomDistillerUrlUtils.isDistilledPage(mTab.getUrl())) return;
-                updateStatusBasedOnReaderModeCriteria(true);
-            }
-
-            @Override
-            public void didFailLoad(boolean isProvisionalLoad, boolean isMainFrame, int errorCode,
-                        String description, String failingUrl, boolean wasIgnoredByHandler) {
-                if (!isMainFrame) return;
-                if (DomDistillerUrlUtils.isDistilledPage(mTab.getUrl())) return;
-                updateStatusBasedOnReaderModeCriteria(true);
-            }
-
-            @Override
             public void didStartProvisionalLoadForFrame(long frameId, long parentFrameId,
                     boolean isMainFrame, String validatedUrl, boolean isErrorPage,
                     boolean isIframeSrcdoc) {
                 if (!isMainFrame) return;
                 if (DomDistillerUrlUtils.isDistilledPage(validatedUrl)) {
                     mReaderModeStatus = STARTED;
                     sendReaderModeStatusChangedNotification();
                     mReaderModePageUrl = validatedUrl;
                 }
             }
 
             @Override
             public void didNavigateMainFrame(String url, String baseUrl,
                     boolean isNavigationToDifferentPage, boolean isNavigationInPage,
                     int statusCode) {
                 // TODO(cjhopman): This should possibly ignore navigations that replace the entry
                 // (like those from history.replaceState()).
                 if (isNavigationInPage) return;
                 if (DomDistillerUrlUtils.isDistilledPage(url)) return;
 
                 mReaderModeStatus = POSSIBLE;
                 if (!TextUtils.equals(url,
                         DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(
                                 mReaderModePageUrl))) {
                     mReaderModeStatus = NOT_POSSIBLE;
                     mIsUmaRecorded = false;
-                    // Do not call updateStatusBasedOnReaderModeCriteria here.
-                    // For ADABOOST_MODEL, it is unlikely to get valid info at this event.
+                    if (!mIsCallbackSet) setDistillabilityCallback();
                 }
                 mReaderModePageUrl = null;
                 sendReaderModeStatusChangedNotification();
             }
         };
     }
 
-    // Updates reader mode status based on whether or not the page should be viewed in reader mode.
-    private void updateStatusBasedOnReaderModeCriteria(final boolean forceRecord) {
+    // Set the callback for updating reader mode status based on whether or not the page should
+    // be viewed in reader mode.
+    private void setDistillabilityCallback() {
         if (mTab.getWebContents() == null) return;
         if (mTab.getContentViewCore() == null) return;
 
-        DistillablePageUtils.isPageDistillable(mTab.getWebContents(),
-                mTab.getContentViewCore().getIsMobileOptimizedHint(),
+        DistillablePageUtils.setCallback(mTab.getWebContents(),
                 new DistillablePageUtils.PageDistillableCallback() {
                     @Override
-                    public void onIsPageDistillableResult(boolean isDistillable) {
+                    public void onIsPageDistillableResult(boolean isDistillable, boolean isLast) {
                         if (isDistillable) {
                             mReaderModeStatus = POSSIBLE;
                         } else {
                             mReaderModeStatus = NOT_POSSIBLE;
                         }
-                        if (!mIsUmaRecorded && (mReaderModeStatus == POSSIBLE || forceRecord)) {
+                        if (!mIsUmaRecorded && (mReaderModeStatus == POSSIBLE || isLast)) {
                             mIsUmaRecorded = true;
                             RecordHistogram.recordBooleanHistogram(
                                     "DomDistiller.PageDistillable", mReaderModeStatus == POSSIBLE);
                         }
                         sendReaderModeStatusChangedNotification();
                     }
                 });
+        mIsCallbackSet = true;
     }
 
     private void sendReaderModeStatusChangedNotification() {
         for (ReaderModeManagerObserver observer : mObservers) {
             observer.onReaderModeStatusChanged(mReaderModeStatus);
         }
         if (mReaderModePanel != null) mReaderModePanel.updateBottomButtonBar();
     }
 
     private ContextualSearchManager getContextualSearchManager(Tab tab) {
@@ skipping 11 matching lines @@
         if (context == null) return false;
 
         boolean enabled = CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_DOM_DISTILLER)
                 && !CommandLine.getInstance().hasSwitch(
                         ChromeSwitches.DISABLE_READER_MODE_BOTTOM_BAR)
                 && !DeviceFormFactor.isTablet(context)
                 && DomDistillerTabUtils.isDistillerHeuristicsEnabled();
         return enabled;
     }
 }