--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -43,7 +43,6 @@
-
@@ -281,7 +280,6 @@
#endif
-
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -46,8 +46,6 @@
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
- ReaderMode: "resource://gre/modules/ReaderMode.jsm",
- ReaderParent: "resource:///modules/ReaderParent.jsm",
RecentWindow: "resource:///modules/RecentWindow.jsm",
SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
@@ -4753,7 +4751,6 @@
}
}
UpdateBackForwardCommands(gBrowser.webNavigation);
- ReaderParent.updateReaderButton(gBrowser.selectedBrowser);
if (!gMultiProcessBrowser) // Bug 1108553 - Cannot rotate images with e10s
gGestureSupport.restoreRotationState();
@@ -5122,8 +5119,8 @@
aRequest.originalURI &&
(aRequest.originalURI.schemeIs("chrome") ||
(aRequest.originalURI.schemeIs("about") &&
- aWebProgress.isTopLevel &&
- !aRequest.originalURI.spec.startsWith("about:reader")))) {
+ aWebProgress.isTopLevel
+ ))) {
return false;
}
@@ -5195,9 +5192,6 @@
// Filter out location changes caused by anchor navigation
// or history.push/pop/replaceState.
if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) {
- // Reader mode actually cares about these:
- let mm = gBrowser.selectedBrowser.messageManager;
- mm.sendAsyncMessage("Reader:PushState", {isArticle: gBrowser.selectedBrowser.isArticle});
return;
}
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -876,11 +876,6 @@
hidden="true"
tooltiptext="&pageReportIcon.tooltip;"
onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
-
{
- ReaderParent.toggleReaderMode({target: target.node});
- });
break;
}
--- a/browser/components/uitour/UITour-lib.js
+++ b/browser/components/uitour/UITour-lib.js
@@ -119,7 +119,6 @@
* pocket
* privateWindow
* quit
- * readerMode-urlBar
* screenshots
* search
* searchIcon
@@ -704,26 +703,6 @@
};
/**
- * @summary Force the reader mode icon to appear in the address bar regardless of whether
- * heuristics determine it's appropriate.
- *
- * @description This is useful if you want to target an annotation (panel/highlight) on it
- * but the tour page doesn't have much textual content.
- */
- Mozilla.UITour.forceShowReaderIcon = function() {
- _sendEvent("forceShowReaderIcon");
- };
-
- /**
- * Toggle into reader mode for the current tab. Once the user enters reader
- * mode, the UITour document will not be active and therefore cannot call other
- * UITour APIs.
- */
- Mozilla.UITour.toggleReaderMode = function() {
- _sendEvent("toggleReaderMode");
- };
-
- /**
* @param {String} pane - Pane to open/switch the preferences to.
* Valid values match fragments on about:preferences and are subject to change e.g.:
*
--- a/browser/components/uitour/test/browser_UITour_toggleReaderMode.js
+++ b/browser/components/uitour/test/browser_UITour_toggleReaderMode.js
@@ -1,16 +0,0 @@
-"use strict";
-
-var gTestTab;
-var gContentAPI;
-var gContentWindow;
-
-add_task(setup_UITourTest);
-
-add_UITour_task(async function() {
- ok(!gBrowser.selectedBrowser.currentURI.spec.startsWith("about:reader"),
- "Should not be in reader mode at start of test.");
- await gContentAPI.toggleReaderMode();
- await waitForConditionPromise(() => gBrowser.selectedBrowser.currentURI.spec.startsWith("about:reader"));
- ok(gBrowser.selectedBrowser.currentURI.spec.startsWith("about:reader"),
- "Should be in reader mode now.");
-});
--- a/browser/components/uitour/test/browser.ini
+++ b/browser/components/uitour/test/browser.ini
@@ -34,7 +34,6 @@
[browser_UITour_annotation_size_attributes.js]
[browser_UITour_defaultBrowser.js]
[browser_UITour_detach_tab.js]
-[browser_UITour_forceReaderMode.js]
[browser_UITour_modalDialog.js]
skip-if = os != "mac" # modal dialog disabling only working on OS X.
[browser_UITour_observe.js]
@@ -46,4 +45,3 @@
[browser_UITour_resetProfile.js]
[browser_UITour_showNewTab.js]
[browser_UITour_sync.js]
-[browser_UITour_toggleReaderMode.js]
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -31,7 +31,6 @@
browser_scrollPositions_sample.html
browser_scrollPositions_sample2.html
browser_scrollPositions_sample_frameset.html
- browser_scrollPositions_readerModeArticle.html
browser_sessionStorage.html
browser_speculative_connect.html
browser_248970_b_sample.html
@@ -111,7 +110,6 @@
[browser_restore_redirect.js]
[browser_restore_cookies_noOriginAttributes.js]
[browser_scrollPositions.js]
-[browser_scrollPositionsReaderMode.js]
[browser_sessionHistory.js]
support-files =
file_sessionHistory_hashchange.html
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -230,11 +230,6 @@
break;
}
}
- } else {
- let originalUrl = ReaderMode.getOriginalUrlObjectForDisplay(aValue);
- if (originalUrl) {
- returnValue = originalUrl.displaySpec;
- }
}
// Set the actiontype only if the user is not overriding actions.
@@ -947,26 +942,6 @@
]]>