diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 42a3da0f4c82..1d1efdc92e87 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -742,10 +742,6 @@ pref("layout.spellcheckDefault", 1);
pref("browser.send_pings", false);
-pref("browser.feeds.handler", "ask");
-pref("browser.videoFeeds.handler", "ask");
-pref("browser.audioFeeds.handler", "ask");
-
// At startup, if the handler service notices that the version number in the
// region.properties file is newer than the version number in the handler
// service datastore, it will add any new handlers it finds in the prefs (as
diff --git a/browser/base/content/browser-feeds.js b/browser/base/content/browser-feeds.js
deleted file mode 100644
index 5e4be6e79d1a..000000000000
--- a/browser/base/content/browser-feeds.js
+++ /dev/null
@@ -1,409 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-ChromeUtils.defineModuleGetter(this, "DeferredTask",
- "resource://gre/modules/DeferredTask.jsm");
-
-const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
-const TYPE_MAYBE_AUDIO_FEED = "application/vnd.mozilla.maybe.audio.feed";
-const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
-
-const PREF_SHOW_FIRST_RUN_UI = "browser.feeds.showFirstRunUI";
-
-const PREF_SELECTED_APP = "browser.feeds.handlers.application";
-const PREF_SELECTED_ACTION = "browser.feeds.handler";
-const PREF_SELECTED_READER = "browser.feeds.handler.default";
-
-const PREF_VIDEO_SELECTED_APP = "browser.videoFeeds.handlers.application";
-const PREF_VIDEO_SELECTED_ACTION = "browser.videoFeeds.handler";
-const PREF_VIDEO_SELECTED_READER = "browser.videoFeeds.handler.default";
-
-const PREF_AUDIO_SELECTED_APP = "browser.audioFeeds.handlers.application";
-const PREF_AUDIO_SELECTED_ACTION = "browser.audioFeeds.handler";
-const PREF_AUDIO_SELECTED_READER = "browser.audioFeeds.handler.default";
-
-const PREF_UPDATE_DELAY = 2000;
-
-const SETTABLE_PREFS = new Set([
- PREF_VIDEO_SELECTED_ACTION,
- PREF_AUDIO_SELECTED_ACTION,
- PREF_SELECTED_ACTION,
- PREF_VIDEO_SELECTED_READER,
- PREF_AUDIO_SELECTED_READER,
- PREF_SELECTED_READER,
-]);
-
-const EXECUTABLE_PREFS = new Set([
- PREF_SELECTED_APP,
- PREF_VIDEO_SELECTED_APP,
- PREF_AUDIO_SELECTED_APP,
-]);
-
-const VALID_ACTIONS = new Set(["ask", "reader", "bookmarks"]);
-const VALID_READERS = new Set(["client", "default", "bookmarks"]);
-
-XPCOMUtils.defineLazyPreferenceGetter(this, "SHOULD_LOG",
- "feeds.log", false);
-
-function LOG(str) {
- if (SHOULD_LOG)
- dump("*** Feeds: " + str + "\n");
-}
-
-function getPrefActionForType(t) {
- switch (t) {
- case Ci.nsIFeed.TYPE_VIDEO:
- return PREF_VIDEO_SELECTED_ACTION;
-
- case Ci.nsIFeed.TYPE_AUDIO:
- return PREF_AUDIO_SELECTED_ACTION;
-
- default:
- return PREF_SELECTED_ACTION;
- }
-}
-
-function getPrefReaderForType(t) {
- switch (t) {
- case Ci.nsIFeed.TYPE_VIDEO:
- return PREF_VIDEO_SELECTED_READER;
-
- case Ci.nsIFeed.TYPE_AUDIO:
- return PREF_AUDIO_SELECTED_READER;
-
- default:
- return PREF_SELECTED_READER;
- }
-}
-
-function getPrefAppForType(t) {
- switch (t) {
- case Ci.nsIFeed.TYPE_VIDEO:
- return PREF_VIDEO_SELECTED_APP;
-
- case Ci.nsIFeed.TYPE_AUDIO:
- return PREF_AUDIO_SELECTED_APP;
-
- default:
- return PREF_SELECTED_APP;
- }
-}
-
-/**
- * Maps a feed type to a maybe-feed mimetype.
- */
-function getMimeTypeForFeedType(aFeedType) {
- switch (aFeedType) {
- case Ci.nsIFeed.TYPE_VIDEO:
- return TYPE_MAYBE_VIDEO_FEED;
-
- case Ci.nsIFeed.TYPE_AUDIO:
- return TYPE_MAYBE_AUDIO_FEED;
-
- default:
- return TYPE_MAYBE_FEED;
- }
-}
-
-/**
- * The Feed Handler object manages discovery of RSS/ATOM feeds in web pages
- * and shows UI when they are discovered.
- */
-var FeedHandler = {
- _prefChangeCallback: null,
-
- /**
- * Get the human-readable display name of a file. This could be the
- * application name.
- * @param file
- * A nsIFile to look up the name of
- * @return The display name of the application represented by the file.
- */
- _getFileDisplayName(file) {
- switch (AppConstants.platform) {
- case "win":
- if (file instanceof Ci.nsILocalFileWin) {
- try {
- return file.getVersionInfoField("FileDescription");
- } catch (e) {}
- }
- break;
- case "macosx":
- if (file instanceof Ci.nsILocalFileMac) {
- try {
- return file.bundleDisplayName;
- } catch (e) {}
- }
- break;
- }
-
- return file.leafName;
- },
-
- _chooseClientApp(aTitle, aTypeName, aBrowser) {
- const prefName = getPrefAppForType(aTypeName);
- let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-
- fp.init(window, aTitle, Ci.nsIFilePicker.modeOpen);
- fp.appendFilters(Ci.nsIFilePicker.filterApps);
-
- fp.open((aResult) => {
- if (aResult == Ci.nsIFilePicker.returnOK) {
- let selectedApp = fp.file;
- if (selectedApp) {
- // XXXben - we need to compare this with the running instance
- // executable just don't know how to do that via script
- // XXXmano TBD: can probably add this to nsIShellService
- let appName = "";
- switch (AppConstants.platform) {
- case "win":
- appName = AppConstants.MOZ_APP_NAME + ".exe";
- break;
- case "macosx":
- appName = AppConstants.MOZ_MACBUNDLE_NAME;
- break;
- default:
- appName = AppConstants.MOZ_APP_NAME + "-bin";
- break;
- }
-
- if (fp.file.leafName != appName) {
- Services.prefs.setComplexValue(prefName, Ci.nsIFile, selectedApp);
- aBrowser.messageManager.sendAsyncMessage("FeedWriter:SetApplicationLauncherMenuItem",
- { name: this._getFileDisplayName(selectedApp),
- type: "SelectedAppMenuItem" });
- }
- }
- }
- });
-
- },
-
- executeClientApp(aSpec, aTitle, aSubtitle, aFeedHandler) {
- // aFeedHandler is either "default", indicating the system default reader, or a pref-name containing
- // an nsIFile pointing to the feed handler's executable.
-
- let clientApp = null;
- if (aFeedHandler == "default") {
- clientApp = Cc["@mozilla.org/browser/shell-service;1"]
- .getService(Ci.nsIShellService)
- .defaultFeedReader;
- } else {
- clientApp = Services.prefs.getComplexValue(aFeedHandler, Ci.nsIFile);
- }
-
- // For the benefit of applications that might know how to deal with more
- // URLs than just feeds, send feed: URLs in the following format:
- //
- // http urls: replace scheme with feed, e.g.
- // http://foo.com/index.rdf -> feed://foo.com/index.rdf
- // other urls: prepend feed: scheme, e.g.
- // https://foo.com/index.rdf -> feed:https://foo.com/index.rdf
- let feedURI = Services.io.newURI(aSpec);
- if (feedURI.schemeIs("http")) {
- feedURI = feedURI.mutate()
- .setScheme("feed")
- .finalize();
- aSpec = feedURI.spec;
- } else {
- aSpec = "feed:" + aSpec;
- }
-
- // Retrieving the shell service might fail on some systems, most
- // notably systems where GNOME is not installed.
- try {
- let ss = Cc["@mozilla.org/browser/shell-service;1"]
- .getService(Ci.nsIShellService);
- ss.openApplicationWithURI(clientApp, aSpec);
- } catch (e) {
- // If we couldn't use the shell service, fallback to using a
- // nsIProcess instance
- let p = Cc["@mozilla.org/process/util;1"]
- .createInstance(Ci.nsIProcess);
- p.init(clientApp);
- p.run(false, [aSpec], 1);
- }
- },
-
- // nsISupports
-
- QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
-
-
- init() {
- window.messageManager.addMessageListener("FeedWriter:ChooseClientApp", this);
- window.messageManager.addMessageListener("FeedWriter:GetSubscriptionUI", this);
- window.messageManager.addMessageListener("FeedWriter:SetFeedPrefsAndSubscribe", this);
- window.messageManager.addMessageListener("FeedWriter:ShownFirstRun", this);
-
- Services.ppmm.addMessageListener("FeedConverter:ExecuteClientApp", this);
-
- const prefs = Services.prefs;
- prefs.addObserver(PREF_SELECTED_ACTION, this, true);
- prefs.addObserver(PREF_SELECTED_READER, this, true);
- prefs.addObserver(PREF_VIDEO_SELECTED_ACTION, this, true);
- prefs.addObserver(PREF_VIDEO_SELECTED_READER, this, true);
- prefs.addObserver(PREF_AUDIO_SELECTED_ACTION, this, true);
- prefs.addObserver(PREF_AUDIO_SELECTED_READER, this, true);
- },
-
- uninit() {
- Services.ppmm.removeMessageListener("FeedConverter:ExecuteClientApp", this);
-
- this._prefChangeCallback = null;
- },
-
- // nsIObserver
- observe(subject, topic, data) {
- if (topic == "nsPref:changed") {
- LOG(`Pref changed ${data}`);
- if (this._prefChangeCallback) {
- this._prefChangeCallback.disarm();
- }
- // Multiple prefs are set at the same time, debounce to reduce noise
- // This can happen in one feed and we want to message all feed pages
- this._prefChangeCallback = new DeferredTask(() => {
- this._prefChanged(data);
- }, PREF_UPDATE_DELAY);
- this._prefChangeCallback.arm();
- }
- },
-
- _prefChanged(prefName) {
- // Don't observe for PREF_*SELECTED_APP as user likely just picked one
- // That is also handled by SetApplicationLauncherMenuItem call
- // Rather than the others which happen on subscription
- switch (prefName) {
- case PREF_SELECTED_READER:
- case PREF_VIDEO_SELECTED_READER:
- case PREF_AUDIO_SELECTED_READER:
- case PREF_SELECTED_ACTION:
- case PREF_VIDEO_SELECTED_ACTION:
- case PREF_AUDIO_SELECTED_ACTION:
- const response = {
- default: this._getReaderForType(Ci.nsIFeed.TYPE_FEED),
- [Ci.nsIFeed.TYPE_AUDIO]: this._getReaderForType(Ci.nsIFeed.TYPE_AUDIO),
- [Ci.nsIFeed.TYPE_VIDEO]: this._getReaderForType(Ci.nsIFeed.TYPE_VIDEO),
- };
- Services.mm.broadcastAsyncMessage("FeedWriter:PreferenceUpdated",
- response);
- break;
- }
- },
-
- _initSubscriptionUIResponse(feedType) {
- let showFirstRunUI = Services.prefs.getBoolPref(PREF_SHOW_FIRST_RUN_UI, true);
- const response = { showFirstRunUI };
- let selectedClientApp;
- const feedTypePref = getPrefAppForType(feedType);
- try {
- selectedClientApp = Services.prefs.getComplexValue(feedTypePref, Ci.nsIFile);
- } catch (ex) {
- // Just do nothing, then we won't bother populating
- }
-
- let defaultClientApp = null;
- try {
- // This can sometimes not exist
- defaultClientApp = Cc["@mozilla.org/browser/shell-service;1"]
- .getService(Ci.nsIShellService)
- .defaultFeedReader;
- } catch (ex) {
- // Just do nothing, then we don't bother populating
- }
-
- if (selectedClientApp && selectedClientApp.exists()) {
- if (defaultClientApp && selectedClientApp.path != defaultClientApp.path) {
- // Only set the default menu item if it differs from the selected one
- response.defaultMenuItem = this._getFileDisplayName(defaultClientApp);
- }
- response.selectedMenuItem = this._getFileDisplayName(selectedClientApp);
- }
- response.reader = this._getReaderForType(feedType);
- return response;
- },
-
- _setPref(aPrefName, aPrefValue, aIsComplex = false) {
- LOG(`FeedWriter._setPref ${aPrefName}`);
- // Ensure we have a pref that is settable
- if (aPrefName && SETTABLE_PREFS.has(aPrefName)) {
- if (aIsComplex) {
- Services.prefs.setStringPref(aPrefName, aPrefValue);
- } else {
- Services.prefs.setCharPref(aPrefName, aPrefValue);
- }
- } else {
- LOG(`FeedWriter._setPref ${aPrefName} not allowed`);
- }
- },
-
- _getReaderForType(feedType) {
- let handler = Services.prefs.getCharPref(getPrefReaderForType(feedType), "bookmarks");
- const alwaysUse = this._getAlwaysUseState(feedType);
- const action = Services.prefs.getCharPref(getPrefActionForType(feedType));
- return { handler, alwaysUse, action };
- },
-
- _getAlwaysUseState(feedType) {
- try {
- return Services.prefs.getCharPref(getPrefActionForType(feedType)) != "ask";
- } catch (ex) { }
- return false;
- },
-
- receiveMessage(msg) {
- switch (msg.name) {
- case "FeedWriter:GetSubscriptionUI":
- const response = this._initSubscriptionUIResponse(msg.data.feedType);
- msg.target.messageManager
- .sendAsyncMessage("FeedWriter:GetSubscriptionUIResponse",
- response);
- break;
- case "FeedWriter:ChooseClientApp":
- this._chooseClientApp(msg.data.title, msg.data.feedType, msg.target);
- break;
- case "FeedWriter:ShownFirstRun":
- Services.prefs.setBoolPref(PREF_SHOW_FIRST_RUN_UI, false);
- break;
- case "FeedWriter:SetFeedPrefsAndSubscribe":
- const settings = msg.data;
- if (!settings.action || !VALID_ACTIONS.has(settings.action)) {
- LOG(`Invalid action ${settings.action}`);
- return;
- }
- if (!settings.reader || !VALID_READERS.has(settings.reader)) {
- LOG(`Invalid reader ${settings.reader}`);
- return;
- }
-
- Services.telemetry.scalarAdd("browser.feeds.feed_subscribed", 1);
-
- const actionPref = getPrefActionForType(settings.feedType);
- this._setPref(actionPref, settings.action);
- const readerPref = getPrefReaderForType(settings.feedType);
- this._setPref(readerPref, settings.reader);
-
- const feedService = Cc["@mozilla.org/browser/feeds/result-service;1"].
- getService(Ci.nsIFeedResultService);
-
- feedService.addToClientReader(settings.feedLocation,
- settings.feedTitle,
- settings.feedSubtitle,
- settings.feedType,
- settings.reader);
- break;
- case "FeedConverter:ExecuteClientApp":
- // Always check feedHandler is from a set array of executable prefs
- if (EXECUTABLE_PREFS.has(msg.data.feedHandler)) {
- this.executeClientApp(msg.data.spec, msg.data.title,
- msg.data.subtitle, msg.data.feedHandler);
- } else {
- LOG(`FeedConverter:ExecuteClientApp - Will not exec ${msg.data.feedHandler}`);
- }
- break;
- }
- },
-};
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 607fc5831cf1..daf11436e502 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -489,10 +489,6 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks {
-moz-box-flex: 1;
}
-#PanelUI-feeds > .feed-toolbarbutton:-moz-locale-dir(rtl) {
- direction: rtl;
-}
-
#appMenu_historyMenu > .bookmark-item,
#appMenu-library-recentlyClosedTabs > .panel-subview-body > .bookmark-item,
#appMenu-library-recentlyClosedWindows > .panel-subview-body > .bookmark-item,
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index ef2d506b6604..626b27b49a36 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1352,7 +1352,6 @@ var gBrowserInit = {
gPageStyleMenu.init();
LanguageDetectionListener.init();
BrowserOnClick.init();
- FeedHandler.init();
ContentBlocking.init();
CaptivePortalWatcher.init();
ZoomUI.init(window);
@@ -1933,8 +1932,6 @@ var gBrowserInit = {
BrowserOnClick.uninit();
- FeedHandler.uninit();
-
ContentBlocking.uninit();
CaptivePortalWatcher.uninit();
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b8d15b75b4d1..9189c284d64f 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -615,20 +615,20 @@ xmlns="http://www.w3.org/1999/xhtml"
-
-
diff --git a/browser/base/content/global-scripts.inc b/browser/base/content/global-scripts.inc
index ec8fa4607a48..dd382af40770 100644
--- a/browser/base/content/global-scripts.inc
+++ b/browser/base/content/global-scripts.inc
@@ -21,7 +21,6 @@ for (let script of [
"chrome://browser/content/browser-captivePortal.js",
"chrome://browser/content/browser-compacttheme.js",
"chrome://browser/content/browser-contentblocking.js",
- "chrome://browser/content/browser-feeds.js",
"chrome://browser/content/browser-media.js",
"chrome://browser/content/browser-pageActions.js",
"chrome://browser/content/browser-places.js",
diff --git a/browser/base/content/moz.build b/browser/base/content/moz.build
index f0e47303d4ba..0bb3d22bcef5 100644
--- a/browser/base/content/moz.build
+++ b/browser/base/content/moz.build
@@ -122,9 +122,6 @@ with Files("browser-compacttheme.js"):
with Files("browser-customization.js"):
BUG_COMPONENT = ("Firefox", "Toolbars and Customization")
-with Files("browser-feeds.js"):
- BUG_COMPONENT = ("Firefox", "Toolbars and Customization")
-
with Files("browser-fullZoom.js"):
BUG_COMPONENT = ("Firefox", "Tabbed Browsing")
diff --git a/browser/base/content/test/general/browser_contentAreaClick.js b/browser/base/content/test/general/browser_contentAreaClick.js
index 6fc0d9af8784..87d1e9eb42c2 100644
--- a/browser/base/content/test/general/browser_contentAreaClick.js
+++ b/browser/base/content/test/general/browser_contentAreaClick.js
@@ -37,8 +37,7 @@ var gTests = [
preventDefault: true,
},
- // The next test was once handling feedService.forcePreview(). Now it should
- // just be like Alt click.
+ // The next test should just be like Alt click.
{
desc: "Shift+Alt left click",
setup() {
diff --git a/browser/base/content/test/general/bug395533-data.txt b/browser/base/content/test/general/bug395533-data.txt
deleted file mode 100644
index e0ed39850fc3..000000000000
--- a/browser/base/content/test/general/bug395533-data.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- t
-
-
diff --git a/browser/base/content/test/general/feed_tab.html b/browser/base/content/test/general/feed_tab.html
deleted file mode 100644
index 50903f48b61d..000000000000
--- a/browser/base/content/test/general/feed_tab.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- Test for page info feeds tab
-
-
- Child
-
-
diff --git a/browser/base/content/test/general/offlineChild2.cacheManifest b/browser/base/content/test/general/offlineChild2.cacheManifest
deleted file mode 100644
index 19efe54fe3b7..000000000000
--- a/browser/base/content/test/general/offlineChild2.cacheManifest
+++ /dev/null
@@ -1,2 +0,0 @@
-CACHE MANIFEST
-offlineChild2.html
diff --git a/browser/base/content/test/general/offlineChild2.cacheManifest^headers^ b/browser/base/content/test/general/offlineChild2.cacheManifest^headers^
deleted file mode 100644
index 257f2eb60f11..000000000000
--- a/browser/base/content/test/general/offlineChild2.cacheManifest^headers^
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/cache-manifest
diff --git a/browser/base/content/test/general/offlineChild2.html b/browser/base/content/test/general/offlineChild2.html
deleted file mode 100644
index 62447455f300..000000000000
--- a/browser/base/content/test/general/offlineChild2.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-Child
-
-
diff --git a/browser/base/content/test/general/offlineEvent.cacheManifest b/browser/base/content/test/general/offlineEvent.cacheManifest
deleted file mode 100644
index 091fe71940e5..000000000000
--- a/browser/base/content/test/general/offlineEvent.cacheManifest
+++ /dev/null
@@ -1,2 +0,0 @@
-CACHE MANIFEST
-offlineChild.html
diff --git a/browser/base/content/test/general/offlineEvent.cacheManifest^headers^ b/browser/base/content/test/general/offlineEvent.cacheManifest^headers^
deleted file mode 100644
index 257f2eb60f11..000000000000
--- a/browser/base/content/test/general/offlineEvent.cacheManifest^headers^
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/cache-manifest
diff --git a/browser/base/content/test/general/offlineEvent.html b/browser/base/content/test/general/offlineEvent.html
deleted file mode 100644
index f6e2494e27d7..000000000000
--- a/browser/base/content/test/general/offlineEvent.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-Child
-
-
diff --git a/browser/base/content/test/general/test_bug395533.html b/browser/base/content/test/general/test_bug395533.html
deleted file mode 100644
index ad6209047084..000000000000
--- a/browser/base/content/test/general/test_bug395533.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
- Test for Bug 395533
-
- Mozilla Bug 395533
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 1da3d8c7232d..bd0b59b279a1 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -44,7 +44,6 @@ browser.jar:
#ifndef MOZILLA_OFFICIAL
content/browser/browser-development-helpers.js (content/browser-development-helpers.js)
#endif
- content/browser/browser-feeds.js (content/browser-feeds.js)
content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js)
content/browser/browser-fullZoom.js (content/browser-fullZoom.js)
content/browser/browser-gestureSupport.js (content/browser-gestureSupport.js)
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 84d373bcd010..36d1849962ee 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -13,10 +13,6 @@ SPHINX_TREES['tabbrowser'] = 'content/docs/tabbrowser'
with Files('content/docs/sslerrorreport/**'):
SCHEDULES.exclusive = ['docs']
-MOCHITEST_MANIFESTS += [
- 'content/test/general/mochitest.ini',
-]
-
MOCHITEST_CHROME_MANIFESTS += [
'content/test/chrome/chrome.ini',
]
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
index 63f768a7aa04..6f02e33a27b2 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -60,10 +60,6 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT |
nsIAboutModule::HIDE_FROM_ABOUTABOUT },
- { "feeds", "chrome://browser/content/feeds/subscribe.xhtml",
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
- nsIAboutModule::ALLOW_SCRIPT |
- nsIAboutModule::HIDE_FROM_ABOUTABOUT },
{ "policies", "chrome://browser/content/policies/aboutPolicies.xhtml",
nsIAboutModule::ALLOW_SCRIPT },
{ "privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.xhtml",
diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
index b3b9729c901c..6584293152c2 100644
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -21,7 +21,6 @@ FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../about',
'../dirprovider',
- '../feeds',
'../migration',
'../sessionstore',
'../shell',
diff --git a/browser/components/build/nsBrowserCompsCID.h b/browser/components/build/nsBrowserCompsCID.h
index 12507dc178e7..f78c5ff0d6f1 100644
--- a/browser/components/build/nsBrowserCompsCID.h
+++ b/browser/components/build/nsBrowserCompsCID.h
@@ -21,15 +21,6 @@
#define NS_RDF_FORWARDPROXY_INFER_DATASOURCE_CID \
{ 0x7a024bcf, 0xedd5, 0x4d9a, { 0x86, 0x14, 0xd4, 0x4b, 0xe1, 0xda, 0xda, 0xd3 } }
-#define NS_FEEDSNIFFER_CID \
-{ 0x6893e69, 0x71d8, 0x4b23, { 0x81, 0xeb, 0x80, 0x31, 0x4d, 0xaf, 0x3e, 0x66 } }
-
-#define NS_FEEDSNIFFER_CONTRACTID \
- "@mozilla.org/browser/feeds/sniffer;1"
-
-#define NS_ABOUTFEEDS_CID \
-{ 0x12ff56ec, 0x58be, 0x402c, { 0xb0, 0x57, 0x1, 0xf9, 0x61, 0xde, 0x96, 0x9b } }
-
// 136e2c4d-c5a4-477c-b131-d93d7d704f64
#define NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID \
{ 0x136e2c4d, 0xc5a4, 0x477c, { 0xb1, 0x31, 0xd9, 0x3d, 0x7d, 0x70, 0x4f, 0x64 } }
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
index ae162122c38f..76c2331d72d7 100644
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -24,7 +24,6 @@
#include "nsIEHistoryEnumerator.h"
#endif
-#include "nsFeedSniffer.h"
#include "AboutRedirector.h"
#include "nsIAboutModule.h"
@@ -51,15 +50,12 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacAttributionService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
#endif
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
-
NS_DEFINE_NAMED_CID(NS_BROWSERDIRECTORYPROVIDER_CID);
#if defined(XP_WIN)
NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
#elif defined(MOZ_WIDGET_GTK)
NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
#endif
-NS_DEFINE_NAMED_CID(NS_FEEDSNIFFER_CID);
NS_DEFINE_NAMED_CID(NS_BROWSER_ABOUT_REDIRECTOR_CID);
#if defined(XP_WIN)
NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUMERATOR_CID);
@@ -78,7 +74,6 @@ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
#elif defined(MOZ_WIDGET_GTK)
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor },
#endif
- { &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor },
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create },
#if defined(XP_WIN)
{ &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor },
@@ -100,11 +95,9 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
#elif defined(MOZ_WIDGET_GTK)
{ NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
#endif
- { NS_FEEDSNIFFER_CONTRACTID, &kNS_FEEDSNIFFER_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "blocked", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "certerror", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "tabcrashed", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
- { NS_ABOUT_MODULE_CONTRACTID_PREFIX "feeds", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "privatebrowsing", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "rights", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "robots", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
@@ -134,7 +127,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
static const mozilla::Module::CategoryEntry kBrowserCategories[] = {
{ XPCOM_DIRECTORY_PROVIDER_CATEGORY, "browser-directory-provider", NS_BROWSERDIRECTORYPROVIDER_CONTRACTID },
- { NS_CONTENT_SNIFFER_CATEGORY, "Feed Sniffer", NS_FEEDSNIFFER_CONTRACTID },
{ nullptr }
};
diff --git a/browser/components/controlcenter/content/panel.inc.xul b/browser/components/controlcenter/content/panel.inc.xul
index 95269d531176..fdf79dcb08aa 100644
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -89,7 +89,7 @@
class="identity-popup-content-blocking-category" align="center" role="group">
-
+
@@ -97,7 +97,7 @@
class="identity-popup-content-blocking-category" align="center" role="group">
-
+
@@ -106,7 +106,7 @@
class="identity-popup-content-blocking-category" align="center" role="group">
-
+
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 0c5d9ae190ea..5220808c5dad 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -571,9 +571,6 @@
onclick="PanelUI.hide();"/>
-
-
-
diff --git a/browser/components/feeds/BrowserFeeds.manifest b/browser/components/feeds/BrowserFeeds.manifest
index 63098e275dc2..b079ebc00075 100644
--- a/browser/components/feeds/BrowserFeeds.manifest
+++ b/browser/components/feeds/BrowserFeeds.manifest
@@ -1,10 +1,2 @@
-component {229fa115-9412-4d32-baf3-2fc407f76fb1} FeedConverter.js
-contract @mozilla.org/streamconv;1?from=application/vnd.mozilla.maybe.feed&to=*/* {229fa115-9412-4d32-baf3-2fc407f76fb1}
-contract @mozilla.org/streamconv;1?from=application/vnd.mozilla.maybe.video.feed&to=*/* {229fa115-9412-4d32-baf3-2fc407f76fb1}
-contract @mozilla.org/streamconv;1?from=application/vnd.mozilla.maybe.audio.feed&to=*/* {229fa115-9412-4d32-baf3-2fc407f76fb1}
-component {2376201c-bbc6-472f-9b62-7548040a61c6} FeedConverter.js
-contract @mozilla.org/browser/feeds/result-service;1 {2376201c-bbc6-472f-9b62-7548040a61c6}
-component {49bb6593-3aff-4eb3-a068-2712c28bd58e} FeedWriter.js
-contract @mozilla.org/browser/feeds/result-writer;1 {49bb6593-3aff-4eb3-a068-2712c28bd58e}
component {792a7e82-06a0-437c-af63-b2d12e808acc} WebContentConverter.js
contract @mozilla.org/embeddor.implemented/web-content-handler-registrar;1 {792a7e82-06a0-437c-af63-b2d12e808acc}
diff --git a/browser/components/feeds/FeedConverter.js b/browser/components/feeds/FeedConverter.js
deleted file mode 100644
index 02f2db8634c0..000000000000
--- a/browser/components/feeds/FeedConverter.js
+++ /dev/null
@@ -1,415 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-function LOG(str) {
- dump("*** " + str + "\n");
-}
-
-const FS_CONTRACTID = "@mozilla.org/browser/feeds/result-service;1";
-const FPH_CONTRACTID = "@mozilla.org/network/protocol;1?name=feed";
-const PCPH_CONTRACTID = "@mozilla.org/network/protocol;1?name=pcast";
-
-const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
-const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
-const TYPE_MAYBE_AUDIO_FEED = "application/vnd.mozilla.maybe.audio.feed";
-const TYPE_ANY = "*/*";
-
-const PREF_SELECTED_APP = "browser.feeds.handlers.application";
-const PREF_SELECTED_ACTION = "browser.feeds.handler";
-const PREF_SELECTED_READER = "browser.feeds.handler.default";
-
-const PREF_VIDEO_SELECTED_APP = "browser.videoFeeds.handlers.application";
-const PREF_VIDEO_SELECTED_ACTION = "browser.videoFeeds.handler";
-const PREF_VIDEO_SELECTED_READER = "browser.videoFeeds.handler.default";
-
-const PREF_AUDIO_SELECTED_APP = "browser.audioFeeds.handlers.application";
-const PREF_AUDIO_SELECTED_ACTION = "browser.audioFeeds.handler";
-const PREF_AUDIO_SELECTED_READER = "browser.audioFeeds.handler.default";
-
-function getPrefAppForType(t) {
- switch (t) {
- case Ci.nsIFeed.TYPE_VIDEO:
- return PREF_VIDEO_SELECTED_APP;
-
- case Ci.nsIFeed.TYPE_AUDIO:
- return PREF_AUDIO_SELECTED_APP;
-
- default:
- return PREF_SELECTED_APP;
- }
-}
-
-function getPrefActionForType(t) {
- switch (t) {
- case Ci.nsIFeed.TYPE_VIDEO:
- return PREF_VIDEO_SELECTED_ACTION;
-
- case Ci.nsIFeed.TYPE_AUDIO:
- return PREF_AUDIO_SELECTED_ACTION;
-
- default:
- return PREF_SELECTED_ACTION;
- }
-}
-
-function getPrefReaderForType(t) {
- switch (t) {
- case Ci.nsIFeed.TYPE_VIDEO:
- return PREF_VIDEO_SELECTED_READER;
-
- case Ci.nsIFeed.TYPE_AUDIO:
- return PREF_AUDIO_SELECTED_READER;
-
- default:
- return PREF_SELECTED_READER;
- }
-}
-
-XPCOMUtils.defineLazyPreferenceGetter(this, "gCanFrameFeeds",
- "browser.feeds.unsafelyFrameFeeds", false);
-
-
-function FeedConverter() {
-}
-FeedConverter.prototype = {
- classID: Components.ID("{229fa115-9412-4d32-baf3-2fc407f76fb1}"),
-
- /**
- * This is the downloaded text data for the feed.
- */
- _data: null,
-
- /**
- * This is the object listening to the conversion, which is ultimately the
- * docshell for the load.
- */
- _listener: null,
-
- /**
- * Records if the feed was sniffed
- */
- _sniffed: false,
-
- /**
- * See nsIStreamConverter.idl
- */
- convert(sourceStream, sourceType, destinationType,
- context) {
- throw Cr.NS_ERROR_NOT_IMPLEMENTED;
- },
-
- /**
- * See nsIStreamConverter.idl
- */
- asyncConvertData(sourceType, destinationType,
- listener, context) {
- this._listener = listener;
- },
-
- /**
- * Whether or not the preview page is being forced.
- */
- _forcePreviewPage: false,
-
- /**
- * Release our references to various things once we're done using them.
- */
- _releaseHandles() {
- this._listener = null;
- this._request = null;
- this._processor = null;
- },
-
- /**
- * See nsIFeedResultListener.idl
- */
- handleResult(result) {
- // Feeds come in various content types, which our feed sniffer coerces to
- // the maybe.feed type. However, feeds are used as a transport for
- // different data types, e.g. news/blogs (traditional feed), video/audio
- // (podcasts) and photos (photocasts, photostreams). Each of these is
- // different in that there's a different class of application suitable for
- // handling feeds of that type, but without a content-type differentiation
- // it is difficult for us to disambiguate.
- //
- // The other problem is that if the user specifies an auto-action handler
- // for one feed application, the fact that the content type is shared means
- // that all other applications will auto-load with that handler too,
- // regardless of the content-type.
- //
- // This means that content-type alone is not enough to determine whether
- // or not a feed should be auto-handled. This means that for feeds we need
- // to always use this stream converter, even when an auto-action is
- // specified, not the basic one provided by WebContentConverter. This
- // converter needs to consume all of the data and parse it, and based on
- // that determination make a judgment about type.
- //
- // Since there are no content types for this content, and I'm not going to
- // invent any, the upshot is that while a user can set an auto-handler for
- // generic feed content, the system will prevent them from setting an auto-
- // handler for other stream types. In those cases, the user will always see
- // the preview page and have to select a handler. We can guess and show
- // a client handler.
- //
- // If this is just a feed, not some kind of specialized application, then
- // auto-handlers can be set and we should obey them.
- try {
- let feedService =
- Cc["@mozilla.org/browser/feeds/result-service;1"].
- getService(Ci.nsIFeedResultService);
- if (!this._forcePreviewPage && result.doc) {
- let feed = result.doc.QueryInterface(Ci.nsIFeed);
- let handler = Services.prefs.getCharPref(getPrefActionForType(feed.type), "ask");
-
- if (handler != "ask") {
- if (handler == "reader")
- handler = Services.prefs.getCharPref(getPrefReaderForType(feed.type), "bookmarks");
- try {
- let title = feed.title ? feed.title.plainText() : "";
- let desc = feed.subtitle ? feed.subtitle.plainText() : "";
- feedService.addToClientReader(result.uri.spec, title, desc, feed.type, handler);
- return;
- } catch (ex) { /* fallback to preview mode */ }
- }
- }
-
- let chromeChannel;
-
- // handling a redirect, hence forwarding the loadInfo from the old channel
- // to the newchannel.
- let oldChannel = this._request.QueryInterface(Ci.nsIChannel);
- let loadInfo = oldChannel.loadInfo;
-
- // If there was no automatic handler, or this was a podcast,
- // photostream or some other kind of application, show the preview page
- // if the parser returned a document.
- if (result.doc) {
-
- // Store the result in the result service so that the display
- // page can access it.
- feedService.addFeedResult(result);
-
- // Now load the actual XUL document.
- let aboutFeedsURI = Services.io.newURI("about:feeds");
- chromeChannel = Services.io.newChannelFromURIWithLoadInfo(aboutFeedsURI, loadInfo);
- chromeChannel.originalURI = result.uri;
-
- // carry the origin attributes from the channel that loaded the feed.
- chromeChannel.owner =
- Services.scriptSecurityManager.createCodebasePrincipal(aboutFeedsURI,
- loadInfo.originAttributes);
- } else {
- chromeChannel = Services.io.newChannelFromURIWithLoadInfo(result.uri, loadInfo);
- }
-
- chromeChannel.loadGroup = this._request.loadGroup;
- chromeChannel.asyncOpen2(this._listener);
- } finally {
- this._releaseHandles();
- }
- },
-
- /**
- * See nsIStreamListener.idl
- */
- onDataAvailable(request, context, inputStream,
- sourceOffset, count) {
- if (this._processor)
- this._processor.onDataAvailable(request, context, inputStream,
- sourceOffset, count);
- },
-
- /**
- * See nsIRequestObserver.idl
- */
- onStartRequest(request, context) {
- let channel = request.QueryInterface(Ci.nsIChannel);
-
- let {loadInfo} = channel;
- if ((loadInfo.frameOuterWindowID || loadInfo.outerWindowID) != loadInfo.topOuterWindowID &&
- !gCanFrameFeeds) {
- // We don't care about frame loads:
- return;
- }
-
- // Check for a header that tells us there was no sniffing
- // The value doesn't matter.
- try {
- let httpChannel = channel.QueryInterface(Ci.nsIHttpChannel);
- // Make sure to check requestSucceeded before the potentially-throwing
- // getResponseHeader.
- if (!httpChannel.requestSucceeded) {
- // Just give up, but don't forget to cancel the channel first!
- request.cancel(Cr.NS_BINDING_ABORTED);
- return;
- }
-
- // Note: this throws if the header is not set.
- httpChannel.getResponseHeader("X-Moz-Is-Feed");
- } catch (ex) {
- this._sniffed = true;
- }
-
- this._request = request;
-
- // Save and reset the forced state bit early, in case there's some kind of
- // error.
- let feedService =
- Cc["@mozilla.org/browser/feeds/result-service;1"].
- getService(Ci.nsIFeedResultService);
- this._forcePreviewPage = feedService.forcePreviewPage;
- feedService.forcePreviewPage = false;
-
- // Parse feed data as it comes in
- this._processor =
- Cc["@mozilla.org/feed-processor;1"].
- createInstance(Ci.nsIFeedProcessor);
- this._processor.listener = this;
- this._processor.parseAsync(null, channel.URI);
-
- this._processor.onStartRequest(request, context);
- },
-
- /**
- * See nsIRequestObserver.idl
- */
- onStopRequest(request, context, status) {
- if (this._processor)
- this._processor.onStopRequest(request, context, status);
- },
-
- /**
- * See nsISupports.idl
- */
- QueryInterface: ChromeUtils.generateQI(["nsIFeedResultListener",
- "nsIStreamConverter",
- "nsIStreamListener",
- "nsIRequestObserver"]),
-};
-
-/**
- * Keeps parsed FeedResults around for use elsewhere in the UI after the stream
- * converter completes.
- */
-function FeedResultService() {
-}
-
-FeedResultService.prototype = {
- classID: Components.ID("{2376201c-bbc6-472f-9b62-7548040a61c6}"),
-
- /**
- * A URI spec -> [nsIFeedResult] hash. We have to keep a list as the
- * value in case the same URI is requested concurrently.
- */
- _results: { },
-
- /**
- * See nsIFeedResultService.idl
- */
- forcePreviewPage: false,
-
- /**
- * See nsIFeedResultService.idl
- */
- addToClientReader(spec, title, subtitle, feedType, feedReader) {
- if (!feedReader) {
- feedReader = "default";
- }
-
- let handler = Services.prefs.getCharPref(getPrefActionForType(feedType), "bookmarks");
- if (handler == "ask" || handler == "reader")
- handler = feedReader;
-
- switch (handler) {
- case "client":
- Services.cpmm.sendAsyncMessage("FeedConverter:ExecuteClientApp",
- { spec,
- title,
- subtitle,
- feedHandler: getPrefAppForType(feedType) });
- break;
- case "default":
- // Default system feed reader
- Services.cpmm.sendAsyncMessage("FeedConverter:ExecuteClientApp",
- { spec,
- title,
- subtitle,
- feedHandler: "default" });
- break;
- }
- },
-
- /**
- * See nsIFeedResultService.idl
- */
- addFeedResult(feedResult) {
- if (feedResult.uri == null)
- throw new Error("null URI!");
- if (feedResult.uri == null)
- throw new Error("null feedResult!");
- let spec = feedResult.uri.spec;
- if (!this._results[spec])
- this._results[spec] = [];
- this._results[spec].push(feedResult);
- },
-
- /**
- * See nsIFeedResultService.idl
- */
- getFeedResult(uri) {
- if (uri == null)
- throw new Error("null URI!");
- let resultList = this._results[uri.spec];
- for (let result of resultList) {
- if (result.uri == uri)
- return result;
- }
- return null;
- },
-
- /**
- * See nsIFeedResultService.idl
- */
- removeFeedResult(uri) {
- if (uri == null)
- throw new Error("null URI!");
- let resultList = this._results[uri.spec];
- if (!resultList)
- return;
- let deletions = 0;
- for (let i = 0; i < resultList.length; ++i) {
- if (resultList[i].uri == uri) {
- delete resultList[i];
- ++deletions;
- }
- }
-
- // send the holes to the end
- resultList.sort();
- // and trim the list
- resultList.splice(resultList.length - deletions, deletions);
- if (resultList.length == 0)
- delete this._results[uri.spec];
- },
-
- createInstance(outer, iid) {
- if (outer != null)
- throw Cr.NS_ERROR_NO_AGGREGATION;
- return this.QueryInterface(iid);
- },
-
- QueryInterface: ChromeUtils.generateQI(["nsIFeedResultService",
- "nsIFactory"]),
-};
-
-
-var components = [FeedConverter,
- FeedResultService];
-
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
diff --git a/browser/components/feeds/FeedWriter.js b/browser/components/feeds/FeedWriter.js
deleted file mode 100644
index 5b4db1b5eee0..000000000000
--- a/browser/components/feeds/FeedWriter.js
+++ /dev/null
@@ -1,528 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-
-const FEEDWRITER_CID = Components.ID("{49bb6593-3aff-4eb3-a068-2712c28bd58e}");
-const FEEDWRITER_CONTRACTID = "@mozilla.org/browser/feeds/result-writer;1";
-
-function LOG(str) {
- let shouldLog = Services.prefs.getBoolPref("feeds.log", false);
-
- if (shouldLog)
- dump("*** Feeds: " + str + "\n");
-}
-
-/**
- * Wrapper function for nsIIOService::newURI.
- * @param aURLSpec
- * The URL string from which to create an nsIURI.
- * @returns an nsIURI object, or null if the creation of the URI failed.
- */
-function makeURI(aURLSpec, aCharset) {
- try {
- return Services.io.newURI(aURLSpec, aCharset);
- } catch (ex) { }
-
- return null;
-}
-
-const XML_NS = "http://www.w3.org/XML/1998/namespace";
-const HTML_NS = "http://www.w3.org/1999/xhtml";
-const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-const URI_BUNDLE = "chrome://browser/locale/feeds/subscribe.properties";
-
-const TITLE_ID = "feedTitleText";
-const SUBTITLE_ID = "feedSubtitleText";
-
-/**
- * Converts a number of bytes to the appropriate unit that results in a
- * number that needs fewer than 4 digits
- *
- * @return a pair: [new value with 3 sig. figs., its unit]
- */
-function convertByteUnits(aBytes) {
- let units = ["bytes", "kilobyte", "megabyte", "gigabyte"];
- let unitIndex = 0;
-
- // convert to next unit if it needs 4 digits (after rounding), but only if
- // we know the name of the next unit
- while ((aBytes >= 999.5) && (unitIndex < units.length - 1)) {
- aBytes /= 1024;
- unitIndex++;
- }
-
- // Get rid of insignificant bits by truncating to 1 or 0 decimal points
- // 0 -> 0; 1.2 -> 1.2; 12.3 -> 12.3; 123.4 -> 123; 234.5 -> 235
- aBytes = aBytes.toFixed((aBytes > 0) && (aBytes < 100) ? 1 : 0);
-
- return [aBytes, units[unitIndex]];
-}
-
-XPCOMUtils.defineLazyPreferenceGetter(this, "gCanFrameFeeds",
- "browser.feeds.unsafelyFrameFeeds", false);
-
-function FeedWriter() {
- Services.telemetry.scalarAdd("browser.feeds.preview_loaded", 1);
-}
-
-FeedWriter.prototype = {
- _getPropertyAsBag(container, property) {
- return container.fields.getProperty(property).
- QueryInterface(Ci.nsIPropertyBag2);
- },
-
- _getPropertyAsString(container, property) {
- try {
- return container.fields.getPropertyAsAString(property);
- } catch (e) {
- }
- return "";
- },
-
- _setContentText(id, text) {
- let element = this._document.getElementById(id);
- let textNode = text.createDocumentFragment(element);
- while (element.hasChildNodes())
- element.firstChild.remove();
- element.appendChild(textNode);
- if (text.base) {
- element.setAttributeNS(XML_NS, "base", text.base.spec);
- }
- },
-
- /**
- * Safely sets the href attribute on an anchor tag, providing the URI
- * specified can be loaded according to rules.
- * @param element
- * The element to set a URI attribute on
- * @param attribute
- * The attribute of the element to set the URI to, e.g. href or src
- * @param uri
- * The URI spec to set as the href
- */
- _safeSetURIAttribute(element, attribute, uri) {
- const flags = Ci.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL;
- try {
- // TODO Is this necessary?
- Services.scriptSecurityManager.checkLoadURIStrWithPrincipal(this._feedPrincipal, uri, flags);
- // checkLoadURIStrWithPrincipal will throw if the link URI should not be
- // loaded, either because our feedURI isn't allowed to load it or per
- // the rules specified in |flags|, so we'll never "linkify" the link...
- } catch (e) {
- // Not allowed to load this link because secman.checkLoadURIStr threw
- return;
- }
-
- element.setAttribute(attribute, uri);
- },
-
- __bundle: null,
- get _bundle() {
- if (!this.__bundle) {
- this.__bundle = Services.strings.createBundle(URI_BUNDLE);
- }
- return this.__bundle;
- },
-
- _getFormattedString(key, params) {
- return this._bundle.formatStringFromName(key, params, params.length);
- },
-
- _getString(key) {
- return this._bundle.GetStringFromName(key);
- },
-
- /**
- * Returns a date suitable for displaying in the feed preview.
- * If the date cannot be parsed, the return value is "false".
- * @param dateString
- * A date as extracted from a feed entry. (entry.updated)
- */
- _parseDate(dateString) {
- // Convert the date into the user's local time zone
- let dateObj = new Date(dateString);
-
- // Make sure the date we're given is valid.
- if (!dateObj.getTime())
- return false;
-
- return this._dateFormatter.format(dateObj);
- },
-
- __dateFormatter: null,
- get _dateFormatter() {
- if (!this.__dateFormatter) {
- const dtOptions = {
- timeStyle: "short",
- dateStyle: "long",
- };
- this.__dateFormatter = new Services.intl.DateTimeFormat(undefined, dtOptions);
- }
- return this.__dateFormatter;
- },
-
- /**
- * Writes the feed title into the preview document.
- * @param container
- * The feed container
- */
- _setTitleText(container) {
- if (container.title) {
- let title = container.title.plainText();
- this._setContentText(TITLE_ID, container.title);
- this._document.title = title;
- }
-
- let feed = container.QueryInterface(Ci.nsIFeed);
- if (feed && feed.subtitle)
- this._setContentText(SUBTITLE_ID, container.subtitle);
- },
-
- /**
- * Writes the title image into the preview document if one is present.
- * @param container
- * The feed container
- */
- _setTitleImage(container) {
- try {
- let parts = container.image;
-
- // Set up the title image (supplied by the feed)
- let feedTitleImage = this._document.getElementById("feedTitleImage");
- this._safeSetURIAttribute(feedTitleImage, "src",
- parts.getPropertyAsAString("url"));
-
- // Set up the title image link
- let feedTitleLink = this._document.getElementById("feedTitleLink");
-
- let titleText = this._getFormattedString("linkTitleTextFormat",
- [parts.getPropertyAsAString("title")]);
- let feedTitleText = this._document.getElementById("feedTitleText");
- let titleImageWidth = parseInt(parts.getPropertyAsAString("width")) + 15;
-
- // Fix the margin on the main title, so that the image doesn't run over
- // the underline
- feedTitleLink.setAttribute("title", titleText);
- feedTitleText.style.marginRight = titleImageWidth + "px";
-
- this._safeSetURIAttribute(feedTitleLink, "href",
- parts.getPropertyAsAString("link"));
- } catch (e) {
- LOG("Failed to set Title Image (this is benign): " + e);
- }
- },
-
- /**
- * Writes all entries contained in the feed.
- * @param container
- * The container of entries in the feed
- */
- _writeFeedContent(container) {
- // Build the actual feed content
- let feed = container.QueryInterface(Ci.nsIFeed);
- if (feed.items.length == 0)
- return;
-
- let feedContent = this._document.getElementById("feedContent");
-
- for (let i = 0; i < feed.items.length; ++i) {
- let entry = feed.items.queryElementAt(i, Ci.nsIFeedEntry);
- entry.QueryInterface(Ci.nsIFeedContainer);
-
- let entryContainer = this._document.createElementNS(HTML_NS, "div");
- entryContainer.className = "entry";
-
- // If the entry has a title, make it a link
- if (entry.title) {
- let a = this._document.createElementNS(HTML_NS, "a");
- let span = this._document.createElementNS(HTML_NS, "span");
- a.appendChild(span);
- if (entry.title.base)
- span.setAttributeNS(XML_NS, "base", entry.title.base.spec);
- span.appendChild(entry.title.createDocumentFragment(a));
-
- // Entries are not required to have links, so entry.link can be null.
- if (entry.link)
- this._safeSetURIAttribute(a, "href", entry.link.spec);
-
- let title = this._document.createElementNS(HTML_NS, "h3");
- title.appendChild(a);
-
- let lastUpdated = this._parseDate(entry.updated);
- if (lastUpdated) {
- let dateDiv = this._document.createElementNS(HTML_NS, "div");
- dateDiv.className = "lastUpdated";
- dateDiv.textContent = lastUpdated;
- title.appendChild(dateDiv);
- }
-
- entryContainer.appendChild(title);
- }
-
- let body = this._document.createElementNS(HTML_NS, "div");
- let summary = entry.summary || entry.content;
- let docFragment = null;
- if (summary) {
- if (summary.base)
- body.setAttributeNS(XML_NS, "base", summary.base.spec);
- else
- LOG("no base?");
- docFragment = summary.createDocumentFragment(body);
- if (docFragment)
- body.appendChild(docFragment);
-
- // If the entry doesn't have a title, append a # permalink
- // See http://scripting.com/rss.xml for an example
- if (!entry.title && entry.link) {
- let a = this._document.createElementNS(HTML_NS, "a");
- a.appendChild(this._document.createTextNode("#"));
- this._safeSetURIAttribute(a, "href", entry.link.spec);
- body.appendChild(this._document.createTextNode(" "));
- body.appendChild(a);
- }
-
- }
- body.className = "feedEntryContent";
- entryContainer.appendChild(body);
-
- if (entry.enclosures && entry.enclosures.length > 0) {
- let enclosuresDiv = this._buildEnclosureDiv(entry);
- entryContainer.appendChild(enclosuresDiv);
- }
-
- let clearDiv = this._document.createElementNS(HTML_NS, "div");
- clearDiv.style.clear = "both";
-
- feedContent.appendChild(entryContainer);
- feedContent.appendChild(clearDiv);
- }
- },
-
- /**
- * Takes a url to a media item and returns the best name it can come up with.
- * Frequently this is the filename portion (e.g. passing in
- * http://example.com/foo.mpeg would return "foo.mpeg"), but in more complex
- * cases, this will return the entire url (e.g. passing in
- * http://example.com/somedirectory/ would return
- * http://example.com/somedirectory/).
- * @param aURL
- * The URL string from which to create a display name
- * @returns a string
- */
- _getURLDisplayName(aURL) {
- let url = makeURI(aURL);
- url.QueryInterface(Ci.nsIURL);
- if (url == null || url.fileName.length == 0)
- return decodeURIComponent(aURL);
-
- return decodeURIComponent(url.fileName);
- },
-
- /**
- * Takes a FeedEntry with enclosures, generates the HTML code to represent
- * them, and returns that.
- * @param entry
- * FeedEntry with enclosures
- * @returns element
- */
- _buildEnclosureDiv(entry) {
- let enclosuresDiv = this._document.createElementNS(HTML_NS, "div");
- enclosuresDiv.className = "enclosures";
-
- enclosuresDiv.appendChild(this._document.createTextNode(this._getString("mediaLabel")));
-
- for (let i_enc = 0; i_enc < entry.enclosures.length; ++i_enc) {
- let enc = entry.enclosures.queryElementAt(i_enc, Ci.nsIWritablePropertyBag2);
-
- if (!(enc.hasKey("url")))
- continue;
-
- let enclosureDiv = this._document.createElementNS(HTML_NS, "div");
- enclosureDiv.setAttribute("class", "enclosure");
-
- let mozicon = "moz-icon://.txt?size=16";
- let type_text = null;
- let size_text = null;
-
- if (enc.hasKey("type")) {
- type_text = enc.get("type");
- if (enc.hasKey("typeDesc"))
- type_text = enc.get("typeDesc");
-
- if (type_text && type_text.length > 0)
- mozicon = "moz-icon://goat?size=16&contentType=" + enc.get("type");
- }
-
- if (enc.hasKey("length") && /^[0-9]+$/.test(enc.get("length"))) {
- let enc_size = convertByteUnits(parseInt(enc.get("length")));
-
- size_text = this._getFormattedString("enclosureSizeText",
- [enc_size[0],
- this._getString(enc_size[1])]);
- }
-
- let iconimg = this._document.createElementNS(HTML_NS, "img");
- iconimg.setAttribute("src", mozicon);
- iconimg.setAttribute("class", "type-icon");
- enclosureDiv.appendChild(iconimg);
-
- enclosureDiv.appendChild(this._document.createTextNode( " " ));
-
- let enc_href = this._document.createElementNS(HTML_NS, "a");
- enc_href.appendChild(this._document.createTextNode(this._getURLDisplayName(enc.get("url"))));
- this._safeSetURIAttribute(enc_href, "href", enc.get("url"));
- enclosureDiv.appendChild(enc_href);
-
- if (type_text && size_text)
- enclosureDiv.appendChild(this._document.createTextNode( " (" + type_text + ", " + size_text + ")"));
-
- else if (type_text)
- enclosureDiv.appendChild(this._document.createTextNode( " (" + type_text + ")"));
-
- else if (size_text)
- enclosureDiv.appendChild(this._document.createTextNode( " (" + size_text + ")"));
-
- enclosuresDiv.appendChild(enclosureDiv);
- }
-
- return enclosuresDiv;
- },
-
- /**
- * Gets a valid nsIFeedContainer object from the parsed nsIFeedResult.
- * Displays error information if there was one.
- * @returns A valid nsIFeedContainer object containing the contents of
- * the feed.
- */
- _getContainer() {
- let feedService =
- Cc["@mozilla.org/browser/feeds/result-service;1"].
- getService(Ci.nsIFeedResultService);
-
- let result;
- try {
- result =
- feedService.getFeedResult(this._getOriginalURI(this._window));
- } catch (e) {
- LOG("Subscribe Preview: feed not available?!");
- }
-
- if (result.bozo) {
- LOG("Subscribe Preview: feed result is bozo?!");
- }
-
- let container;
- try {
- container = result.doc;
- } catch (e) {
- LOG("Subscribe Preview: no result.doc? Why didn't the original reload?");
- return null;
- }
- return container;
- },
-
- /**
- * Returns the original URI object of the feed and ensures that this
- * component is only ever invoked from the preview document.
- * @param aWindow
- * The window of the document invoking the BrowserFeedWriter
- */
- _getOriginalURI(aWindow) {
- let docShell = aWindow.docShell;
- let chan = docShell.currentDocumentChannel;
-
- // We probably need to call Inherit() for this, but right now we can't call
- // it from JS.
- let attrs = docShell.getOriginAttributes();
- let ssm = Services.scriptSecurityManager;
- let nullPrincipal = ssm.createNullPrincipal(attrs);
-
- // this channel is not going to be openend, use a nullPrincipal
- // and the most restrctive securityFlag.
- let resolvedURI = NetUtil.newChannel({
- uri: "about:feeds",
- loadingPrincipal: nullPrincipal,
- securityFlags: Ci.nsILoadInfo.SEC_REQUIRE_SAME_ORIGIN_DATA_IS_BLOCKED,
- contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER,
- }).URI;
-
- if (resolvedURI.equals(chan.URI))
- return chan.originalURI;
-
- return null;
- },
-
- _window: null,
- _document: null,
- _feedURI: null,
- _feedPrincipal: null,
-
- // BrowserFeedWriter WebIDL methods
- init(aWindow) {
- let window = aWindow;
- if (window != window.top && !gCanFrameFeeds) {
- return;
- }
- this._feedURI = this._getOriginalURI(window);
- if (!this._feedURI)
- return;
-
- this._window = window;
- this._document = window.document;
-
- this._feedPrincipal = Services.scriptSecurityManager.createCodebasePrincipal(this._feedURI, {});
-
- LOG("Subscribe Preview: feed uri = " + this._window.location.href);
- },
-
- writeContent() {
- if (!this._window)
- return;
-
- try {
- // Set up the feed content
- let container = this._getContainer();
- if (!container)
- return;
-
- this._setTitleText(container);
- this._setTitleImage(container);
- this._writeFeedContent(container);
- } finally {
- this._removeFeedFromCache();
- }
- },
-
- close() {
- if (!this._window) {
- return;
- }
- this._document = null;
- this._window = null;
-
- this._removeFeedFromCache();
- this.__bundle = null;
- this._feedURI = null;
- },
-
- _removeFeedFromCache() {
- if (this._window && this._feedURI) {
- let feedService = Cc["@mozilla.org/browser/feeds/result-service;1"].
- getService(Ci.nsIFeedResultService);
- feedService.removeFeedResult(this._feedURI);
- this._feedURI = null;
- }
- },
-
- classID: FEEDWRITER_CID,
- QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
- Ci.nsIDOMGlobalPropertyInitializer]),
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FeedWriter]);
diff --git a/browser/components/feeds/content/subscribe.js b/browser/components/feeds/content/subscribe.js
deleted file mode 100644
index 2878e1913078..000000000000
--- a/browser/components/feeds/content/subscribe.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var SubscribeHandler = {
- /**
- * The nsIFeedWriter object that produces the UI
- */
- _feedWriter: null,
-
- init: function SH_init() {
- this._feedWriter = new BrowserFeedWriter();
- },
-
- writeContent: function SH_writeContent() {
- this._feedWriter.writeContent();
- },
-
- uninit: function SH_uninit() {
- this._feedWriter.close();
- },
-};
-
-SubscribeHandler.init();
-
-window.onload = function() {
- SubscribeHandler.writeContent();
-};
-
-window.onunload = function() {
- SubscribeHandler.uninit();
-};
diff --git a/browser/components/feeds/content/subscribe.xhtml b/browser/components/feeds/content/subscribe.xhtml
deleted file mode 100644
index c8465c6274f3..000000000000
--- a/browser/components/feeds/content/subscribe.xhtml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
- %htmlDTD;
-
- %globalDTD;
-
- %feedDTD;
-]>
-
-
-
-
-
- &feedPage.title;
-
-
-
-
-
-
-
-
-
-
-#define TYPE_ATOM "application/atom+xml"
-#define TYPE_RSS "application/rss+xml"
-#define TYPE_MAYBE_FEED "application/vnd.mozilla.maybe.feed"
-
-#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-#define NS_RSS "http://purl.org/rss/1.0/"
-
-#define MAX_BYTES 512u
-
-static bool sFramePrefCached = false;
-static bool sFramingAllowed = false;
-
-using namespace mozilla;
-
-NS_IMPL_ISUPPORTS(nsFeedSniffer,
- nsIContentSniffer,
- nsIStreamListener,
- nsIRequestObserver)
-
-nsresult
-nsFeedSniffer::ConvertEncodedData(nsIRequest* request,
- const uint8_t* data,
- uint32_t length)
-{
- nsresult rv = NS_OK;
-
- mDecodedData = "";
- nsCOMPtr httpChannel(do_QueryInterface(request));
- if (!httpChannel)
- return NS_ERROR_NO_INTERFACE;
-
- nsAutoCString contentEncoding;
- mozilla::Unused << httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("Content-Encoding"),
- contentEncoding);
- if (!contentEncoding.IsEmpty()) {
- nsCOMPtr converterService(do_GetService(NS_STREAMCONVERTERSERVICE_CONTRACTID));
- if (converterService) {
- ToLowerCase(contentEncoding);
-
- nsCOMPtr converter;
- rv = converterService->AsyncConvertData(contentEncoding.get(),
- "uncompressed", this, nullptr,
- getter_AddRefs(converter));
- NS_ENSURE_SUCCESS(rv, rv);
-
- converter->OnStartRequest(request, nullptr);
-
- nsCOMPtr rawStream =
- do_CreateInstance(NS_STRINGINPUTSTREAM_CONTRACTID);
- if (!rawStream)
- return NS_ERROR_FAILURE;
-
- rv = rawStream->SetData((const char*)data, length);
- NS_ENSURE_SUCCESS(rv, rv);
-
- rv = converter->OnDataAvailable(request, nullptr, rawStream, 0, length);
- NS_ENSURE_SUCCESS(rv, rv);
-
- converter->OnStopRequest(request, nullptr, NS_OK);
- }
- }
- return rv;
-}
-
-template
-static bool
-StringBeginsWithLowercaseLiteral(nsAString& aString,
- const char (&aSubstring)[N])
-{
- return StringHead(aString, N).LowerCaseEqualsLiteral(aSubstring);
-}
-
-bool
-HasAttachmentDisposition(nsIHttpChannel* httpChannel)
-{
- if (!httpChannel)
- return false;
-
- uint32_t disp;
- nsresult rv = httpChannel->GetContentDisposition(&disp);
-
- if (NS_SUCCEEDED(rv) && disp == nsIChannel::DISPOSITION_ATTACHMENT)
- return true;
-
- return false;
-}
-
-/**
- * @return the first occurrence of a character within a string buffer,
- * or nullptr if not found
- */
-static const char*
-FindChar(char c, const char *begin, const char *end)
-{
- for (; begin < end; ++begin) {
- if (*begin == c)
- return begin;
- }
- return nullptr;
-}
-
-/**
- *
- * Determine if a substring is the "documentElement" in the document.
- *
- * All of our sniffed substrings: = end)
- return false;
-
- // Check to see if the character following the '<' is either '?' or '!'
- // (processing instruction or doctype or comment)... these are valid nodes
- // to have in the prologue.
- if (*start != '?' && *start != '!')
- return false;
-
- // Now advance the iterator until the '>' (We do this because we don't want
- // to sniff indicator substrings that are embedded within other nodes, e.g.
- // comments:
- start = FindChar('>', start, end);
- if (!start)
- return false;
-
- ++start;
- }
- return true;
-}
-
-/**
- * Determines whether or not a string exists as the root element in an XML data
- * string buffer.
- * @param dataString
- * The data being sniffed
- * @param substring
- * The substring being tested for existence and root-ness.
- * @returns true if the substring exists and is the documentElement, false
- * otherwise.
- */
-static bool
-ContainsTopLevelSubstring(nsACString& dataString, const char *substring)
-{
- nsACString::const_iterator start, end;
- dataString.BeginReading(start);
- dataString.EndReading(end);
-
- if (!FindInReadable(nsCString(substring), start, end)){
- return false;
- }
-
- auto offset = start.get() - dataString.Data();
-
- const char *begin = dataString.BeginReading();
-
- // Only do the validation when we find the substring.
- return IsDocumentElement(begin, begin + offset);
-}
-
-NS_IMETHODIMP
-nsFeedSniffer::GetMIMETypeFromContent(nsIRequest* request,
- const uint8_t* data,
- uint32_t length,
- nsACString& sniffedType)
-{
- nsCOMPtr channel(do_QueryInterface(request));
- if (!channel)
- return NS_ERROR_NO_INTERFACE;
-
- // Check that this is a GET request, since you can't subscribe to a POST...
- nsAutoCString method;
- mozilla::Unused << channel->GetRequestMethod(method);
- if (!method.EqualsLiteral("GET")) {
- sniffedType.Truncate();
- return NS_OK;
- }
-
- if (!sFramePrefCached) {
- sFramePrefCached = true;
- Preferences::AddBoolVarCache(&sFramingAllowed,
- "browser.feeds.unsafelyFrameFeeds");
- }
-
- if (!sFramingAllowed) {
- // Check that we're the toplevel frame:
- nsCOMPtr loadInfo = channel->GetLoadInfo();
- if (!loadInfo) {
- sniffedType.Truncate();
- return NS_OK;
- }
- auto frameID = loadInfo->GetFrameOuterWindowID();
- if (!frameID) {
- frameID = loadInfo->GetOuterWindowID();
- }
- if (loadInfo->GetTopOuterWindowID() != frameID) {
- sniffedType.Truncate();
- return NS_OK;
- }
- }
-
- // We need to find out if this is a load of a view-source document. In this
- // case we do not want to override the content type, since the source display
- // does not need to be converted from feed format to XUL. More importantly,
- // we don't want to change the content type from something
- // nsContentDLF::CreateInstance knows about (e.g. application/xml, text/html
- // etc) to something that only the application fe knows about (maybe.feed)
- // thus deactivating syntax highlighting.
- nsCOMPtr originalURI;
- channel->GetOriginalURI(getter_AddRefs(originalURI));
-
- nsAutoCString scheme;
- originalURI->GetScheme(scheme);
- if (scheme.EqualsLiteral("view-source")) {
- sniffedType.Truncate();
- return NS_OK;
- }
-
- // Check the Content-Type to see if it is set correctly. If it is set to
- // something specific that we think is a reliable indication of a feed, don't
- // bother sniffing since we assume the site maintainer knows what they're
- // doing.
- nsAutoCString contentType;
- channel->GetContentType(contentType);
- bool noSniff = contentType.EqualsLiteral(TYPE_RSS) ||
- contentType.EqualsLiteral(TYPE_ATOM);
-
- if (noSniff) {
- // check for an attachment after we have a likely feed.
- if(HasAttachmentDisposition(channel)) {
- sniffedType.Truncate();
- return NS_OK;
- }
-
- // set the feed header as a response header, since we have good metadata
- // telling us that the feed is supposed to be RSS or Atom
- mozilla::DebugOnly rv =
- channel->SetResponseHeader(NS_LITERAL_CSTRING("X-Moz-Is-Feed"),
- NS_LITERAL_CSTRING("1"), false);
- MOZ_ASSERT(NS_SUCCEEDED(rv));
- sniffedType.AssignLiteral(TYPE_MAYBE_FEED);
- return NS_OK;
- }
-
- // Don't sniff arbitrary types. Limit sniffing to situations that
- // we think can reasonably arise.
- if (!contentType.EqualsLiteral(TEXT_HTML) &&
- !contentType.EqualsLiteral(APPLICATION_OCTET_STREAM) &&
- // Same criterion as XMLHttpRequest. Should we be checking for "+xml"
- // and check for text/xml and application/xml by hand instead?
- contentType.Find("xml") == -1) {
- sniffedType.Truncate();
- return NS_OK;
- }
-
- // Now we need to potentially decompress data served with
- // Content-Encoding: gzip
- nsresult rv = ConvertEncodedData(request, data, length);
- if (NS_FAILED(rv))
- return rv;
-
- // We cap the number of bytes to scan at MAX_BYTES to prevent picking up
- // false positives by accidentally reading document content, e.g. a "how to
- // make a feed" page.
- const char* testData;
- if (mDecodedData.IsEmpty()) {
- testData = (const char*)data;
- length = std::min(length, MAX_BYTES);
- } else {
- testData = mDecodedData.get();
- length = std::min(mDecodedData.Length(), MAX_BYTES);
- }
-
- // The strategy here is based on that described in:
- // http://blogs.msdn.com/rssteam/articles/PublishersGuide.aspx
- // for interoperarbility purposes.
-
- // Thus begins the actual sniffing.
- nsDependentCSubstring dataString((const char*)testData, length);
-
- bool isFeed = false;
-
- // RSS 0.91/0.92/2.0
- isFeed = ContainsTopLevelSubstring(dataString, "(closure);
- decodedData->Append(rawSegment, count);
- *writeCount = count;
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFeedSniffer::OnDataAvailable(nsIRequest* request, nsISupports* context,
- nsIInputStream* stream, uint64_t offset,
- uint32_t count)
-{
- uint32_t read;
- return stream->ReadSegments(AppendSegmentToString, &mDecodedData, count,
- &read);
-}
-
-NS_IMETHODIMP
-nsFeedSniffer::OnStopRequest(nsIRequest* request, nsISupports* context,
- nsresult status)
-{
- return NS_OK;
-}
diff --git a/browser/components/feeds/nsFeedSniffer.h b/browser/components/feeds/nsFeedSniffer.h
deleted file mode 100644
index b7ac002bdf9d..000000000000
--- a/browser/components/feeds/nsFeedSniffer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#include "nsIContentSniffer.h"
-#include "nsIStreamListener.h"
-#include "nsString.h"
-#include "mozilla/Attributes.h"
-
-class nsFeedSniffer final : public nsIContentSniffer,
- nsIStreamListener
-{
-public:
- NS_DECL_ISUPPORTS
- NS_DECL_NSICONTENTSNIFFER
- NS_DECL_NSIREQUESTOBSERVER
- NS_DECL_NSISTREAMLISTENER
-
- static nsresult AppendSegmentToString(nsIInputStream* inputStream,
- void* closure,
- const char* rawSegment,
- uint32_t toOffset,
- uint32_t count,
- uint32_t* writeCount);
-
-protected:
- ~nsFeedSniffer() {}
-
- nsresult ConvertEncodedData(nsIRequest* request, const uint8_t* data,
- uint32_t length);
-
-private:
- nsCString mDecodedData;
-};
-
diff --git a/browser/components/feeds/nsIFeedResultService.idl b/browser/components/feeds/nsIFeedResultService.idl
deleted file mode 100644
index f745fa6936e9..000000000000
--- a/browser/components/feeds/nsIFeedResultService.idl
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-interface nsIURI;
-interface nsIRequest;
-interface nsIFeedResult;
-
-/**
- * nsIFeedResultService provides a globally-accessible object for retrieving
- * the results of feed processing.
- */
-[scriptable, uuid(95309fd2-7b3a-47fb-97f3-5c460d9473cd)]
-interface nsIFeedResultService : nsISupports
-{
- /**
- * When set to true, forces the preview page to be displayed, regardless
- * of the user's preferences.
- */
- attribute boolean forcePreviewPage;
-
- /**
- * Adds a URI to the user's specified external feed handler, or live
- * bookmarks.
- * @param uri
- * The uri of the feed to add.
- * @param title
- * The title of the feed to add.
- * @param subtitle
- * The subtitle of the feed to add.
- * @param feedType
- * The nsIFeed type of the feed. See nsIFeed.idl
- * @param feedReader
- * The type of feed reader we're using (client, bookmarks, default)
- * If this parameter is null, the type is set to default
- */
- void addToClientReader(in AUTF8String uri,
- in AString title,
- in AString subtitle,
- in unsigned long feedType,
- [optional] in AString feedReader);
-
- /**
- * Registers a Feed Result object with a globally accessible service
- * so that it can be accessed by a singleton method outside the usual
- * flow of control in document loading.
- *
- * @param feedResult
- * An object implementing nsIFeedResult representing the feed.
- */
- void addFeedResult(in nsIFeedResult feedResult);
-
- /**
- * Gets a Feed Handler object registered using addFeedResult.
- *
- * @param uri
- * The URI of the feed a handler is being requested for
- */
- nsIFeedResult getFeedResult(in nsIURI uri);
-
- /**
- * Unregisters a Feed Handler object registered using addFeedResult.
- * @param uri
- * The feed URI the handler was registered under. This must be
- * the same *instance* the feed was registered under.
- */
- void removeFeedResult(in nsIURI uri);
-};
diff --git a/browser/components/feeds/test/bug364677-data.xml b/browser/components/feeds/test/bug364677-data.xml
deleted file mode 100644
index b48915c0509b..000000000000
--- a/browser/components/feeds/test/bug364677-data.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- t
-
-
diff --git a/browser/components/feeds/test/bug364677-data.xml^headers^ b/browser/components/feeds/test/bug364677-data.xml^headers^
deleted file mode 100644
index f203c6368ef9..000000000000
--- a/browser/components/feeds/test/bug364677-data.xml^headers^
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/xml
diff --git a/browser/components/feeds/test/bug368464-data.xml b/browser/components/feeds/test/bug368464-data.xml
deleted file mode 100644
index 2745b061dea6..000000000000
--- a/browser/components/feeds/test/bug368464-data.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Tinderbox - Firefox
- Build bustages for Firefox
-
-
- Bad
- http://tinderbox.mozilla.org/channelflames.gif
-
- The tree is currently closed MacOSX Darwin 8.8.4 qm-xserve01 dep unit test is in flames
diff --git a/browser/components/feeds/test/bug408328-data.xml b/browser/components/feeds/test/bug408328-data.xml
deleted file mode 100644
index e9385e5ab1e4..000000000000
--- a/browser/components/feeds/test/bug408328-data.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
- Example Feed
- 2003-12-13T18:30:02Z
-
-
- John Doe
-
- urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6
-
-
-
- Good item
- urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a
- 2003-12-13T18:30:02Z
-
- Some text.
-
-
-
-
- data: link
- urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6b
- 2003-12-13T18:30:03Z
-
- Some text.
-
-
-
-
- javascript: link
- urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6c
- 2003-12-13T18:30:04Z
-
- Some text.
-
-
-
-
- file: link
- urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6d
- 2003-12-13T18:30:05Z
-
- Some text.
-
-
-
-
- chrome: link
- urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6e
- 2003-12-13T18:30:06Z
-
- Some text.
-
-
-
diff --git a/browser/components/feeds/test/bug436801-data.xml b/browser/components/feeds/test/bug436801-data.xml
deleted file mode 100644
index 0e45c7ed8ed8..000000000000
--- a/browser/components/feeds/test/bug436801-data.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
- <div xmlns="http://www.w3.org/1999/xhtml">Example of a <em>special</em> feed (<img height="20px" src="baz.png" alt="base test sprite"/>)</div>
-
-
-
- special subtitle (
-
- 2010-09-02T18:30:02Z
-
-
- John Doe
-
-
- urn:uuid:22906062-ecbd-46e2-b6a7-3039506a398f
-
-
-
- <div xmlns="http://www.w3.org/1999/xhtml">Some <abbr title="Extensible Hyper-text Mark-up Language">XHTML</abbr> examples (<img height="20px" src="baz.png" alt="base test sprite"/>)</div>
-
- urn:uuid:b48083a7-71a7-4c9c-8515-b7c0d22955e7
- 2010-09-02T18:30:02Z
- Some text.
-
-
-
-
- <![CDATA[
- Some <abbr title="Hyper-text Mark-up Language">HTML</abbr> examples (<img height="20px" src="baz.png" alt="base test sprite"/>)
- ]]>
-
- urn:uuid:1424967a-280a-414d-b0ab-8b11c4ac1bb7
- 2010-09-02T18:30:02Z
- Some text.
-
-
-
diff --git a/browser/components/feeds/test/bug494328-data.xml b/browser/components/feeds/test/bug494328-data.xml
deleted file mode 100644
index 58342bafc687..000000000000
--- a/browser/components/feeds/test/bug494328-data.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- Channel title
- Channel description
- -
-
Episode 1
-
- -
-
Episode 2
-
- -
-
Episode 3
-
- -
-
Episode 4
-
-
-
diff --git a/browser/components/feeds/test/chrome/.eslintrc.js b/browser/components/feeds/test/chrome/.eslintrc.js
deleted file mode 100644
index a3b8c411daf9..000000000000
--- a/browser/components/feeds/test/chrome/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
- "extends": [
- "plugin:mozilla/chrome-test"
- ]
-};
diff --git a/browser/components/feeds/test/chrome/chrome.ini b/browser/components/feeds/test/chrome/chrome.ini
deleted file mode 100644
index 2e42bf93f8a4..000000000000
--- a/browser/components/feeds/test/chrome/chrome.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-prefs =
- browser.feeds.unsafelyFrameFeeds=true
-
-support-files = sample_feed.atom
- !/browser/components/feeds/test/bug408328-data.xml
- !/browser/components/feeds/test/valid-feed.xml
- !/browser/components/feeds/test/valid-unsniffable-feed.xml
-
-[test_bug368464.html]
-[test_bug408328.html]
-[test_maxSniffing.html]
diff --git a/browser/components/feeds/test/chrome/sample_feed.atom b/browser/components/feeds/test/chrome/sample_feed.atom
deleted file mode 100644
index add75efb4d68..000000000000
--- a/browser/components/feeds/test/chrome/sample_feed.atom
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- Example Feed
- 2003-12-13T18:30:02Z
-
-
- John Doe
-
- urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6
-
-
-
- Atom-Powered Robots Run Amok
- urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a
- 2003-12-13T18:30:02Z
-
- Some text.
-
-
-
diff --git a/browser/components/feeds/test/chrome/test_bug368464.html b/browser/components/feeds/test/chrome/test_bug368464.html
deleted file mode 100644
index dd7486f66bab..000000000000
--- a/browser/components/feeds/test/chrome/test_bug368464.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- Test that RSS 0.90 isn't sniffed
-
- Mozilla Bug 368464
-
-
-
-
-
-
-
-
-
diff --git a/browser/components/feeds/test/chrome/test_bug408328.html b/browser/components/feeds/test/chrome/test_bug408328.html
deleted file mode 100644
index e4901320a7c9..000000000000
--- a/browser/components/feeds/test/chrome/test_bug408328.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- Test feed preview safe-linkification
-
- Mozilla Bug 408328
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/components/feeds/test/chrome/test_maxSniffing.html b/browser/components/feeds/test/chrome/test_maxSniffing.html
deleted file mode 100644
index 7a20446875a6..000000000000
--- a/browser/components/feeds/test/chrome/test_maxSniffing.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- Test that we only sniff 512 bytes
-
- Mozilla Bug 739040
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/components/feeds/test/mochitest.ini b/browser/components/feeds/test/mochitest.ini
index f0747fa05a57..27e6cae556dc 100644
--- a/browser/components/feeds/test/mochitest.ini
+++ b/browser/components/feeds/test/mochitest.ini
@@ -1,20 +1,2 @@
-[DEFAULT]
-prefs =
- browser.feeds.unsafelyFrameFeeds=true
-
-support-files =
- bug368464-data.xml
- bug408328-data.xml
- bug436801-data.xml
- bug494328-data.xml
- valid-feed.xml
- valid-unsniffable-feed.xml
-
-[test_bug364677.html]
-support-files =
- bug364677-data.xml
- bug364677-data.xml^headers^
-[test_bug436801.html]
-[test_bug494328.html]
[test_registerHandler.html]
[test_registerHandler_disabled.html]
diff --git a/browser/components/feeds/test/test_bug364677.html b/browser/components/feeds/test/test_bug364677.html
deleted file mode 100644
index 67b9729d11e2..000000000000
--- a/browser/components/feeds/test/test_bug364677.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- Test for Bug 364677
-
- Mozilla Bug 364677
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/components/feeds/test/test_bug436801.html b/browser/components/feeds/test/test_bug436801.html
deleted file mode 100644
index aa82920fb7e0..000000000000
--- a/browser/components/feeds/test/test_bug436801.html
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
- Test feed preview subscribe UI
-
- Mozilla Bug 436801
-
-
-
-
-
-
-
-
diff --git a/browser/components/feeds/test/test_bug494328.html b/browser/components/feeds/test/test_bug494328.html
deleted file mode 100644
index 054f62c1d27e..000000000000
--- a/browser/components/feeds/test/test_bug494328.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- Test for bug 494328
-
- Mozilla Bug 494328
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/components/feeds/test/valid-feed.xml b/browser/components/feeds/test/valid-feed.xml
deleted file mode 100644
index 0e700b6d8dd3..000000000000
--- a/browser/components/feeds/test/valid-feed.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- Example Feed
- 2010-08-22T18:30:02Z
-
-
- John Doe
-
- urn:uuid:e2df8375-99be-4848-b05e-b9d407555267
-
-
-
- Item
- urn:uuid:9e0f4bed-33d3-4a9d-97ab-ecaa31b3f14a
- 2010-08-22T18:30:02Z
-
- Some text.
-
-
-
diff --git a/browser/components/feeds/test/valid-unsniffable-feed.xml b/browser/components/feeds/test/valid-unsniffable-feed.xml
deleted file mode 100644
index e753157395a3..000000000000
--- a/browser/components/feeds/test/valid-unsniffable-feed.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- Example Feed
- 2010-08-22T18:30:02Z
-
-
- John Doe
-
- urn:uuid:e2df8375-99be-4848-b05e-b9d407555267
-
-
-
- Item
- urn:uuid:9e0f4bed-33d3-4a9d-97ab-ecaa31b3f14a
- 2010-08-22T18:30:02Z
-
- Some text.
-
-
-
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 163abbc17422..2de93eb8f012 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -500,7 +500,6 @@ const listeners = {
"AsyncPrefs:ResetPref": ["AsyncPrefs"],
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN AsyncPrefs.init
- "FeedConverter:addLiveBookmark": ["Feeds"],
"webrtc:UpdateGlobalIndicators": ["webrtcUI"],
"webrtc:UpdatingIndicators": ["webrtcUI"],
},
diff --git a/browser/components/places/content/bookmarksHistoryTooltip.inc.xul b/browser/components/places/content/bookmarksHistoryTooltip.inc.xul
index 90b4f44448fc..a2acd4fef8eb 100644
--- a/browser/components/places/content/bookmarksHistoryTooltip.inc.xul
+++ b/browser/components/places/content/bookmarksHistoryTooltip.inc.xul
@@ -2,7 +2,7 @@
-
diff --git a/browser/components/preferences/applicationManager.js b/browser/components/preferences/applicationManager.js
index b47955586c5f..454afaca934a 100644
--- a/browser/components/preferences/applicationManager.js
+++ b/browser/components/preferences/applicationManager.js
@@ -17,9 +17,7 @@ var gAppManagerDialog = {
window);
const appDescElem = document.getElementById("appDescription");
- if (this.handlerInfo.type == TYPE_MAYBE_FEED) {
- document.l10n.setAttributes(appDescElem, "app-manager-handle-webfeeds");
- } else if (this.handlerInfo.wrappedHandlerInfo instanceof Ci.nsIMIMEInfo) {
+ if (this.handlerInfo.wrappedHandlerInfo instanceof Ci.nsIMIMEInfo) {
document.l10n.setAttributes(appDescElem, "app-manager-handle-file", {
type: this.handlerInfo.typeDescription,
});
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
index 682deac2e049..a3f95c70ecbe 100644
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -25,9 +25,6 @@ XPCOMUtils.defineLazyServiceGetters(this, {
});
// Constants & Enumeration Values
-const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
-const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
-const TYPE_MAYBE_AUDIO_FEED = "application/vnd.mozilla.maybe.audio.feed";
const TYPE_PDF = "application/pdf";
const PREF_PDFJS_DISABLED = "pdfjs.disabled";
@@ -46,38 +43,6 @@ const PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS =
// Strings to identify ExtensionSettingsStore overrides
const CONTAINERS_KEY = "privacy.containers";
-/*
- * Preferences where we store handling information about the feed type.
- *
- * browser.feeds.handler
- * - "bookmarks", "reader" (clarified further using the .default preference),
- * or "ask" -- indicates the default handler being used to process feeds;
- * "bookmarks" is obsolete; to specify that the handler is bookmarks,
- * set browser.feeds.handler.default to "bookmarks";
- *
- * browser.feeds.handler.default
- * - "bookmarks" or "client" -- indicates the chosen feed reader used
- * to display feeds, either transiently (i.e., when the "use as default"
- * checkbox is unchecked, corresponds to when browser.feeds.handler=="ask")
- * or more permanently (i.e., the item displayed in the dropdown in Feeds
- * preferences)
- *
- * browser.feeds.handlers.application
- * - nsIFile, stores the current client-side feed reading app if one has
- * been chosen
- */
-const PREF_FEED_SELECTED_APP = "browser.feeds.handlers.application";
-const PREF_FEED_SELECTED_ACTION = "browser.feeds.handler";
-const PREF_FEED_SELECTED_READER = "browser.feeds.handler.default";
-
-const PREF_VIDEO_FEED_SELECTED_APP = "browser.videoFeeds.handlers.application";
-const PREF_VIDEO_FEED_SELECTED_ACTION = "browser.videoFeeds.handler";
-const PREF_VIDEO_FEED_SELECTED_READER = "browser.videoFeeds.handler.default";
-
-const PREF_AUDIO_FEED_SELECTED_APP = "browser.audioFeeds.handlers.application";
-const PREF_AUDIO_FEED_SELECTED_ACTION = "browser.audioFeeds.handler";
-const PREF_AUDIO_FEED_SELECTED_READER = "browser.audioFeeds.handler.default";
-
// The nsHandlerInfoAction enumeration values in nsIHandlerInfo identify
// the actions the application can take with content of various types.
// But since nsIHandlerInfo doesn't support plugins, there's no value
@@ -88,7 +53,7 @@ const ICON_URL_APP = AppConstants.platform == "linux" ?
"moz-icon://dummy.exe?size=16" :
"chrome://browser/skin/preferences/application.png";
-// For CSS. Can be one of "ask", "save", "plugin" or "feed". If absent, the icon URL
+// For CSS. Can be one of "ask", "save" or "plugin". If absent, the icon URL
// was set by us to a custom handler icon and CSS should not try to override it.
const APP_ICON_ATTR_NAME = "appHandlerIcon";
@@ -179,18 +144,6 @@ Preferences.addAll([
{ id: "layers.acceleration.disabled", type: "bool", inverted: true },
// Files and Applications
- { id: "browser.feeds.handler", type: "string" },
- { id: "browser.feeds.handler.default", type: "string" },
- { id: "browser.feeds.handlers.application", type: "file" },
-
- { id: "browser.videoFeeds.handler", type: "string" },
- { id: "browser.videoFeeds.handler.default", type: "string" },
- { id: "browser.videoFeeds.handlers.application", type: "file" },
-
- { id: "browser.audioFeeds.handler", type: "string" },
- { id: "browser.audioFeeds.handler.default", type: "string" },
- { id: "browser.audioFeeds.handlers.application", type: "file" },
-
{ id: "pref.downloads.disable_button.edit_actions", type: "bool" },
// DRM content
@@ -549,17 +502,6 @@ var gMainPane = {
// the view when they change.
Services.prefs.addObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
Services.prefs.addObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
- Services.prefs.addObserver(PREF_FEED_SELECTED_APP, this);
- Services.prefs.addObserver(PREF_FEED_SELECTED_ACTION, this);
- Services.prefs.addObserver(PREF_FEED_SELECTED_READER, this);
-
- Services.prefs.addObserver(PREF_VIDEO_FEED_SELECTED_APP, this);
- Services.prefs.addObserver(PREF_VIDEO_FEED_SELECTED_ACTION, this);
- Services.prefs.addObserver(PREF_VIDEO_FEED_SELECTED_READER, this);
-
- Services.prefs.addObserver(PREF_AUDIO_FEED_SELECTED_APP, this);
- Services.prefs.addObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
- Services.prefs.addObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
setEventListener("filter", "command", gMainPane.filter);
setEventListener("typeColumn", "click", gMainPane.sort);
@@ -1333,17 +1275,6 @@ var gMainPane = {
window.removeEventListener("unload", this);
Services.prefs.removeObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
Services.prefs.removeObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
- Services.prefs.removeObserver(PREF_FEED_SELECTED_APP, this);
- Services.prefs.removeObserver(PREF_FEED_SELECTED_ACTION, this);
- Services.prefs.removeObserver(PREF_FEED_SELECTED_READER, this);
-
- Services.prefs.removeObserver(PREF_VIDEO_FEED_SELECTED_APP, this);
- Services.prefs.removeObserver(PREF_VIDEO_FEED_SELECTED_ACTION, this);
- Services.prefs.removeObserver(PREF_VIDEO_FEED_SELECTED_READER, this);
-
- Services.prefs.removeObserver(PREF_AUDIO_FEED_SELECTED_APP, this);
- Services.prefs.removeObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
- Services.prefs.removeObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
Services.prefs.removeObserver(PREF_CONTAINERS_EXTENSION, this);
},
@@ -1392,23 +1323,11 @@ var gMainPane = {
// Composed Model Construction
_loadData() {
- this._loadFeedHandler();
this._loadInternalHandlers();
this._loadPluginHandlers();
this._loadApplicationHandlers();
},
- _loadFeedHandler() {
- this._handledTypes[TYPE_MAYBE_FEED] = feedHandlerInfo;
- feedHandlerInfo.handledOnlyByPlugin = false;
-
- this._handledTypes[TYPE_MAYBE_VIDEO_FEED] = videoFeedHandlerInfo;
- videoFeedHandlerInfo.handledOnlyByPlugin = false;
-
- this._handledTypes[TYPE_MAYBE_AUDIO_FEED] = audioFeedHandlerInfo;
- audioFeedHandlerInfo.handledOnlyByPlugin = false;
- },
-
/**
* Load higher level internal handlers so they can be turned on/off in the
* applications menu.
@@ -1675,12 +1594,7 @@ var gMainPane = {
{
var askMenuItem = document.createXULElement("menuitem");
askMenuItem.setAttribute("action", Ci.nsIHandlerInfo.alwaysAsk);
- let label;
- if (isFeedType(handlerInfo.type))
- label = gMainPane._prefsBundle.getFormattedString("previewInApp",
- [this._brandShortName]);
- else
- label = gMainPane._prefsBundle.getString("alwaysAsk");
+ let label = gMainPane._prefsBundle.getString("alwaysAsk");
askMenuItem.setAttribute("label", label);
askMenuItem.setAttribute("tooltiptext", label);
askMenuItem.setAttribute(APP_ICON_ATTR_NAME, "ask");
@@ -1689,10 +1603,8 @@ var gMainPane = {
// Create a menu item for saving to disk.
// Note: this option isn't available to protocol types, since we don't know
- // what it means to save a URL having a certain scheme to disk, nor is it
- // available to feeds, since the feed code doesn't implement the capability.
- if ((handlerInfo.wrappedHandlerInfo instanceof Ci.nsIMIMEInfo) &&
- !isFeedType(handlerInfo.type)) {
+ // what it means to save a URL having a certain scheme to disk.
+ if ((handlerInfo.wrappedHandlerInfo instanceof Ci.nsIMIMEInfo)) {
var saveMenuItem = document.createXULElement("menuitem");
saveMenuItem.setAttribute("action", Ci.nsIHandlerInfo.saveToDisk);
let label = gMainPane._prefsBundle.getString("saveFile");
@@ -1702,18 +1614,6 @@ var gMainPane = {
menuPopup.appendChild(saveMenuItem);
}
- // If this is the feed type, add a Live Bookmarks item.
- if (isFeedType(handlerInfo.type)) {
- internalMenuItem = document.createXULElement("menuitem");
- internalMenuItem.setAttribute("action", Ci.nsIHandlerInfo.handleInternally);
- let label = gMainPane._prefsBundle.getFormattedString("addLiveBookmarksInApp",
- [this._brandShortName]);
- internalMenuItem.setAttribute("label", label);
- internalMenuItem.setAttribute("tooltiptext", label);
- internalMenuItem.setAttribute(APP_ICON_ATTR_NAME, "feed");
- menuPopup.appendChild(internalMenuItem);
- }
-
// Add a separator to distinguish these items from the helper app items
// that follow them.
let menuseparator = document.createXULElement("menuseparator");
@@ -1950,10 +1850,11 @@ var gMainPane = {
// Whether or not we are currently storing the action selected by the user.
// We use this to suppress notification-triggered updates to the list when
- // we make changes that may spawn such updates, specifically when we change
- // the action for the feed type, which results in feed preference updates,
- // which spawn "pref changed" notifications that would otherwise cause us
- // to rebuild the view unnecessarily.
+ // we make changes that may spawn such updates.
+ // XXXgijs: this was definitely necessary when we changed feed preferences
+ // from within _storeAction and its calltree. Now, it may still be
+ // necessary, either to avoid calling _rebuildView or to avoid the plugin-
+ // related prefs change code. bug 1499350 has more details.
_storingAction: false,
onSelectAction(aActionItem) {
@@ -2058,14 +1959,7 @@ var gMainPane = {
var params = {};
var handlerInfo = this.selectedHandlerListItem.handlerInfoWrapper;
- if (isFeedType(handlerInfo.type)) {
- // MIME info will be null, create a temp object.
- params.mimeInfo = gMIMEService.getFromTypeAndExtension(handlerInfo.type,
- handlerInfo.primaryExtension);
- } else {
- params.mimeInfo = handlerInfo.wrappedHandlerInfo;
- }
-
+ params.mimeInfo = handlerInfo.wrappedHandlerInfo;
params.title = gMainPane._prefsBundle.getString("fpTitleChooseApp");
params.description = handlerInfo.description;
params.filename = null;
@@ -2454,10 +2348,6 @@ function getLocalHandlerApp(aFile) {
return localHandlerApp;
}
-function isFeedType(t) {
- return t == TYPE_MAYBE_FEED || t == TYPE_MAYBE_VIDEO_FEED || t == TYPE_MAYBE_AUDIO_FEED;
-}
-
// eslint-disable-next-line no-undef
let gHandlerListItemFragment = MozXULElement.parseXULToFragment(`
@@ -2618,12 +2508,8 @@ class HandlerInfoWrapper {
*/
get actionDescription() {
// alwaysAskBeforeHandling overrides the preferred action, so if that flag
- // is set, then describe that behavior instead. For most types, this is
- // the "alwaysAsk" string, but for the feed type we show something special.
+ // is set, then describe that behavior instead.
if (this.alwaysAskBeforeHandling) {
- if (isFeedType(this.type))
- return gMainPane._prefsBundle.getFormattedString("previewInApp",
- [gMainPane._brandShortName]);
return gMainPane._prefsBundle.getString("alwaysAsk");
}
@@ -2641,12 +2527,6 @@ class HandlerInfoWrapper {
return gMainPane._prefsBundle.getFormattedString("useApp", [name]);
case Ci.nsIHandlerInfo.handleInternally:
- // For the feed type, handleInternally means live bookmarks.
- if (isFeedType(this.type)) {
- return gMainPane._prefsBundle.getFormattedString("addLiveBookmarksInApp",
- [gMainPane._brandShortName]);
- }
-
if (this instanceof InternalHandlerInfoWrapper) {
return gMainPane._prefsBundle.getFormattedString("previewInApp",
[gMainPane._brandShortName]);
@@ -2688,9 +2568,7 @@ class HandlerInfoWrapper {
return "save";
case Ci.nsIHandlerInfo.handleInternally:
- if (isFeedType(this.type)) {
- return "feed";
- } else if (this instanceof InternalHandlerInfoWrapper) {
+ if (this instanceof InternalHandlerInfoWrapper) {
return "ask";
}
@@ -2944,269 +2822,6 @@ class HandlerInfoWrapper {
}
}
-/**
- * This object implements nsIHandlerInfo for the feed types. It's a separate
- * object because we currently store handling information for the feed type
- * in a set of preferences rather than the nsIHandlerService-managed datastore.
- *
- * This object inherits from HandlerInfoWrapper in order to get functionality
- * that isn't special to the feed type.
- */
-class FeedHandlerInfo extends HandlerInfoWrapper {
- constructor(aMIMEType, properties) {
- super(aMIMEType, null);
- Object.assign(this, properties);
- }
-
- get description() {
- return gMainPane._prefsBundle.getString(this._appPrefLabel);
- }
-
- get preferredApplicationHandler() {
- switch (Preferences.get(this._prefSelectedReader).value) {
- case "client":
- var file = Preferences.get(this._prefSelectedApp).value;
- if (file)
- return getLocalHandlerApp(file);
-
- return null;
-
- case "bookmarks":
- default:
- // When the pref is set to bookmarks, we handle feeds internally,
- // we don't forward them to a local or web handler app, so there is
- // no preferred handler.
- return null;
- }
- }
-
- set preferredApplicationHandler(aNewValue) {
- if (aNewValue instanceof Ci.nsILocalHandlerApp) {
- Preferences.get(this._prefSelectedApp).value = aNewValue.executable;
- Preferences.get(this._prefSelectedReader).value = "client";
- }
- }
-
- get possibleApplicationHandlers() {
- if (this._possibleApplicationHandlers)
- return this._possibleApplicationHandlers;
-
- // A minimal implementation of nsIMutableArray. It only supports the two
- // methods its callers invoke, namely appendElement and nsIArray::enumerate.
- this._possibleApplicationHandlers = {
- _inner: [],
- _removed: [],
-
- QueryInterface: ChromeUtils.generateQI(["nsIMutableArray", "nsIArray"]),
-
- get length() {
- return this._inner.length;
- },
-
- enumerate() {
- return this._inner.values();
- },
-
- appendElement(aHandlerApp, aWeak) {
- this._inner.push(aHandlerApp);
- },
-
- removeElementAt(aIndex) {
- this._removed.push(this._inner[aIndex]);
- this._inner.splice(aIndex, 1);
- },
-
- queryElementAt(aIndex, aInterface) {
- return this._inner[aIndex].QueryInterface(aInterface);
- },
- };
-
- // Add the selected local app if it's different from the OS default handler.
- // Unlike for other types, we can store only one local app at a time for the
- // feed type, since we store it in a preference that historically stores
- // only a single path. But we display all the local apps the user chooses
- // while the prefpane is open, only dropping the list when the user closes
- // the prefpane, for maximum usability and consistency with other types.
- var preferredAppFile = Preferences.get(this._prefSelectedApp).value;
- if (preferredAppFile) {
- let preferredApp = getLocalHandlerApp(preferredAppFile);
- let defaultApp = this._defaultApplicationHandler;
- if (!defaultApp || !defaultApp.equals(preferredApp))
- this._possibleApplicationHandlers.appendElement(preferredApp);
- }
-
- return this._possibleApplicationHandlers;
- }
-
- get _defaultApplicationHandler() {
- if (typeof this.__defaultApplicationHandler != "undefined")
- return this.__defaultApplicationHandler;
-
- var defaultFeedReader = null;
- if (AppConstants.HAVE_SHELL_SERVICE) {
- try {
- defaultFeedReader = getShellService().defaultFeedReader;
- } catch (ex) {
- // no default reader or getShellService() is null
- }
- }
-
- if (defaultFeedReader) {
- let handlerApp = Cc["@mozilla.org/uriloader/local-handler-app;1"].
- createInstance(Ci.nsIHandlerApp);
- handlerApp.name = getFileDisplayName(defaultFeedReader);
- handlerApp.QueryInterface(Ci.nsILocalHandlerApp);
- handlerApp.executable = defaultFeedReader;
-
- this.__defaultApplicationHandler = handlerApp;
- } else {
- this.__defaultApplicationHandler = null;
- }
-
- return this.__defaultApplicationHandler;
- }
-
- get hasDefaultHandler() {
- if (AppConstants.HAVE_SHELL_SERVICE) {
- try {
- if (getShellService().defaultFeedReader)
- return true;
- } catch (ex) {
- // no default reader or getShellService() is null
- }
- }
-
- return false;
- }
-
- get defaultDescription() {
- if (this.hasDefaultHandler)
- return this._defaultApplicationHandler.name;
-
- // Should we instead return null?
- return "";
- }
-
- // What to do with content of this type.
- get preferredAction() {
- switch (Preferences.get(this._prefSelectedAction).value) {
-
- case "bookmarks":
- return Ci.nsIHandlerInfo.handleInternally;
-
- case "reader": {
- let preferredApp = this.preferredApplicationHandler;
- let defaultApp = this._defaultApplicationHandler;
-
- // If we have a valid preferred app, return useSystemDefault if it's
- // the default app; otherwise return useHelperApp.
- if (gMainPane.isValidHandlerApp(preferredApp)) {
- if (defaultApp && defaultApp.equals(preferredApp))
- return Ci.nsIHandlerInfo.useSystemDefault;
-
- return Ci.nsIHandlerInfo.useHelperApp;
- }
-
- // The pref is set to "reader", but we don't have a valid preferred app.
- // What do we do now? Not sure this is the best option (perhaps we
- // should direct the user to the default app, if any), but for now let's
- // direct the user to live bookmarks.
- return Ci.nsIHandlerInfo.handleInternally;
- }
-
- // If the action is "ask", then alwaysAskBeforeHandling will override
- // the action, so it doesn't matter what we say it is, it just has to be
- // something that doesn't cause the controller to hide the type.
- case "ask":
- default:
- return Ci.nsIHandlerInfo.handleInternally;
- }
- }
-
- set preferredAction(aNewValue) {
- switch (aNewValue) {
-
- case Ci.nsIHandlerInfo.handleInternally:
- Preferences.get(this._prefSelectedReader).value = "bookmarks";
- break;
-
- case Ci.nsIHandlerInfo.useHelperApp:
- Preferences.get(this._prefSelectedAction).value = "reader";
- // The controller has already set preferredApplicationHandler
- // to the new helper app.
- break;
-
- case Ci.nsIHandlerInfo.useSystemDefault:
- Preferences.get(this._prefSelectedAction).value = "reader";
- this.preferredApplicationHandler = this._defaultApplicationHandler;
- break;
- }
- }
-
- get alwaysAskBeforeHandling() {
- return Preferences.get(this._prefSelectedAction).value == "ask";
- }
-
- set alwaysAskBeforeHandling(aNewValue) {
- if (aNewValue)
- Preferences.get(this._prefSelectedAction).value = "ask";
- else
- Preferences.get(this._prefSelectedAction).value = "reader";
- }
-
- get primaryExtension() {
- return "xml";
- }
-
- // Changes to the preferred action and handler take effect immediately
- // (we write them out to the preferences right as they happen),
- // so we when the controller calls store() after modifying the handlers,
- // the only thing we need to store is the removal of possible handlers
- // XXX Should we hold off on making the changes until this method gets called?
- store() {
- for (let app of this._possibleApplicationHandlers._removed) {
- if (app instanceof Ci.nsILocalHandlerApp) {
- let pref = Preferences.get(PREF_FEED_SELECTED_APP);
- var preferredAppFile = pref.value;
- if (preferredAppFile) {
- let preferredApp = getLocalHandlerApp(preferredAppFile);
- if (app.equals(preferredApp))
- pref.reset();
- }
- }
- }
- this._possibleApplicationHandlers._removed = [];
- }
-
- get smallIcon() {
- return this._smallIcon;
- }
-}
-
-var feedHandlerInfo = new FeedHandlerInfo(TYPE_MAYBE_FEED, {
- _prefSelectedApp: PREF_FEED_SELECTED_APP,
- _prefSelectedAction: PREF_FEED_SELECTED_ACTION,
- _prefSelectedReader: PREF_FEED_SELECTED_READER,
- _smallIcon: "chrome://browser/skin/feeds/feedIcon16.png",
- _appPrefLabel: "webFeed",
-});
-
-var videoFeedHandlerInfo = new FeedHandlerInfo(TYPE_MAYBE_VIDEO_FEED, {
- _prefSelectedApp: PREF_VIDEO_FEED_SELECTED_APP,
- _prefSelectedAction: PREF_VIDEO_FEED_SELECTED_ACTION,
- _prefSelectedReader: PREF_VIDEO_FEED_SELECTED_READER,
- _smallIcon: "chrome://browser/skin/feeds/videoFeedIcon16.png",
- _appPrefLabel: "videoPodcastFeed",
-});
-
-var audioFeedHandlerInfo = new FeedHandlerInfo(TYPE_MAYBE_AUDIO_FEED, {
- _prefSelectedApp: PREF_AUDIO_FEED_SELECTED_APP,
- _prefSelectedAction: PREF_AUDIO_FEED_SELECTED_ACTION,
- _prefSelectedReader: PREF_AUDIO_FEED_SELECTED_READER,
- _smallIcon: "chrome://browser/skin/feeds/audioFeedIcon16.png",
- _appPrefLabel: "audioPodcastFeed",
-});
-
/**
* InternalHandlerInfoWrapper provides a basic mechanism to create an internal
* mime type handler that can be enabled/disabled in the applications preference
diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp
index 4cdaa1835776..f407457575ae 100644
--- a/browser/components/shell/nsGNOMEShellService.cpp
+++ b/browser/components/shell/nsGNOMEShellService.cpp
@@ -684,9 +684,3 @@ nsGNOMEShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACStr
const char* specStr = spec.get();
return process->Run(false, &specStr, 1);
}
-
-NS_IMETHODIMP
-nsGNOMEShellService::GetDefaultFeedReader(nsIFile** _retval)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-}
diff --git a/browser/components/shell/nsIShellService.idl b/browser/components/shell/nsIShellService.idl
index adf0beafb378..e95e2ff54e5d 100644
--- a/browser/components/shell/nsIShellService.idl
+++ b/browser/components/shell/nsIShellService.idl
@@ -92,9 +92,4 @@ interface nsIShellService : nsISupports
* The uri to be loaded by the application
*/
void openApplicationWithURI(in nsIFile aApplication, in ACString aURI);
-
- /**
- * The default system handler for web feeds
- */
- readonly attribute nsIFile defaultFeedReader;
};
diff --git a/browser/components/shell/nsMacShellService.cpp b/browser/components/shell/nsMacShellService.cpp
index 1fbe50803544..67192e3e2a23 100644
--- a/browser/components/shell/nsMacShellService.cpp
+++ b/browser/components/shell/nsMacShellService.cpp
@@ -383,42 +383,3 @@ nsMacShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACStrin
return err != noErr ? NS_ERROR_FAILURE : NS_OK;
}
-
-NS_IMETHODIMP
-nsMacShellService::GetDefaultFeedReader(nsIFile** _retval)
-{
- nsresult rv = NS_ERROR_FAILURE;
- *_retval = nullptr;
-
- CFStringRef defaultHandlerID = ::LSCopyDefaultHandlerForURLScheme(CFSTR("feed"));
- if (!defaultHandlerID) {
- defaultHandlerID = ::CFStringCreateWithCString(kCFAllocatorDefault,
- SAFARI_BUNDLE_IDENTIFIER,
- kCFStringEncodingASCII);
- }
-
- CFURLRef defaultHandlerURL = nullptr;
- OSStatus status = ::LSFindApplicationForInfo(kLSUnknownCreator,
- defaultHandlerID,
- nullptr, // inName
- nullptr, // outAppRef
- &defaultHandlerURL);
-
- if (status == noErr && defaultHandlerURL) {
- nsCOMPtr defaultReader =
- do_CreateInstance("@mozilla.org/file/local;1", &rv);
- if (NS_SUCCEEDED(rv)) {
- rv = defaultReader->InitWithCFURL(defaultHandlerURL);
- if (NS_SUCCEEDED(rv)) {
- NS_ADDREF(*_retval = defaultReader);
- rv = NS_OK;
- }
- }
-
- ::CFRelease(defaultHandlerURL);
- }
-
- ::CFRelease(defaultHandlerID);
-
- return rv;
-}
diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
index d79f829c6907..6ef009e1a2df 100644
--- a/browser/components/shell/nsWindowsShellService.cpp
+++ b/browser/components/shell/nsWindowsShellService.cpp
@@ -760,50 +760,3 @@ nsWindowsShellService::OpenApplicationWithURI(nsIFile* aApplication,
const char* specStr = spec.get();
return process->Run(false, &specStr, 1);
}
-
-NS_IMETHODIMP
-nsWindowsShellService::GetDefaultFeedReader(nsIFile** _retval)
-{
- *_retval = nullptr;
-
- nsresult rv;
- nsCOMPtr regKey =
- do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv);
- NS_ENSURE_SUCCESS(rv, rv);
-
- rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CLASSES_ROOT,
- NS_LITERAL_STRING("feed\\shell\\open\\command"),
- nsIWindowsRegKey::ACCESS_READ);
- NS_ENSURE_SUCCESS(rv, rv);
-
- nsAutoString path;
- rv = regKey->ReadStringValue(EmptyString(), path);
- NS_ENSURE_SUCCESS(rv, rv);
- if (path.IsEmpty())
- return NS_ERROR_FAILURE;
-
- if (path.First() == '"') {
- // Everything inside the quotes
- path = Substring(path, 1, path.FindChar('"', 1) - 1);
- }
- else {
- // Everything up to the first space
- path = Substring(path, 0, path.FindChar(' '));
- }
-
- nsCOMPtr defaultReader =
- do_CreateInstance("@mozilla.org/file/local;1", &rv);
- NS_ENSURE_SUCCESS(rv, rv);
-
- rv = defaultReader->InitWithPath(path);
- NS_ENSURE_SUCCESS(rv, rv);
-
- bool exists;
- rv = defaultReader->Exists(&exists);
- NS_ENSURE_SUCCESS(rv, rv);
- if (!exists)
- return NS_ERROR_FAILURE;
-
- NS_ADDREF(*_retval = defaultReader);
- return NS_OK;
-}
diff --git a/browser/components/uitour/test/browser_UITour_defaultBrowser.js b/browser/components/uitour/test/browser_UITour_defaultBrowser.js
index e1df366535b8..f7abd1ebc4c1 100644
--- a/browser/components/uitour/test/browser_UITour_defaultBrowser.js
+++ b/browser/components/uitour/test/browser_UITour_defaultBrowser.js
@@ -28,7 +28,6 @@ MockShellService.prototype = {
openApplication(aApplication) {},
desktopBackgroundColor: 0,
openApplicationWithURI(aApplication, aURI) {},
- defaultFeedReader: 0,
};
var mockShellService = new MockObjectRegisterer("@mozilla.org/browser/shell-service;1",
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index c2f0d01fc2c7..8b5a1a810d39 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -176,8 +176,6 @@
@BINPATH@/components/nsDNSServiceDiscovery.js
#endif
@RESPATH@/browser/components/BrowserFeeds.manifest
-@RESPATH@/browser/components/FeedConverter.js
-@RESPATH@/browser/components/FeedWriter.js
@RESPATH@/browser/components/WebContentConverter.js
@RESPATH@/browser/components/BrowserComponents.manifest
@RESPATH@/browser/components/nsBrowserContentHandler.js
diff --git a/browser/locales/en-US/browser/preferences/applicationManager.ftl b/browser/locales/en-US/browser/preferences/applicationManager.ftl
index e1692c35cc27..85442a8f3ff4 100644
--- a/browser/locales/en-US/browser/preferences/applicationManager.ftl
+++ b/browser/locales/en-US/browser/preferences/applicationManager.ftl
@@ -10,8 +10,6 @@ app-manager-remove =
.label = Remove
.accesskey = R
-app-manager-handle-webfeeds = The following applications can be used to handle Web Feeds.
-
# Variables:
# $type (String) - the URI scheme of the link (e.g. mailto:)
app-manager-handle-protocol = The following applications can be used to handle { $type } links.
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index bde78d1c48fb..ee704fff69cb 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -969,6 +969,11 @@ you can use these alternative items. Otherwise, their values should be empty. -
a positive thing. It forms the end of the (imaginary) sentence
"Slow-Loading Trackers [are] Blocked"-->
+
+
+
+
+
+
-
-
-
-
diff --git a/browser/locales/en-US/chrome/browser/feeds/subscribe.properties b/browser/locales/en-US/chrome/browser/feeds/subscribe.properties
index 122836ff0248..188ed5fb485d 100644
--- a/browser/locales/en-US/chrome/browser/feeds/subscribe.properties
+++ b/browser/locales/en-US/chrome/browser/feeds/subscribe.properties
@@ -2,49 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-linkTitleTextFormat=Go to %S
-addHandler=Add “%S” (%S) as a Feed Reader?
-addHandlerAddButton=Add Feed Reader
-addHandlerAddButtonAccesskey=A
-handlerRegistered=“%S” is already registered as a Feed Reader
-liveBookmarks=Live Bookmarks
-subscribeNow=Subscribe Now
-chooseApplicationMenuItem=Choose Application…
-chooseApplicationDialogTitle=Choose Application
-alwaysUse=Always use %S to subscribe to feeds
-mediaLabel=Media files
-
-# LOCALIZATION NOTE: The next string is for the size of the enclosed media.
-# e.g. enclosureSizeText : "50.23 MB"
-# %1$S = size (in bytes or megabytes, ...)
-# %2$S = unit of measure (bytes, KB, MB, ...)
-enclosureSizeText=%1$S %2$S
-
-bytes=bytes
-kilobyte=KB
-megabyte=MB
-gigabyte=GB
-
-# LOCALIZATION NOTE: The next three strings explains to the user what they're
-# doing.
-# e.g. alwaysUseForVideoPodcasts : "Always use Miro to subscribe to video podcasts."
-# %S = application to use (Miro, iTunes, ...)
-alwaysUseForFeeds=Always use %S to subscribe to feeds.
-alwaysUseForAudioPodcasts=Always use %S to subscribe to podcasts.
-alwaysUseForVideoPodcasts=Always use %S to subscribe to video podcasts.
-
-subscribeFeedUsing=Subscribe to this feed using
-subscribeAudioPodcastUsing=Subscribe to this podcast using
-subscribeVideoPodcastUsing=Subscribe to this video podcast using
-
-feedSubscriptionFeed1=This is a “feed” of frequently changing content on this site.
-feedSubscriptionAudioPodcast1=This is a “podcast” of frequently changing content on this site.
-feedSubscriptionVideoPodcast1=This is a “video podcast” of frequently changing content on this site.
-
-feedSubscriptionFeed2=You can subscribe to this feed to receive updates when this content changes.
-feedSubscriptionAudioPodcast2=You can subscribe to this podcast to receive updates when this content changes.
-feedSubscriptionVideoPodcast2=You can subscribe to this video podcast to receive updates when this content changes.
-
# LOCALIZATION NOTE (addProtocolHandlerMessage):
# Message displayed when adding a protocol handler:
# %1$S is the application's domain, %2$S is the type of protocol
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
index f2f0060da90a..212e17b10a10 100755
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
@@ -33,8 +33,7 @@ def test(mod, path, entity=None):
if mod == "browser" and path == "chrome/browser-region/region.properties":
# only region.properties exceptions remain, compare all others
return ("ignore"
- if (re.match(r"browser\.search\.order\.[1-9]", entity) or
- re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
+ if (re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
re.match(r"gecko\.handlerService\.schemes\.", entity) or
re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity))
else "error")
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 2f8fbcbbd26b..e0af10fab1d9 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -50,7 +50,6 @@
locale/browser/safebrowsing/phishing-afterload-warning-message.dtd (%chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd)
locale/browser/safebrowsing/report-phishing.dtd (%chrome/browser/safebrowsing/report-phishing.dtd)
locale/browser/safebrowsing/safebrowsing.properties (%chrome/browser/safebrowsing/safebrowsing.properties)
- locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd)
locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties)
locale/browser/migration/migration.dtd (%chrome/browser/migration/migration.dtd)
locale/browser/migration/migration.properties (%chrome/browser/migration/migration.properties)
diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
index e1cf1f6b316f..f092f255c035 100644
--- a/browser/locales/l10n.toml
+++ b/browser/locales/l10n.toml
@@ -179,7 +179,6 @@ locales = [
[[filters]]
path = "{l}browser/chrome/browser-region/region.properties"
key = [
- "re:^browser\\.search\\.order\\.[1-9]$",
"re:^browser\\.contentHandlers\\.types\\.[0-5]\\..*$",
"re:^gecko\\.handlerService\\.schemes\\..*$",
"re:^gecko\\.handlerService\\.defaultHandlersVersion$"
diff --git a/browser/themes/linux/feeds/feedIcon.png b/browser/themes/linux/feeds/feedIcon.png
deleted file mode 100644
index 22f181884cb2..000000000000
Binary files a/browser/themes/linux/feeds/feedIcon.png and /dev/null differ
diff --git a/browser/themes/linux/feeds/feedIcon16.png b/browser/themes/linux/feeds/feedIcon16.png
deleted file mode 100644
index a683ec79bdc3..000000000000
Binary files a/browser/themes/linux/feeds/feedIcon16.png and /dev/null differ
diff --git a/browser/themes/linux/feeds/subscribe.css b/browser/themes/linux/feeds/subscribe.css
deleted file mode 100644
index a9b59d2e1313..000000000000
--- a/browser/themes/linux/feeds/subscribe.css
+++ /dev/null
@@ -1,185 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-html {
- background: -moz-Dialog;
- font: 3mm tahoma,arial,helvetica,sans-serif;
-}
-
-#subscribeUsingDescription,
-#subscribeButton {
- display: block;
-}
-
-#subscribeUsingDescription {
- margin-bottom: 0.5em;
-}
-
-#subscribeButton {
- margin-top: 0.5em;
- margin-inline-start: auto;
-}
-
-#feedBody {
- border: 1px solid THreeDShadow;
- padding: 3em;
- padding-inline-start: 30px;
- margin: 2em auto;
- background: -moz-Field;
-}
-
-#feedHeaderContainer {
- border: 1px solid ThreeDShadow;
- border-radius: 10px;
- margin: -4em auto 0 auto;
- background-color: InfoBackground;
- -moz-appearance: -moz-gtk-info-bar;
- display: flex;
-}
-
-#feedHeaderContainerSpacer {
- flex-grow: 1;
-}
-
-#feedHeader {
- margin-top: 4.9em;
- margin-bottom: 1em;
- margin-inline-start: 1.4em;
- margin-inline-end: 1em;
- padding-inline-start: 2.9em;
- font-size: 110%;
- color: -moz-gtk-info-bar-text;
-}
-
-.feedBackground {
- background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat;
-}
-
-.videoPodcastBackground {
- background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat;
-}
-
-.audioPodcastBackground {
- background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat;
-}
-
-#feedHeader[dir="rtl"] {
- background-position: 100% 10%;
-}
-
-#feedIntroText {
- display: none;
-}
-
-#feedHeader[firstrun="true"] #feedIntroText {
- padding-top: 0.1em;
- padding-inline-start: 0.6em;
- display: block;
-}
-
-#feedHeader[firstrun="true"] > #feedSubscribeLine {
- padding-inline-start: 1.8em;
-}
-
-#feedSubscribeLine {
- padding-top: 0.2em;
- padding-inline-start: 0.5em;
-}
-
-/* Don't print subscription UI */
-@media print {
- #feedHeaderContainer {
- display: none;
- }
-}
-
-body {
- margin: 0;
- padding: 0 3em;
- color: -moz-fieldText;
- font: message-box;
-}
-
-h1 {
- font-size: 160%;
- border-bottom: 2px solid ThreeDLightShadow;
- margin: 0 0 .2em 0;
-}
-
-h2 {
- color: GrayText;
- font-size: 110%;
- font-weight: normal;
- margin: 0 0 .6em 0;
-}
-
-#feedTitleLink {
- float: right;
- margin-inline-start: .6em;
- margin-inline-end: 0;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-a[href] img {
- border: none;
-}
-
-#feedTitleContainer {
- margin-inline-start: 0;
- margin-inline-end: .6em;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-#feedTitleImage {
- margin-inline-start: .6em;
- margin-inline-end: 0;
- margin-top: 0;
- margin-bottom: 0;
- max-width: 300px;
- max-height: 150px;
-}
-
-.feedEntryContent {
- font-size: 110%;
-}
-
-.link {
- color: #0000FF;
- text-decoration: underline;
- cursor: pointer;
-}
-
-.link:hover:active {
- color: #FF0000;
-}
-
-.lastUpdated {
- font-size: 85%;
- font-weight: normal;
-}
-
-.type-icon {
- vertical-align: bottom;
- height: 16px;
- width: 16px;
-}
-
-.enclosures {
- border: 1px solid THreeDShadow;
- padding: 1em;
- margin: 1em auto;
- background: -moz-Dialog;
-}
-
-.enclosure {
- vertical-align: middle;
- margin-left: 2px;
-}
-
-.handlersMenuList > .menulist-label-box > .menulist-icon {
- max-width: 16px;
- max-height: 16px;
-}
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index ee246f4b91ad..45f959d2ab92 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -13,7 +13,6 @@ browser.jar:
skin/classic/browser/monitor_16-10.png
* skin/classic/browser/pageInfo.css
skin/classic/browser/pageInfo.png
- skin/classic/browser/page-livemarks.png
* skin/classic/browser/searchbar.css
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/slowStartup-16.png
@@ -22,9 +21,6 @@ browser.jar:
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsView.css (downloads/allDownloadsView.css)
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
- skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
- skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)
- skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css)
skin/classic/browser/notification-icons/geo-blocked.svg (notification-icons/geo-blocked.svg)
skin/classic/browser/notification-icons/geo-detailed.svg (notification-icons/geo-detailed.svg)
skin/classic/browser/notification-icons/geo.svg (notification-icons/geo.svg)
@@ -46,8 +42,3 @@ browser.jar:
skin/classic/browser/window-controls/restore.svg (window-controls/restore.svg)
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
-
-% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
-% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
-% override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
-% override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
diff --git a/browser/themes/linux/page-livemarks.png b/browser/themes/linux/page-livemarks.png
deleted file mode 100644
index 9a40b5e376ab..000000000000
Binary files a/browser/themes/linux/page-livemarks.png and /dev/null differ
diff --git a/browser/themes/linux/pageInfo.css b/browser/themes/linux/pageInfo.css
index 05a907cfdcbf..34e43b01fc64 100644
--- a/browser/themes/linux/pageInfo.css
+++ b/browser/themes/linux/pageInfo.css
@@ -40,10 +40,6 @@
-moz-image-region: rect(0px, 64px, 32px, 32px)
}
-#feedTab {
- -moz-image-region: rect(0px, 96px, 32px, 64px)
-}
-
#permTab {
-moz-image-region: rect(0px, 128px, 32px, 96px)
}
@@ -136,39 +132,6 @@ treechildren::-moz-tree-cell-text(broken) {
color: graytext;
}
-/* Feeds Tab */
-#feedPanel {
- margin-left: 2px;
- margin-right: 2px;
-}
-
-#feedtree {
- margin-bottom: 0px;
-}
-
-#feedListbox richlistitem {
- padding-top: 6px;
- padding-bottom: 6px;
- padding-inline-start: 7px;
- padding-inline-end: 7px;
- min-height: 25px;
- border-bottom: 1px dotted ThreeDShadow;
- color: -moz-FieldText;
-}
-
-#feedListbox richlistitem[selected="true"] {
- background-color: -moz-Dialog;
- color: -moz-DialogText;
-}
-
-#feedListbox {
- margin-bottom: 0;
-}
-
-.feedTitle {
- font-weight: bold;
-}
-
/* Permissions Tab */
#permList {
diff --git a/browser/themes/linux/preferences/applications.css b/browser/themes/linux/preferences/applications.css
index 8dbd78f7a28d..67af4ab0ee0c 100644
--- a/browser/themes/linux/preferences/applications.css
+++ b/browser/themes/linux/preferences/applications.css
@@ -40,11 +40,6 @@ menuitem[appHandlerIcon="save"] {
list-style-image: url("moz-icon://stock/gtk-save?size=menu");
}
-richlistitem[appHandlerIcon="feed"],
-menuitem[appHandlerIcon="feed"] {
- list-style-image: url("chrome://browser/skin/page-livemarks.png");
-}
-
richlistitem[appHandlerIcon="plugin"],
menuitem[appHandlerIcon="plugin"] {
list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
diff --git a/browser/themes/osx/feeds/feedIcon.png b/browser/themes/osx/feeds/feedIcon.png
deleted file mode 100644
index 7dcafeb8f985..000000000000
Binary files a/browser/themes/osx/feeds/feedIcon.png and /dev/null differ
diff --git a/browser/themes/osx/feeds/feedIcon16.png b/browser/themes/osx/feeds/feedIcon16.png
deleted file mode 100644
index 3a7d4616a8f1..000000000000
Binary files a/browser/themes/osx/feeds/feedIcon16.png and /dev/null differ
diff --git a/browser/themes/osx/feeds/subscribe.css b/browser/themes/osx/feeds/subscribe.css
deleted file mode 100644
index 6d1fa8da2b98..000000000000
--- a/browser/themes/osx/feeds/subscribe.css
+++ /dev/null
@@ -1,178 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-html {
- background: -moz-Dialog;
- font: 3mm tahoma,arial,helvetica,sans-serif;
-}
-
-#subscribeUsingDescription,
-#subscribeButton {
- display: block;
-}
-
-#subscribeUsingDescription {
- margin-bottom: 0.5em;
-}
-
-#subscribeButton {
- margin-top: 0.5em;
- margin-inline-start: auto;
-}
-
-#feedBody {
- border: 1px solid THreeDShadow;
- padding: 3em;
- padding-inline-start: 30px;
- margin: 2em auto;
- background: -moz-Field;
-}
-
-#feedHeaderContainer {
- display: flex;
-}
-
-#feedHeaderContainerSpacer {
- flex-grow: 1;
-}
-
-#feedHeader {
- border: 1px solid ThreeDShadow;
- border-radius: 10px;
- padding-top: 4em;
- padding-bottom: .3em;
- padding-inline-start: .3em;
- padding-inline-end: .3em;
- margin: -4em auto 0 auto;
- font-size: 110%;
- color: InfoText;
- padding: 5em 3em 0 3em;
-}
-
-.feedBackground {
- background: url("chrome://browser/skin/feeds/feedIcon.png") 1.4em 5.9em no-repeat rgb(255,255,225);
-}
-
-.videoPodcastBackground {
- background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 1.4em 5.9em no-repeat rgb(255,255,225);
-}
-
-.audioPodcastBackground {
- background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 1.4em 5.9em no-repeat rgb(255,255,225);
-}
-
-#feedHeader[firstrun="true"] #feedIntroText {
- display: block;
-}
-
-#feedIntroText {
- display: none;
- margin-inline-start: 2em;
-}
-
-#feedSubscribeLine {
- padding: 0 1em 1em 2em;
-}
-
-#feedHeader[firstrun="true"] #feedSubscribeLine {
- padding-left: 3.7em;
-}
-
-/* Don't print subscription UI */
-@media print {
- #feedHeaderContainer {
- display: none;
- }
-}
-
-body {
- margin: 0;
- padding: 0 3em;
- color: -moz-fieldText;
- font: message-box;
-}
-
-h1 {
- font-size: 160%;
- border-bottom: 2px solid ThreeDLightShadow;
- margin: 0 0 .2em 0;
-}
-
-h2 {
- color: #C0C0C0;
- font-size: 110%;
- font-weight: normal;
- margin: 0 0 .6em 0;
-}
-
-#feedTitleLink {
- float: right;
- margin-inline-start: .6em;
- margin-inline-end: 0;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-a[href] img {
- border: none;
-}
-
-#feedTitleContainer {
- margin-inline-start: 0;
- margin-inline-end: .6em;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-#feedTitleImage {
- margin-inline-start: .6em;
- margin-inline-end: 0;
- margin-top: 0;
- margin-bottom: 0;
- max-width: 300px;
- max-height: 150px;
-}
-
-.feedEntryContent {
- font-size: 110%;
-}
-
-.link {
- color: #0000FF;
- text-decoration: underline;
- cursor: pointer;
- margin-top: -2px;
-}
-
-.link:hover:active {
- color: #FF0000;
-}
-
-.lastUpdated {
- font-size: 85%;
- font-weight: normal;
-}
-
-.type-icon {
- vertical-align: bottom;
- height: 16px;
- width: 16px;
-}
-
-.enclosures {
- border: 1px solid THreeDShadow;
- padding: 1em;
- margin: 1em auto;
- background: -moz-Dialog;
-}
-
-.enclosure {
- vertical-align: middle;
- margin-left: 2px;
-}
-
-.handlersMenuList > .menulist-label-box > .menulist-icon {
- max-width: 16px;
- max-height: 16px;
-}
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 86cadccff6be..b330f4dbd456 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -14,7 +14,6 @@ browser.jar:
skin/classic/browser/panel-expander-open.png
skin/classic/browser/panel-expander-open@2x.png
skin/classic/browser/panel-plus-sign.png
- skin/classic/browser/page-livemarks.png
* skin/classic/browser/pageInfo.css
* skin/classic/browser/searchbar.css
skin/classic/browser/slowStartup-16.png
@@ -25,9 +24,6 @@ browser.jar:
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsView.css (downloads/allDownloadsView.css)
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
- skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css)
- skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
- skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
@@ -52,8 +48,4 @@ browser.jar:
skin/classic/browser/tabbrowser/tabDragIndicator@2x.png (tabbrowser/tabDragIndicator@2x.png)
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
-% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
-% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
-% override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
-% override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/notification-icons/geo-detailed.svg chrome://browser/skin/notification-icons/geo.svg
diff --git a/browser/themes/osx/page-livemarks.png b/browser/themes/osx/page-livemarks.png
deleted file mode 100644
index 0f792e9e6317..000000000000
Binary files a/browser/themes/osx/page-livemarks.png and /dev/null differ
diff --git a/browser/themes/osx/pageInfo.css b/browser/themes/osx/pageInfo.css
index 85075a105871..fc03e1f4a378 100644
--- a/browser/themes/osx/pageInfo.css
+++ b/browser/themes/osx/pageInfo.css
@@ -109,29 +109,6 @@ treechildren::-moz-tree-cell-text(broken) {
color: graytext;
}
-/* Feeds Tab */
-#feedtree {
- margin-bottom: 0px;
-}
-
-#feedListbox richlistitem {
- padding-top: 6px;
- padding-bottom: 6px;
- padding-inline-start: 7px;
- padding-inline-end: 7px;
- min-height: 25px;
- border-bottom: 1px dotted ThreeDShadow;
-}
-
-#feedListbox richlistitem[selected="true"] {
- background-color: -moz-Dialog;
- color: -moz-DialogText;
-}
-
-.feedTitle {
- font-weight: bold;
-}
-
/* Permissions Tab */
#permList {
margin: .5em;
diff --git a/browser/themes/osx/preferences/applications.css b/browser/themes/osx/preferences/applications.css
index 4f69bcbfb929..41a2ee1f8354 100644
--- a/browser/themes/osx/preferences/applications.css
+++ b/browser/themes/osx/preferences/applications.css
@@ -51,11 +51,6 @@ menuitem[appHandlerIcon="save"] {
list-style-image: url("chrome://browser/skin/preferences/saveFile.png");
}
-richlistitem[appHandlerIcon="feed"],
-menuitem[appHandlerIcon="feed"] {
- list-style-image: url("chrome://browser/skin/page-livemarks.png");
-}
-
richlistitem[appHandlerIcon="plugin"],
menuitem[appHandlerIcon="plugin"] {
list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 9de31faebd5d..25c19520b4b5 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -886,11 +886,6 @@ notification[value="translation"] {
}
/* Bookmarks roots menu-items */
-#subscribeToPageMenuitem:not([disabled]),
-#subscribeToPageMenupopup {
- list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
-}
-
#bookmarksToolbarFolderMenu,
#BMB_bookmarksToolbar,
#panelMenu_bookmarksToolbar {
diff --git a/browser/themes/windows/feeds/feedIcon.png b/browser/themes/windows/feeds/feedIcon.png
deleted file mode 100644
index c930a099e5fe..000000000000
Binary files a/browser/themes/windows/feeds/feedIcon.png and /dev/null differ
diff --git a/browser/themes/windows/feeds/feedIcon16.png b/browser/themes/windows/feeds/feedIcon16.png
deleted file mode 100644
index 58bab3228e0b..000000000000
Binary files a/browser/themes/windows/feeds/feedIcon16.png and /dev/null differ
diff --git a/browser/themes/windows/feeds/subscribe.css b/browser/themes/windows/feeds/subscribe.css
deleted file mode 100644
index 81168a144315..000000000000
--- a/browser/themes/windows/feeds/subscribe.css
+++ /dev/null
@@ -1,184 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-html {
- background: -moz-Dialog;
- font: 3mm tahoma,arial,helvetica,sans-serif;
-}
-
-#subscribeUsingDescription,
-#subscribeButton {
- display: block;
-}
-
-#subscribeUsingDescription {
- margin-bottom: 0.5em;
-}
-
-#subscribeButton {
- margin-top: 0.5em;
- margin-inline-start: auto;
-}
-
-#feedBody {
- border: 1px solid THreeDShadow;
- padding: 3em;
- padding-inline-start: 30px;
- margin: 2em auto;
- background: -moz-Field;
-}
-
-#feedHeaderContainer {
- border: 1px solid ThreeDShadow;
- border-radius: 10px;
- margin: -4em auto 0 auto;
- background-color: InfoBackground;
- display: flex;
-}
-
-#feedHeaderContainerSpacer {
- flex-grow: 1;
-}
-
-#feedHeader {
- margin-top: 4.9em;
- margin-bottom: 1em;
- margin-inline-start: 1.4em;
- margin-inline-end: 1em;
- padding-inline-start: 2.9em;
- font-size: 110%;
- color: InfoText;
-}
-
-#feedIntroText {
- display: none;
-}
-
-.feedBackground {
- background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-.videoPodcastBackground {
- background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-.audioPodcastBackground {
- background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-#feedHeader[dir="rtl"] {
- background-position: 100% 10%;
-}
-
-#feedHeader[firstrun="true"] #feedIntroText {
- padding-top: 0.1em;
- padding-inline-start: 0.6em;
- display: block;
-}
-
-#feedHeader[firstrun="true"] > #feedSubscribeLine {
- padding-inline-start: 1.8em;
-}
-
-#feedSubscribeLine {
- padding-top: 0.2em;
- padding-inline-start: 0.5em;
-}
-
-/* Don't print subscription UI */
-@media print {
- #feedHeaderContainer {
- display: none;
- }
-}
-
-body {
- margin: 0;
- padding: 0 3em;
- color: -moz-fieldText;
- font: message-box;
-}
-
-h1 {
- font-size: 160%;
- border-bottom: 2px solid ThreeDLightShadow;
- margin: 0 0 .2em 0;
-}
-
-h2 {
- color: GrayText;
- font-size: 110%;
- font-weight: normal;
- margin: 0 0 .6em 0;
-}
-
-#feedTitleLink {
- float: right;
- margin-inline-start: .6em;
- margin-inline-end: 0;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-a[href] img {
- border: none;
-}
-
-#feedTitleContainer {
- margin-inline-start: 0;
- margin-inline-end: .6em;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-#feedTitleImage {
- margin-inline-start: .6em;
- margin-inline-end: 0;
- margin-top: 0;
- margin-bottom: 0;
- max-width: 300px;
- max-height: 150px;
-}
-
-.feedEntryContent {
- font-size: 110%;
-}
-
-.link {
- color: #0000FF;
- text-decoration: underline;
- cursor: pointer;
-}
-
-.link:hover:active {
- color: #FF0000;
-}
-
-.lastUpdated {
- font-size: 85%;
- font-weight: normal;
-}
-
-.type-icon {
- vertical-align: bottom;
- height: 16px;
- width: 16px;
-}
-
-.enclosures {
- border: 1px solid THreeDShadow;
- padding: 1em;
- margin: 1em auto;
- background: -moz-Dialog;
-}
-
-.enclosure {
- vertical-align: middle;
- margin-left: 2px;
-}
-
-.handlersMenuList > .menulist-label-box > .menulist-icon {
- max-width: 16px;
- max-height: 16px;
-}
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 57e60ea7cbaa..4ad2c7025216 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -21,9 +21,6 @@ browser.jar:
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsView.css (downloads/allDownloadsView.css)
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
- skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
- skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)
- skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css)
skin/classic/browser/notification-icons/geo-blocked.svg (notification-icons/geo-blocked.svg)
skin/classic/browser/notification-icons/geo-detailed.svg (notification-icons/geo-detailed.svg)
skin/classic/browser/notification-icons/geo.svg (notification-icons/geo.svg)
@@ -56,9 +53,3 @@ browser.jar:
skin/classic/browser/window-controls/restore-highcontrast.svg (window-controls/restore-highcontrast.svg)
skin/classic/browser/window-controls/restore-themes.svg (window-controls/restore-themes.svg)
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
-
-% override chrome://browser/skin/page-livemarks.png chrome://browser/skin/feeds/feedIcon16.png
-% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
-% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
-% override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
-% override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
diff --git a/browser/themes/windows/pageInfo.css b/browser/themes/windows/pageInfo.css
index 5b998fa66f7b..78189226bcff 100644
--- a/browser/themes/windows/pageInfo.css
+++ b/browser/themes/windows/pageInfo.css
@@ -58,15 +58,6 @@
-moz-image-region: rect(32px, 64px, 64px, 32px)
}
-#feedTab {
- -moz-image-region: rect(0px, 96px, 32px, 64px)
-}
-
-#feedTab:hover,
-#feedTab[selected="true"] {
- -moz-image-region: rect(32px, 96px, 64px, 64px)
-}
-
#permTab {
-moz-image-region: rect(0px, 128px, 32px, 96px)
}
@@ -161,29 +152,6 @@ treechildren::-moz-tree-cell-text(broken) {
color: graytext;
}
-/* Feeds Tab */
-#feedtree {
- margin-bottom: 0px;
-}
-
-#feedListbox richlistitem {
- padding-top: 6px;
- padding-bottom: 6px;
- padding-inline-start: 7px;
- padding-inline-end: 7px;
- min-height: 25px;
- border-bottom: 1px dotted ThreeDShadow;
-}
-
-#feedListbox richlistitem[selected="true"] {
- background-color: -moz-Dialog;
- color: -moz-DialogText;
-}
-
-.feedTitle {
- font-weight: bold;
-}
-
/* Permissions Tab */
#permList {
margin: .5em;
diff --git a/browser/themes/windows/preferences/applications.css b/browser/themes/windows/preferences/applications.css
index 1a10f9c17838..08680189af0b 100644
--- a/browser/themes/windows/preferences/applications.css
+++ b/browser/themes/windows/preferences/applications.css
@@ -40,11 +40,6 @@ menuitem[appHandlerIcon="save"] {
list-style-image: url("chrome://browser/skin/preferences/saveFile.png");
}
-richlistitem[appHandlerIcon="feed"],
-menuitem[appHandlerIcon="feed"] {
- list-style-image: url("chrome://browser/skin/page-livemarks.png");
-}
-
richlistitem[appHandlerIcon="plugin"],
menuitem[appHandlerIcon="plugin"] {
list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
diff --git a/devtools/client/aboutdebugging-new/aboutdebugging.css b/devtools/client/aboutdebugging-new/aboutdebugging.css
index 71a2ac3537af..7a7b4c4a4658 100644
--- a/devtools/client/aboutdebugging-new/aboutdebugging.css
+++ b/devtools/client/aboutdebugging-new/aboutdebugging.css
@@ -14,9 +14,10 @@
@import "resource://devtools/client/aboutdebugging-new/src/components/debugtarget/DebugTargetPane.css";
@import "resource://devtools/client/aboutdebugging-new/src/components/debugtarget/ExtensionDetail.css";
@import "resource://devtools/client/aboutdebugging-new/src/components/debugtarget/WorkerDetail.css";
-@import "resource://devtools/client/aboutdebugging-new/src/components/sidebar/DeviceSidebarItemAction.css";
@import "resource://devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.css";
+@import "resource://devtools/client/aboutdebugging-new/src/components/sidebar/SidebarFixedItem.css";
@import "resource://devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.css";
+@import "resource://devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.css";
:root {
/* Import css variables from common.css */
diff --git a/devtools/client/aboutdebugging-new/src/actions/runtimes.js b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
index 9e5a5e682b55..5c66e158c5ca 100644
--- a/devtools/client/aboutdebugging-new/src/actions/runtimes.js
+++ b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
@@ -55,15 +55,15 @@ async function createUSBClient(socketPath) {
}
async function createClientForRuntime(runtime) {
- const { connectionParameters, type } = runtime;
+ const { extra, type } = runtime;
if (type === RUNTIMES.THIS_FIREFOX) {
return createLocalClient();
} else if (type === RUNTIMES.NETWORK) {
- const { host, port } = connectionParameters;
+ const { host, port } = extra.connectionParameters;
return createNetworkClient(host, port);
} else if (type === RUNTIMES.USB) {
- const { socketPath } = connectionParameters;
+ const { socketPath } = extra.connectionParameters;
return createUSBClient(socketPath);
}
@@ -71,7 +71,7 @@ async function createClientForRuntime(runtime) {
}
async function getRuntimeInfo(runtime, client) {
- const { model, type } = runtime;
+ const { extra, type } = runtime;
const deviceFront = await client.mainRoot.getFront("device");
const { brandName: name, channel, version } = await deviceFront.getDescription();
const icon =
@@ -81,7 +81,7 @@ async function getRuntimeInfo(runtime, client) {
return {
icon,
- model,
+ deviceName: extra ? extra.deviceName : undefined,
name,
type,
version,
diff --git a/devtools/client/aboutdebugging-new/src/components/RuntimeInfo.js b/devtools/client/aboutdebugging-new/src/components/RuntimeInfo.js
index 5aaa7e25d4be..2d805efaf14d 100644
--- a/devtools/client/aboutdebugging-new/src/components/RuntimeInfo.js
+++ b/devtools/client/aboutdebugging-new/src/components/RuntimeInfo.js
@@ -18,14 +18,14 @@ class RuntimeInfo extends PureComponent {
static get propTypes() {
return {
icon: PropTypes.string.isRequired,
- model: PropTypes.string,
+ deviceName: PropTypes.string,
name: PropTypes.string.isRequired,
version: PropTypes.string.isRequired,
};
}
render() {
- const { icon, model, name, version } = this.props;
+ const { icon, deviceName, name, version } = this.props;
return dom.h1(
{
@@ -39,13 +39,13 @@ class RuntimeInfo extends PureComponent {
),
Localized(
{
- id: model ? "about-debugging-runtime-info-with-model"
- : "about-debugging-runtime-info",
+ id: deviceName ? "about-debugging-runtime-info-with-model"
+ : "about-debugging-runtime-info",
$name: name,
- $model: model,
+ $deviceName: deviceName,
$version: version,
},
- dom.label({}, `${ name } on ${ model } (${ version })`)
+ dom.label({}, `${ name } on ${ deviceName } (${ version })`)
)
);
}
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/DeviceSidebarItemAction.css b/devtools/client/aboutdebugging-new/src/components/sidebar/DeviceSidebarItemAction.css
deleted file mode 100644
index cbeb95f39d78..000000000000
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/DeviceSidebarItemAction.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.sidebar-item__connect-button {
- font-size: 0.8em;
-}
\ No newline at end of file
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/DeviceSidebarItemAction.js b/devtools/client/aboutdebugging-new/src/components/sidebar/DeviceSidebarItemAction.js
deleted file mode 100644
index 1327b8681844..000000000000
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/DeviceSidebarItemAction.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const { createFactory, PureComponent } = require("devtools/client/shared/vendor/react");
-const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-
-const FluentReact = require("devtools/client/shared/vendor/fluent-react");
-const Localized = createFactory(FluentReact.Localized);
-
-const Actions = require("../../actions/index");
-
-/**
- * This component displays actions for sidebar items representing a device.
- */
-class DeviceSidebarItemAction extends PureComponent {
- static get propTypes() {
- return {
- connected: PropTypes.bool.isRequired,
- dispatch: PropTypes.func.isRequired,
- runtimeId: PropTypes.string.isRequired,
- };
- }
-
- render() {
- const { connected } = this.props;
- if (connected) {
- return Localized(
- {
- id: "about-debugging-sidebar-item-connected-label"
- },
- dom.span({}, "Connected")
- );
- }
-
- return Localized(
- {
- id: "about-debugging-sidebar-item-connect-button"
- },
- dom.button(
- {
- className: "sidebar-item__connect-button",
- onClick: () => {
- const { dispatch, runtimeId } = this.props;
- dispatch(Actions.connectRuntime(runtimeId));
- }
- },
- "Connect"
- )
- );
- }
-}
-
-module.exports = DeviceSidebarItemAction;
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
index 488bb578c0a9..ea45cd04d9d9 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/Sidebar.js
@@ -13,8 +13,8 @@ const Localized = createFactory(FluentReact.Localized);
const { PAGES, RUNTIMES } = require("../../constants");
-const DeviceSidebarItemAction = createFactory(require("./DeviceSidebarItemAction"));
-const SidebarItem = createFactory(require("./SidebarItem"));
+const SidebarFixedItem = createFactory(require("./SidebarFixedItem"));
+const SidebarRuntimeItem = createFactory(require("./SidebarRuntimeItem"));
const FIREFOX_ICON = "chrome://devtools/skin/images/aboutdebugging-firefox-logo.svg";
const CONNECT_ICON = "chrome://devtools/skin/images/aboutdebugging-connect-icon.svg";
const GLOBE_ICON = "chrome://devtools/skin/images/aboutdebugging-globe-icon.svg";
@@ -58,22 +58,16 @@ class Sidebar extends PureComponent {
const pageId = runtime.type + "-" + runtime.id;
const runtimeHasConnection = !!runtime.connection;
- const connectComponent = DeviceSidebarItemAction({
- connected: runtimeHasConnection,
- dispatch,
- runtimeId: runtime.id,
- });
-
- return SidebarItem({
- connectComponent,
+ return SidebarRuntimeItem({
id: pageId,
+ deviceName: runtime.extra.deviceName,
dispatch,
icon,
+ isConnected: runtimeHasConnection,
isSelected: selectedPage === pageId,
key: pageId,
name: runtime.name,
runtimeId: runtime.id,
- selectable: runtimeHasConnection,
});
});
}
@@ -89,25 +83,23 @@ class Sidebar extends PureComponent {
{},
Localized(
{ id: "about-debugging-sidebar-this-firefox", attrs: { name: true } },
- SidebarItem({
+ SidebarFixedItem({
id: PAGES.THIS_FIREFOX,
dispatch,
icon: FIREFOX_ICON,
isSelected: PAGES.THIS_FIREFOX === selectedPage,
name: "This Firefox",
runtimeId: RUNTIMES.THIS_FIREFOX,
- selectable: true,
})
),
Localized(
{ id: "about-debugging-sidebar-connect", attrs: { name: true } },
- SidebarItem({
+ SidebarFixedItem({
id: PAGES.CONNECT,
dispatch,
icon: CONNECT_ICON,
isSelected: PAGES.CONNECT === selectedPage,
name: "Connect",
- selectable: true,
})
),
dom.hr(),
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarFixedItem.css b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarFixedItem.css
new file mode 100644
index 000000000000..af85d1bd22b6
--- /dev/null
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarFixedItem.css
@@ -0,0 +1,31 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * Layout of a fixed sidebar item
+ *
+ * +--------+----------------+
+ * | Icon | Name |
+ * +--------+----------------+
+ */
+
+.sidebar-fixed-item {
+ align-items: center;
+ border-radius: 2px;
+ display: grid;
+ grid-template-columns: 34px 1fr;
+ font-size: 16px;
+ height: 48px;
+ padding-inline-end: 10px;
+ padding-inline-start: 10px;
+}
+
+.sidebar-fixed-item__icon {
+ fill: currentColor;
+ height: 24px;
+ margin-inline-end: 9px;
+ width: 24px;
+ -moz-context-properties: fill;
+}
+
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarFixedItem.js b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarFixedItem.js
new file mode 100644
index 000000000000..1225c96e6d16
--- /dev/null
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarFixedItem.js
@@ -0,0 +1,66 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { PureComponent, createFactory } = require("devtools/client/shared/vendor/react");
+const dom = require("devtools/client/shared/vendor/react-dom-factories");
+const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
+
+const SidebarItem = createFactory(require("./SidebarItem"));
+
+const Actions = require("../../actions/index");
+
+/**
+ * This component displays a fixed item in the Sidebar component.
+ */
+class SidebarFixedItem extends PureComponent {
+ static get propTypes() {
+ return {
+ dispatch: PropTypes.func.isRequired,
+ icon: PropTypes.string.isRequired,
+ id: PropTypes.string.isRequired,
+ isSelected: PropTypes.bool.isRequired,
+ name: PropTypes.string.isRequired,
+ runtimeId: PropTypes.string,
+ };
+ }
+
+ render() {
+ const {
+ dispatch,
+ id,
+ icon,
+ isSelected,
+ name,
+ runtimeId,
+ } = this.props;
+
+ return SidebarItem(
+ {
+ isSelected,
+ selectable: true,
+ className: "sidebar-fixed-item",
+ onSelect: () => {
+ dispatch(Actions.selectPage(id, runtimeId));
+ }
+ },
+ dom.img(
+ {
+ className: "sidebar-fixed-item__icon",
+ src: icon,
+ }
+ ),
+ dom.span(
+ {
+ className: "ellipsis-text",
+ title: name,
+ },
+ name
+ )
+ );
+ }
+}
+
+module.exports = SidebarFixedItem;
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.css b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.css
index 83c6e2750c9d..60a121a6670e 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.css
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.css
@@ -9,21 +9,9 @@
--sidebar-background-hover: var(--in-content-category-background-hover);
}
-/*
- * Layout of a sidebar item
- *
- * +--------+----------------+---------------------------+
- * | Icon | Name | Connect button (optional) |
- * +--------+----------------+---------------------------+
- */
.sidebar-item {
- align-items: center;
- border-radius: 2px;
color: var(--sidebar-text-color);
- display: grid;
- grid-template-columns: 34px auto max-content;
- font-size: 16px;
- height: 48px;
+ border-radius: 2px;
padding-inline-end: 10px;
padding-inline-start: 10px;
transition: background-color 150ms;
@@ -38,14 +26,6 @@
background-color: var(--sidebar-background-hover);
}
-.sidebar-item__icon {
- fill: currentColor;
- height: 24px;
- margin-inline-end: 9px;
- width: 24px;
- -moz-context-properties: fill;
-}
-
.sidebar-item--selected {
color: var(--sidebar-selected-color);
}
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.js b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.js
index f6ed94cfe19d..27d0becae6c5 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.js
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarItem.js
@@ -8,36 +8,31 @@ const { PureComponent } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Actions = require("../../actions/index");
-
/**
- * This component displays an item of the Sidebar component.
+ * This component is used as a wrapper by items in the sidebar.
*/
class SidebarItem extends PureComponent {
static get propTypes() {
return {
- connectComponent: PropTypes.any,
- dispatch: PropTypes.func.isRequired,
- icon: PropTypes.string.isRequired,
- id: PropTypes.string.isRequired,
+ children: PropTypes.arrayOf(PropTypes.element).isRequired,
+ className: PropTypes.string,
isSelected: PropTypes.bool.isRequired,
- name: PropTypes.string.isRequired,
- runtimeId: PropTypes.string,
selectable: PropTypes.bool.isRequired,
+ onSelect: PropTypes.func.isRequired,
};
}
onItemClick() {
- const { id, dispatch, runtimeId } = this.props;
- dispatch(Actions.selectPage(id, runtimeId));
+ this.props.onSelect();
}
render() {
- const { connectComponent, icon, isSelected, name, selectable } = this.props;
+ const {children, className, isSelected, selectable } = this.props;
return dom.li(
{
className: "sidebar-item js-sidebar-item" +
+ (className ? ` ${className}` : "") +
(isSelected ?
" sidebar-item--selected js-sidebar-item-selected" :
""
@@ -45,17 +40,7 @@ class SidebarItem extends PureComponent {
(selectable ? " sidebar-item--selectable" : ""),
onClick: selectable ? () => this.onItemClick() : null
},
- dom.img({
- className: "sidebar-item__icon",
- src: icon,
- }),
- dom.span(
- {
- className: "ellipsis-text",
- title: name,
- },
- name),
- connectComponent ? connectComponent : null
+ children
);
}
}
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.css b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.css
new file mode 100644
index 000000000000..d1948c738a57
--- /dev/null
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.css
@@ -0,0 +1,25 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * Layout of a runtime sidebar item
+ *
+ * +--------+----------------+---------------------------+
+ * | Icon | Runtime name | Connect button |
+ * +--------+----------------+---------------------------+
+ */
+
+.sidebar-runtime-item {
+ font-size: 0.8em;
+ align-items: center;
+ display: grid;
+ grid-column-gap: var(--base-distance);
+ grid-template-columns: 20px 1fr auto;
+}
+
+.sidebar-runtime-item__icon {
+ fill: currentColor;
+ -moz-context-properties: fill;
+ margin-inline-end: var(--base-distance);
+}
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
new file mode 100644
index 000000000000..8dad98715c40
--- /dev/null
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/SidebarRuntimeItem.js
@@ -0,0 +1,117 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { createFactory, PureComponent } = require("devtools/client/shared/vendor/react");
+const dom = require("devtools/client/shared/vendor/react-dom-factories");
+const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
+
+const FluentReact = require("devtools/client/shared/vendor/fluent-react");
+const Localized = createFactory(FluentReact.Localized);
+
+const SidebarItem = createFactory(require("./SidebarItem"));
+const Actions = require("../../actions/index");
+
+/**
+ * This component displays a runtime item of the Sidebar component.
+ */
+class SidebarRuntimeItem extends PureComponent {
+ static get propTypes() {
+ return {
+ id: PropTypes.string.isRequired,
+ deviceName: PropTypes.string,
+ dispatch: PropTypes.func.isRequired,
+ // Provided by wrapping the component with FluentReact.withLocalization.
+ getString: PropTypes.func.isRequired,
+ icon: PropTypes.string.isRequired,
+ isConnected: PropTypes.bool.isRequired,
+ isSelected: PropTypes.bool.isRequired,
+ name: PropTypes.string.isRequired,
+ runtimeId: PropTypes.string.isRequired,
+ };
+ }
+
+ renderConnectButton() {
+ return Localized(
+ {
+ id: "about-debugging-sidebar-item-connect-button"
+ },
+ dom.button(
+ {
+ className: "sidebar-item__connect-button",
+ onClick: () => {
+ const { dispatch, runtimeId } = this.props;
+ dispatch(Actions.connectRuntime(runtimeId));
+ }
+ },
+ "Connect"
+ )
+ );
+ }
+
+ renderNameWithDevice(name, device) {
+ return dom.span(
+ {
+ className: "ellipsis-text",
+ title: `${name} (${device})`
+ },
+ `${name}`,
+ dom.br({}),
+ device
+ );
+ }
+
+ renderName(name) {
+ return dom.span(
+ {
+ className: "ellipsis-text",
+ title: name
+ },
+ `${name}`
+ );
+ }
+
+ render() {
+ const {
+ deviceName,
+ dispatch,
+ getString,
+ icon,
+ id,
+ isConnected,
+ isSelected,
+ name,
+ runtimeId,
+ } = this.props;
+
+ const connectionStatus = isConnected ?
+ getString("aboutdebugging-sidebar-runtime-connection-status-connected") :
+ getString("aboutdebugging-sidebar-runtime-connection-status-disconnected");
+
+ return SidebarItem(
+ {
+ isSelected,
+ selectable: isConnected,
+ className: "sidebar-runtime-item",
+ onSelect: () => {
+ dispatch(Actions.selectPage(id, runtimeId));
+ }
+ },
+ dom.img(
+ {
+ className: "sidebar-runtime-item__icon " +
+ `${isConnected ? "sidebar-runtime-item__icon--connected" : "" }`,
+ src: icon,
+ alt: connectionStatus,
+ title: connectionStatus
+ }
+ ),
+ deviceName ? this.renderNameWithDevice(name, deviceName) : this.renderName(name),
+ !isConnected ? this.renderConnectButton() : null
+ );
+ }
+}
+
+module.exports = FluentReact.withLocalization(SidebarRuntimeItem);
diff --git a/devtools/client/aboutdebugging-new/src/components/sidebar/moz.build b/devtools/client/aboutdebugging-new/src/components/sidebar/moz.build
index 083e6c9f3559..18eb7cad2744 100644
--- a/devtools/client/aboutdebugging-new/src/components/sidebar/moz.build
+++ b/devtools/client/aboutdebugging-new/src/components/sidebar/moz.build
@@ -3,10 +3,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DevToolsModules(
- 'DeviceSidebarItemAction.css',
- 'DeviceSidebarItemAction.js',
'Sidebar.css',
'Sidebar.js',
+ 'SidebarFixedItem.css',
+ 'SidebarFixedItem.js',
'SidebarItem.css',
'SidebarItem.js',
+ 'SidebarRuntimeItem.css',
+ 'SidebarRuntimeItem.js',
)
diff --git a/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js b/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
index fb01f8edf44c..d05c03722fb9 100644
--- a/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
+++ b/devtools/client/aboutdebugging-new/src/reducers/runtimes-state.js
@@ -82,8 +82,10 @@ function runtimesReducer(state = RuntimesState(), action) {
const networkRuntimes = locations.map(location => {
const [ host, port ] = location.split(":");
return {
- connectionParameters: { host, port },
id: location,
+ extra: {
+ connectionParameters: { host, port },
+ },
name: location,
type: RUNTIMES.NETWORK,
};
@@ -99,10 +101,12 @@ function runtimesReducer(state = RuntimesState(), action) {
const { runtimes } = action;
const usbRuntimes = runtimes.map(runtime => {
return {
- connectionParameters: { socketPath: runtime._socketPath },
id: runtime.id,
- model: runtime._model,
- name: runtime.name,
+ extra: {
+ connectionParameters: { socketPath: runtime._socketPath },
+ deviceName: runtime.deviceName,
+ },
+ name: runtime.shortName,
type: RUNTIMES.USB,
};
});
diff --git a/devtools/client/aboutdebugging-new/tmp-locale/en-US/aboutdebugging.notftl b/devtools/client/aboutdebugging-new/tmp-locale/en-US/aboutdebugging.notftl
index 7bcb5f07f7d9..ac0df009222f 100644
--- a/devtools/client/aboutdebugging-new/tmp-locale/en-US/aboutdebugging.notftl
+++ b/devtools/client/aboutdebugging-new/tmp-locale/en-US/aboutdebugging.notftl
@@ -13,6 +13,11 @@ about-debugging-sidebar-this-firefox =
about-debugging-sidebar-connect =
.name = Connect
+# Connection status (connected) for runtime items in the sidebar
+aboutdebugging-sidebar-runtime-connection-status-connected = Connected
+# Connection status (disconnected) for runtime items in the sidebar
+aboutdebugging-sidebar-runtime-connection-status-disconnected = Disconnected
+
# Text displayed in the about:debugging sidebar when no device was found.
about-debugging-sidebar-no-devices = No devices discovered
@@ -173,8 +178,8 @@ about-debugging-worker-status-registering = Registering
# { $version } is version such as "64.0a1"
about-debugging-runtime-info = { $name } ({ $version })
-# Displayed for runtime info in runtime page when we display the model as well.
+# Displayed for runtime info in runtime page when we display the device model as well.
# { $name } is brand name such as "Firefox Nightly"
# { $version } is version such as "64.0a1"
-# { $model } is model name of device
-about-debugging-runtime-info-with-model = { $name } on { $model } ({ $version })
+# { $deviceName } is model name of device
+about-debugging-runtime-info-with-model = { $name } on { $deviceName } ({ $version })
diff --git a/devtools/client/debugger/test/mochitest/head.js b/devtools/client/debugger/test/mochitest/head.js
index 63db76e75fc6..be903a2b267f 100644
--- a/devtools/client/debugger/test/mochitest/head.js
+++ b/devtools/client/debugger/test/mochitest/head.js
@@ -1119,14 +1119,10 @@ function attachThread(workerClient, options) {
return workerClient.attachThread(options);
}
-function waitForWorkerClose(workerClient) {
+async function waitForWorkerClose(workerClient) {
info("Waiting for worker to close.");
- return new Promise(function (resolve) {
- workerClient.addOneTimeListener("close", function () {
- info("Worker did close.");
- resolve();
- });
- });
+ await workerClient.once("close");
+ info("Worker did close.");
}
function resume(threadClient) {
diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
index cceedc639de1..ea432378fba8 100644
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -265,6 +265,8 @@ devtools.jar:
skin/tooltip/arrow-vertical-light.png (themes/tooltip/arrow-vertical-light.png)
skin/tooltip/arrow-vertical-light@2x.png (themes/tooltip/arrow-vertical-light@2x.png)
skin/images/reload.svg (themes/images/reload.svg)
+ skin/images/file-type-general.svg (netmonitor/src/assets/icons/file-type-general.svg)
+ skin/images/file-type-image.svg (netmonitor/src/assets/icons/file-type-image.svg)
skin/images/security-state-broken.svg (themes/images/security-state-broken.svg)
skin/images/security-state-insecure.svg (themes/images/security-state-insecure.svg)
skin/images/security-state-secure.svg (themes/images/security-state-secure.svg)
diff --git a/devtools/client/netmonitor/src/assets/icons/file-type-general.svg b/devtools/client/netmonitor/src/assets/icons/file-type-general.svg
new file mode 100644
index 000000000000..76a2ba3a2874
--- /dev/null
+++ b/devtools/client/netmonitor/src/assets/icons/file-type-general.svg
@@ -0,0 +1,7 @@
+
+
+
diff --git a/devtools/client/netmonitor/src/assets/icons/file-type-image.svg b/devtools/client/netmonitor/src/assets/icons/file-type-image.svg
new file mode 100644
index 000000000000..71b48322310a
--- /dev/null
+++ b/devtools/client/netmonitor/src/assets/icons/file-type-image.svg
@@ -0,0 +1,7 @@
+
+
+
diff --git a/devtools/client/netmonitor/src/assets/styles/RequestList.css b/devtools/client/netmonitor/src/assets/styles/RequestList.css
index a7f3a6cf3f3c..24793b503249 100644
--- a/devtools/client/netmonitor/src/assets/styles/RequestList.css
+++ b/devtools/client/netmonitor/src/assets/styles/RequestList.css
@@ -283,6 +283,26 @@
text-align: start;
}
+.requests-file-type-icon {
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ margin: 0 4px;
+ vertical-align: text-bottom;
+}
+
+.request-list-item.selected .requests-file-type-icon {
+ filter: brightness(1.3);
+}
+
+.file-type-general {
+ background-image: url(chrome://devtools/skin/images/file-type-general.svg);
+}
+
+.file-type-image {
+ background-image: url(chrome://devtools/skin/images/file-type-image.svg);
+}
+
/* Protocol column */
.requests-list-protocol {
diff --git a/devtools/client/netmonitor/src/components/RequestListColumnFile.js b/devtools/client/netmonitor/src/components/RequestListColumnFile.js
index 1150902d6ffb..ac202eccf4ab 100644
--- a/devtools/client/netmonitor/src/components/RequestListColumnFile.js
+++ b/devtools/client/netmonitor/src/components/RequestListColumnFile.js
@@ -7,7 +7,7 @@
const { Component } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const { propertiesEqual } = require("../utils/request-utils");
+const { propertiesEqual, getFileName } = require("../utils/request-utils");
const { div } = dom;
@@ -28,14 +28,25 @@ class RequestListColumnFile extends Component {
render() {
const {
- item: { urlDetails },
+ item: { urlDetails, cause },
} = this.props;
+ const iconClassList = ["requests-file-type-icon"];
+
+ if (cause && cause.type == "img") {
+ iconClassList.push("file-type-image");
+ } else {
+ iconClassList.push("file-type-general");
+ }
return (
div({
className: "requests-list-column requests-list-file",
- title: urlDetails.unicodeUrl,
+ title: urlDetails.unicodeUrl
},
+ div({
+ className: iconClassList.join(" "),
+ title: getFileName(urlDetails.baseNameWithQuery) || urlDetails.unicodeUrl,
+ }),
urlDetails.baseNameWithQuery
)
);
diff --git a/devtools/client/netmonitor/src/utils/request-utils.js b/devtools/client/netmonitor/src/utils/request-utils.js
index 3e9e1abb26ee..54f29dc7c668 100644
--- a/devtools/client/netmonitor/src/utils/request-utils.js
+++ b/devtools/client/netmonitor/src/utils/request-utils.js
@@ -152,6 +152,17 @@ function getAbbreviatedMimeType(mimeType) {
return CONTENT_MIME_TYPE_ABBREVIATIONS[abbrevType] || abbrevType;
}
+/**
+ * Helpers for getting a filename from a mime type.
+ *
+ * @param {string} baseNameWithQuery - unicode basename and query of a url
+ * @return {string} unicode filename portion of a url
+ */
+function getFileName(baseNameWithQuery) {
+ const basename = baseNameWithQuery && baseNameWithQuery.split("?")[0];
+ return basename && basename.includes(".") ? basename : null;
+}
+
/**
* Helpers for retrieving a URL object from a string
*
@@ -524,6 +535,7 @@ module.exports = {
formDataURI,
writeHeaderText,
getAbbreviatedMimeType,
+ getFileName,
getEndTime,
getFormattedProtocol,
getResponseHeader,
diff --git a/devtools/client/shared/components/menu/MenuButton.js b/devtools/client/shared/components/menu/MenuButton.js
index 904b5882f41b..1637ab3940e3 100644
--- a/devtools/client/shared/components/menu/MenuButton.js
+++ b/devtools/client/shared/components/menu/MenuButton.js
@@ -15,6 +15,8 @@ const dom = require("devtools/client/shared/vendor/react-dom-factories");
const { button } = dom;
const { HTMLTooltip } = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
+const isMacOS = Services.appinfo.OS === "Darwin";
+
loader.lazyRequireGetter(this, "createPortal", "devtools/client/shared/vendor/react-dom", true);
// Return a copy of |obj| minus |fields|.
@@ -346,6 +348,16 @@ class MenuButton extends PureComponent {
}
}
break;
+ case "t":
+ if (isMacOS && e.metaKey || !isMacOS && e.ctrlKey) {
+ // Close the menu if the user opens a new tab while it is still open.
+ //
+ // Bug 1499271: Once toolbox has been converted to XUL we should watch
+ // for the 'visibilitychange' event instead of explicitly looking for
+ // Ctrl+T.
+ this.hideMenu();
+ }
+ break;
}
}
diff --git a/devtools/client/shared/test/browser.ini b/devtools/client/shared/test/browser.ini
index 9328dbb80ecd..b1279a995a84 100644
--- a/devtools/client/shared/test/browser.ini
+++ b/devtools/client/shared/test/browser.ini
@@ -54,6 +54,8 @@ support-files =
test-actor.js
testactors.js
!/devtools/client/responsive.html/test/browser/devices.json
+ !/devtools/client/debugger/new/test/mochitest/helpers.js
+ !/devtools/client/debugger/new/test/mochitest/helpers/context.js
[browser_autocomplete_popup.js]
[browser_css_angle.js]
@@ -243,4 +245,4 @@ skip-if = debug # bug 1334683
[browser_dbg_worker-console-04.js]
skip-if = e10s && debug
[browser_dbg_WorkerTargetActor.attach.js]
-skip-if = e10s && debug
\ No newline at end of file
+skip-if = e10s && debug
diff --git a/devtools/client/shared/test/helper_workers.js b/devtools/client/shared/test/helper_workers.js
index 5167ca3b731a..471204160712 100644
--- a/devtools/client/shared/test/helper_workers.js
+++ b/devtools/client/shared/test/helper_workers.js
@@ -123,14 +123,10 @@ function attachThread(workerClient, options) {
return workerClient.attachThread(options);
}
-function waitForWorkerClose(workerClient) {
+async function waitForWorkerClose(workerClient) {
info("Waiting for worker to close.");
- return new Promise(function(resolve) {
- workerClient.addOneTimeListener("close", function() {
- info("Worker did close.");
- resolve();
- });
- });
+ await workerClient.once("close");
+ info("Worker did close.");
}
// Return a promise with a reference to jsterm, opening the split
diff --git a/devtools/client/shared/widgets/tooltip/HTMLTooltip.js b/devtools/client/shared/widgets/tooltip/HTMLTooltip.js
index f86d4d9c6443..934b8b62f9e6 100644
--- a/devtools/client/shared/widgets/tooltip/HTMLTooltip.js
+++ b/devtools/client/shared/widgets/tooltip/HTMLTooltip.js
@@ -489,7 +489,7 @@ HTMLTooltip.prototype = {
anchorRect = this._convertToScreenRect(anchorRect);
}
- const { viewportRect, windowRect } = this._getBoundingRects();
+ const { viewportRect, windowRect } = this._getBoundingRects(anchorRect);
// Calculate the horizonal position and width
let preferredWidth;
@@ -613,15 +613,21 @@ HTMLTooltip.prototype = {
* window in screen coordinates. Otherwise it will be the same as the
* viewport rect.
*
+ * @param {Object} anchorRect
+ * DOMRect-like object of the target anchor element.
+ * We need to pass this to detect the case when the anchor is not in
+ * the current window (because, the center of the window is in
+ * a different window to the anchor).
+ *
* @return {Object} An object with the following properties
* viewportRect {Object} DOMRect-like object with the Number
* properties: top, right, bottom, left, width, height
* representing the viewport rect.
* windowRect {Object} DOMRect-like object with the Number
* properties: top, right, bottom, left, width, height
- * representing the viewport rect.
+ * representing the window rect.
*/
- _getBoundingRects: function() {
+ _getBoundingRects: function(anchorRect) {
let viewportRect;
let windowRect;
@@ -660,6 +666,25 @@ HTMLTooltip.prototype = {
width: outerWidth,
height: outerHeight,
};
+
+ // If the anchor is outside the viewport, it possibly means we have a
+ // multi-monitor environment where the anchor is displayed on a different
+ // monitor to the "current" screen (as determined by the center of the
+ // window). This can happen when, for example, the screen is spread across
+ // two monitors.
+ //
+ // In this case we simply expand viewport in the direction of the anchor
+ // so that we can still calculate the popup position correctly.
+ if (anchorRect.left > viewportRect.right) {
+ const diffWidth = windowRect.right - viewportRect.right;
+ viewportRect.right += diffWidth;
+ viewportRect.width += diffWidth;
+ }
+ if (anchorRect.right < viewportRect.left) {
+ const diffWidth = viewportRect.left - windowRect.left;
+ viewportRect.left -= diffWidth;
+ viewportRect.width += diffWidth;
+ }
} else {
viewportRect = windowRect =
this.doc.documentElement.getBoundingClientRect();
diff --git a/devtools/shared/adb/adb-scanner.js b/devtools/shared/adb/adb-scanner.js
index 5e0d1f6a8afb..a0e68ad2d270 100644
--- a/devtools/shared/adb/adb-scanner.js
+++ b/devtools/shared/adb/adb-scanner.js
@@ -144,37 +144,51 @@ FirefoxOnAndroidRuntime.detect = async function(device, model) {
FirefoxOnAndroidRuntime.prototype = Object.create(Runtime.prototype);
+FirefoxOnAndroidRuntime.prototype._channel = function() {
+ const packageName = this._packageName();
+
+ switch (packageName) {
+ case "org.mozilla.firefox":
+ return "";
+ case "org.mozilla.firefox_beta":
+ return "Beta";
+ case "org.mozilla.fennec":
+ case "org.mozilla.fennec_aurora":
+ // This package name is now the one for Firefox Nightly distributed
+ // through the Google Play Store since "dawn project"
+ // cf. https://bugzilla.mozilla.org/show_bug.cgi?id=1357351#c8
+ return "Nightly";
+ default:
+ return "Custom";
+ }
+};
+
+FirefoxOnAndroidRuntime.prototype._packageName = function() {
+ // If using abstract socket address, it is "@org.mozilla.firefox/..."
+ // If using path base socket, it is "/data/data/...""
+ // Until Fennec 62 only supports path based UNIX domain socket, but
+ // Fennec 63+ supports both path based and abstract socket.
+ return this._socketPath.startsWith("@") ?
+ this._socketPath.substr(1).split("/")[0] :
+ this._socketPath.split("/")[3];
+};
+
+Object.defineProperty(FirefoxOnAndroidRuntime.prototype, "shortName", {
+ get() {
+ return `Firefox ${this._channel()}`;
+ }
+});
+
+Object.defineProperty(FirefoxOnAndroidRuntime.prototype, "deviceName", {
+ get() {
+ return this._model || this.device.id;
+ }
+});
+
Object.defineProperty(FirefoxOnAndroidRuntime.prototype, "name", {
get() {
- // If using abstract socket address, it is "@org.mozilla.firefox/..."
- // If using path base socket, it is "/data/data/...""
- // Until Fennec 62 only supports path based UNIX domain socket, but
- // Fennec 63+ supports both path based and abstract socket.
- const packageName = this._socketPath.startsWith("@") ?
- this._socketPath.substr(1).split("/")[0] :
- this._socketPath.split("/")[3];
- let channel;
- switch (packageName) {
- case "org.mozilla.firefox":
- channel = "";
- break;
- case "org.mozilla.firefox_beta":
- channel = " Beta";
- break;
- case "org.mozilla.fennec_aurora":
- // This package name is now the one for Firefox Nightly distributed
- // through the Google Play Store since "dawn project"
- // cf. https://bugzilla.mozilla.org/show_bug.cgi?id=1357351#c8
- channel = " Nightly";
- break;
- case "org.mozilla.fennec":
- channel = " Nightly";
- break;
- default:
- channel = " Custom";
- }
- return "Firefox" + channel + " on Android (" +
- (this._model || this.device.id) + ")";
+ const channel = this._channel();
+ return "Firefox " + channel + " on Android (" + this.deviceName + ")";
}
});
diff --git a/devtools/shared/client/debugger-client.js b/devtools/shared/client/debugger-client.js
index 2ed26d6ae983..84690761c9c3 100644
--- a/devtools/shared/client/debugger-client.js
+++ b/devtools/shared/client/debugger-client.js
@@ -25,8 +25,8 @@ loader.lazyRequireGetter(this, "WebConsoleClient", "devtools/shared/webconsole/c
loader.lazyRequireGetter(this, "AddonClient", "devtools/shared/client/addon-client");
loader.lazyRequireGetter(this, "RootClient", "devtools/shared/client/root-client");
loader.lazyRequireGetter(this, "BrowsingContextFront", "devtools/shared/fronts/targets/browsing-context", true);
+loader.lazyRequireGetter(this, "WorkerTargetFront", "devtools/shared/fronts/targets/worker", true);
loader.lazyRequireGetter(this, "ThreadClient", "devtools/shared/client/thread-client");
-loader.lazyRequireGetter(this, "WorkerClient", "devtools/shared/client/worker-client");
loader.lazyRequireGetter(this, "ObjectClient", "devtools/shared/client/object-client");
loader.lazyRequireGetter(this, "Pool", "devtools/shared/protocol", true);
loader.lazyRequireGetter(this, "Front", "devtools/shared/protocol", true);
@@ -380,22 +380,15 @@ DebuggerClient.prototype = {
return [response, front];
},
- attachWorker: function(workerTargetActor) {
- let workerClient = this._clients.get(workerTargetActor);
- if (workerClient !== undefined) {
- const response = {
- from: workerClient.actor,
- type: "attached",
- url: workerClient.url
- };
- return promise.resolve([response, workerClient]);
+ attachWorker: async function(workerTargetActor) {
+ let front = this._frontPool.actor(workerTargetActor);
+ if (!front) {
+ front = new WorkerTargetFront(this, { actor: workerTargetActor });
+ this._frontPool.manage(front);
}
- return this.request({ to: workerTargetActor, type: "attach" }).then(response => {
- workerClient = new WorkerClient(this, response);
- this.registerClient(workerClient);
- return [response, workerClient];
- });
+ const response = await front.attach();
+ return [response, front];
},
/**
diff --git a/devtools/shared/client/moz.build b/devtools/shared/client/moz.build
index 3fa90f38dc4b..2076486b7b55 100644
--- a/devtools/shared/client/moz.build
+++ b/devtools/shared/client/moz.build
@@ -20,5 +20,4 @@ DevToolsModules(
'source-client.js',
'symbol-iterator-client.js',
'thread-client.js',
- 'worker-client.js',
)
diff --git a/devtools/shared/client/worker-client.js b/devtools/shared/client/worker-client.js
deleted file mode 100644
index 92309bb7bc6e..000000000000
--- a/devtools/shared/client/worker-client.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const {DebuggerClient} = require("devtools/shared/client/debugger-client");
-const eventSource = require("devtools/shared/client/event-source");
-loader.lazyRequireGetter(this, "ThreadClient", "devtools/shared/client/thread-client");
-
-function WorkerClient(client, form) {
- this.client = client;
- this._actor = form.from;
- this._isClosed = false;
- this._url = form.url;
-
- this._onClose = this._onClose.bind(this);
-
- this.addListener("close", this._onClose);
-
- this.traits = {};
-}
-
-WorkerClient.prototype = {
- get _transport() {
- return this.client._transport;
- },
-
- get request() {
- return this.client.request;
- },
-
- get actor() {
- return this._actor;
- },
-
- get url() {
- return this._url;
- },
-
- get isClosed() {
- return this._isClosed;
- },
-
- detach: DebuggerClient.requester({ type: "detach" }, {
- after: function(response) {
- if (this.thread) {
- this.client.unregisterClient(this.thread);
- }
- this.client.unregisterClient(this);
- return response;
- },
- }),
-
- attachThread: function(options = {}) {
- if (this.thread) {
- const response = [{
- type: "connected",
- threadActor: this.thread._actor,
- consoleActor: this.consoleActor,
- }, this.thread];
- return response;
- }
-
- // The connect call on server doesn't attach the thread as of version 44.
- return this.request({
- to: this._actor,
- type: "connect",
- options,
- }).then(connectResponse => {
- return this.request({
- to: connectResponse.threadActor,
- type: "attach",
- options,
- }).then(attachResponse => {
- this.thread = new ThreadClient(this, connectResponse.threadActor);
- this.consoleActor = connectResponse.consoleActor;
- this.client.registerClient(this.thread);
-
- return [connectResponse, this.thread];
- });
- });
- },
-
- _onClose: function() {
- this.removeListener("close", this._onClose);
-
- if (this.thread) {
- this.client.unregisterClient(this.thread);
- }
- this.client.unregisterClient(this);
- this._isClosed = true;
- },
-
- reconfigure: function() {
- return Promise.resolve();
- },
-
- events: ["close"]
-};
-
-eventSource(WorkerClient.prototype);
-
-module.exports = WorkerClient;
diff --git a/devtools/shared/fronts/targets/moz.build b/devtools/shared/fronts/targets/moz.build
index cd66f4e661c7..e33cc05625bb 100644
--- a/devtools/shared/fronts/targets/moz.build
+++ b/devtools/shared/fronts/targets/moz.build
@@ -6,4 +6,5 @@
DevToolsModules(
'browsing-context.js',
+ 'worker.js',
)
diff --git a/devtools/shared/fronts/targets/worker.js b/devtools/shared/fronts/targets/worker.js
new file mode 100644
index 000000000000..f48ffb20c852
--- /dev/null
+++ b/devtools/shared/fronts/targets/worker.js
@@ -0,0 +1,100 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const {workerTargetSpec} = require("devtools/shared/specs/targets/worker");
+const protocol = require("devtools/shared/protocol");
+const {custom} = protocol;
+
+loader.lazyRequireGetter(this, "ThreadClient", "devtools/shared/client/thread-client");
+
+const WorkerTargetFront = protocol.FrontClassWithSpec(workerTargetSpec, {
+ initialize: function(client, form) {
+ protocol.Front.prototype.initialize.call(this, client, form);
+
+ this.thread = null;
+ this.traits = {};
+
+ // TODO: remove once ThreadClient becomes a front
+ this.client = client;
+
+ this._isClosed = false;
+
+ this.destroy = this.destroy.bind(this);
+ this.on("close", this.destroy);
+ },
+
+ get isClosed() {
+ return this._isClosed;
+ },
+
+ destroy: function() {
+ this.off("close", this.destroy);
+ this._isClosed = true;
+
+ if (this.thread) {
+ this.client.unregisterClient(this.thread);
+ }
+
+ this.unmanage(this);
+
+ protocol.Front.prototype.destroy.call(this);
+ },
+
+ attach: custom(async function() {
+ const response = await this._attach();
+
+ this.url = response.url;
+
+ return response;
+ }, {
+ impl: "_attach"
+ }),
+
+ detach: custom(async function() {
+ let response;
+ try {
+ response = await this._detach();
+ } catch (e) {
+ console.warn(`Error while detaching the worker target front: ${e.message}`);
+ }
+ this.destroy();
+ return response;
+ }, {
+ impl: "_detach"
+ }),
+
+ reconfigure: function() {
+ // Toolbox and options panel are calling this method but Worker Target can't be
+ // reconfigured. So we ignore this call here.
+ return Promise.resolve();
+ },
+
+ attachThread: async function(options = {}) {
+ if (this.thread) {
+ const response = [{
+ type: "connected",
+ threadActor: this.thread._actor,
+ consoleActor: this.consoleActor,
+ }, this.thread];
+ return response;
+ }
+
+ // The connect call on server doesn't attach the thread as of version 44.
+ const connectResponse = await this.connect(options);
+ await this.client.request({
+ to: connectResponse.threadActor,
+ type: "attach",
+ options,
+ });
+ this.thread = new ThreadClient(this, connectResponse.threadActor);
+ this.consoleActor = connectResponse.consoleActor;
+ this.client.registerClient(this.thread);
+
+ return [connectResponse, this.thread];
+ },
+
+});
+
+exports.WorkerTargetFront = WorkerTargetFront;
diff --git a/devtools/shared/specs/targets/worker.js b/devtools/shared/specs/targets/worker.js
index 0a34a9fe0840..ab86beb8b276 100644
--- a/devtools/shared/specs/targets/worker.js
+++ b/devtools/shared/specs/targets/worker.js
@@ -28,6 +28,19 @@ const workerTargetSpec = generateActorSpec({
response: RetVal("json")
},
},
+
+ events: {
+ // WorkerTargetActor still uses old sendActorEvent function,
+ // but it should use emit instead.
+ close: {
+ type: "close",
+ },
+ // newSource is being sent by ThreadActor in the name of its parent,
+ // i.e. WorkerTargetActor
+ newSource: {
+ type: "newSource",
+ }
+ }
});
exports.workerTargetSpec = workerTargetSpec;
diff --git a/dom/base/FeedWriterEnabled.h b/dom/base/FeedWriterEnabled.h
deleted file mode 100644
index 1bf39eba98bc..000000000000
--- a/dom/base/FeedWriterEnabled.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "js/TypeDecls.h"
-#include "nsContentUtils.h"
-
-namespace mozilla {
-
-struct FeedWriterEnabled {
- static bool IsEnabled(JSContext* cx, JSObject* aGlobal)
- {
- return nsContentUtils::IsSpecificAboutPage(aGlobal, "about:feeds");
- }
-};
-
-}
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 71bcb2862fb6..ce26302f0e3f 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -129,7 +129,6 @@ if CONFIG['MOZ_WEBRTC']:
EXPORTS.mozilla += [
'CORSMode.h',
- 'FeedWriterEnabled.h',
'FlushType.h',
'FullscreenChange.h',
'RangeBoundary.h',
diff --git a/dom/webidl/BrowserFeedWriter.webidl b/dom/webidl/BrowserFeedWriter.webidl
deleted file mode 100644
index d756a8837ebc..000000000000
--- a/dom/webidl/BrowserFeedWriter.webidl
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-[JSImplementation="@mozilla.org/browser/feeds/result-writer;1",
- Func="mozilla::FeedWriterEnabled::IsEnabled",
- Constructor]
-interface BrowserFeedWriter {
- /**
- * Writes the feed content, assumes that the feed writer is initialized.
- */
- void writeContent();
-
- /**
- * Uninitialize the feed writer.
- */
- void close();
-};
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 730e4ef4e792..13de3633e5fb 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -1091,11 +1091,6 @@ if CONFIG['MOZ_WEBSPEECH']:
'SpeechSynthesisEvent.webidl',
]
-if CONFIG['MOZ_BUILD_APP'] in ['browser', 'xulrunner'] or CONFIG['MOZ_SUITE']:
- WEBIDL_FILES += [
- 'BrowserFeedWriter.webidl',
- ]
-
if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
WEBIDL_FILES += [
'External.webidl',
diff --git a/dom/xul/XULTooltipElement.cpp b/dom/xul/XULTooltipElement.cpp
index 24afbb883aa6..dd4f5cfa6481 100644
--- a/dom/xul/XULTooltipElement.cpp
+++ b/dom/xul/XULTooltipElement.cpp
@@ -27,20 +27,20 @@ XULTooltipElement::Init()
// Create the default child label node that will contain the text of the
// tooltip.
RefPtr nodeInfo;
- nodeInfo = mNodeInfo->NodeInfoManager()->GetNodeInfo(nsGkAtoms::label,
+ nodeInfo = mNodeInfo->NodeInfoManager()->GetNodeInfo(nsGkAtoms::description,
nullptr,
kNameSpaceID_XUL,
nsINode::ELEMENT_NODE);
- nsCOMPtr label;
- nsresult rv = NS_NewXULElement(getter_AddRefs(label),
+ nsCOMPtr description;
+ nsresult rv = NS_NewXULElement(getter_AddRefs(description),
nodeInfo.forget(), dom::NOT_FROM_PARSER);
NS_ENSURE_SUCCESS(rv, rv);
- label->SetAttr(kNameSpaceID_None, nsGkAtoms::_class,
+ description->SetAttr(kNameSpaceID_None, nsGkAtoms::_class,
NS_LITERAL_STRING("tooltip-label"), false);
- label->SetAttr(kNameSpaceID_None, nsGkAtoms::flex,
+ description->SetAttr(kNameSpaceID_None, nsGkAtoms::flex,
NS_LITERAL_STRING("true"), false);
ErrorResult error;
- AppendChild(*label, error);
+ AppendChild(*description, error);
return error.StealNSResult();
}
@@ -54,18 +54,18 @@ XULTooltipElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
{
if (aNameSpaceID == kNameSpaceID_None && aName == nsGkAtoms::label) {
// When the label attribute of this node changes propagate the text down
- // into child label element.
- nsCOMPtr label = GetFirstChild();
- if (label && label->IsXULElement(nsGkAtoms::label)) {
+ // into child description element.
+ nsCOMPtr description = GetFirstChild();
+ if (description && description->IsXULElement(nsGkAtoms::description)) {
nsAutoString value;
if (aValue) {
aValue->ToString(value);
}
nsContentUtils::AddScriptRunner(NS_NewRunnableFunction(
"XULTooltipElement::AfterSetAttr",
- [label, value]() {
- Element* labelElement = label->AsElement();
- labelElement->SetTextContent(value, IgnoreErrors());
+ [description, value]() {
+ Element* descriptionElement = description->AsElement();
+ descriptionElement->SetTextContent(value, IgnoreErrors());
})
);
}
diff --git a/gfx/layers/ipc/CompositorBridgeParent.h b/gfx/layers/ipc/CompositorBridgeParent.h
index 9c5389ac191a..0a0f8775f903 100644
--- a/gfx/layers/ipc/CompositorBridgeParent.h
+++ b/gfx/layers/ipc/CompositorBridgeParent.h
@@ -481,7 +481,7 @@ public:
return mOptions;
}
- TimeDuration GetVsyncInterval() const {
+ TimeDuration GetVsyncInterval() const override {
// the variable is called "rate" but really it's an interval
return mVsyncRate;
}
diff --git a/gfx/layers/ipc/CompositorVsyncScheduler.cpp b/gfx/layers/ipc/CompositorVsyncScheduler.cpp
index 80829e30108e..6bf427aabbd9 100644
--- a/gfx/layers/ipc/CompositorVsyncScheduler.cpp
+++ b/gfx/layers/ipc/CompositorVsyncScheduler.cpp
@@ -76,7 +76,6 @@ CompositorVsyncScheduler::CompositorVsyncScheduler(CompositorVsyncSchedulerOwner
: mVsyncSchedulerOwner(aVsyncSchedulerOwner)
, mLastCompose(TimeStamp::Now())
, mIsObservingVsync(false)
- , mNeedsComposite(0)
, mVsyncNotificationsSkipped(0)
, mWidget(aWidget)
, mCurrentCompositeTaskMonitor("CurrentCompositeTaskMonitor")
@@ -114,7 +113,7 @@ CompositorVsyncScheduler::Destroy()
mVsyncObserver->Destroy();
mVsyncObserver = nullptr;
- mNeedsComposite = 0;
+ mCompositeRequestedAt = TimeStamp();
CancelCurrentCompositeTask();
}
@@ -162,8 +161,9 @@ CompositorVsyncScheduler::ScheduleComposition()
// to ensure that graphics are up to date.
PostCompositeTask(TimeStamp::Now());
#ifdef MOZ_WIDGET_ANDROID
- } else if (mNeedsComposite >= 2 && mIsObservingVsync) {
- // uh-oh, we already requested a composite at least twice so far, and a
+ } else if (mIsObservingVsync && mCompositeRequestedAt &&
+ (TimeStamp::Now() - mCompositeRequestedAt) >= mVsyncSchedulerOwner->GetVsyncInterval() * 2) {
+ // uh-oh, we already requested a composite at least two vsyncs ago, and a
// composite hasn't happened yet. It is possible that the vsync observation
// is blocked on the main thread, so let's just composite ASAP and not
// wait for the vsync. Note that this should only ever happen on Fennec
@@ -172,8 +172,10 @@ CompositorVsyncScheduler::ScheduleComposition()
PostCompositeTask(TimeStamp::Now());
#endif
} else {
- mNeedsComposite++;
- if (!mIsObservingVsync && mNeedsComposite) {
+ if (!mCompositeRequestedAt) {
+ mCompositeRequestedAt = TimeStamp::Now();
+ }
+ if (!mIsObservingVsync && mCompositeRequestedAt) {
ObserveVsync();
// Starting to observe vsync is an async operation that goes
// through the main thread of the UI process. It's possible that
@@ -236,8 +238,8 @@ CompositorVsyncScheduler::Composite(TimeStamp aVsyncTimestamp)
}
}
- if (mNeedsComposite || mAsapScheduling) {
- mNeedsComposite = 0;
+ if (mCompositeRequestedAt || mAsapScheduling) {
+ mCompositeRequestedAt = TimeStamp();
mLastCompose = aVsyncTimestamp;
// Tell the owner to do a composite
@@ -262,7 +264,7 @@ CompositorVsyncScheduler::ForceComposeToTarget(gfx::DrawTarget* aTarget, const I
* bug 1138502 - There are cases such as during long-running window resizing
* events where we receive many force-composites. We also continue to get
* vsync notifications. Because the force-composites trigger compositing and
- * clear the mNeedsComposite counter, the vsync notifications will not need
+ * clear the mCompositeRequestedAt timestamp, the vsync notifications will not need
* to do anything and so will increment the mVsyncNotificationsSkipped counter
* to indicate the vsync was ignored. If this happens enough times, we will
* disable listening for vsync entirely. On the next force-composite we will
@@ -284,14 +286,14 @@ bool
CompositorVsyncScheduler::NeedsComposite()
{
MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
- return mNeedsComposite;
+ return (bool)mCompositeRequestedAt;
}
bool
CompositorVsyncScheduler::FlushPendingComposite()
{
MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
- if (mNeedsComposite) {
+ if (mCompositeRequestedAt) {
CancelCurrentCompositeTask();
ForceComposeToTarget(nullptr, nullptr);
return true;
diff --git a/gfx/layers/ipc/CompositorVsyncScheduler.h b/gfx/layers/ipc/CompositorVsyncScheduler.h
index d9f73a3761d1..46fee939db0d 100644
--- a/gfx/layers/ipc/CompositorVsyncScheduler.h
+++ b/gfx/layers/ipc/CompositorVsyncScheduler.h
@@ -141,7 +141,7 @@ private:
bool mAsapScheduling;
bool mIsObservingVsync;
- uint32_t mNeedsComposite;
+ TimeStamp mCompositeRequestedAt;
int32_t mVsyncNotificationsSkipped;
widget::CompositorWidget* mWidget;
RefPtr mVsyncObserver;
diff --git a/gfx/layers/ipc/CompositorVsyncSchedulerOwner.h b/gfx/layers/ipc/CompositorVsyncSchedulerOwner.h
index c8acb39814ab..543644a87ce7 100644
--- a/gfx/layers/ipc/CompositorVsyncSchedulerOwner.h
+++ b/gfx/layers/ipc/CompositorVsyncSchedulerOwner.h
@@ -21,6 +21,7 @@ public:
virtual bool IsPendingComposite() = 0;
virtual void FinishPendingComposite() = 0;
virtual void CompositeToTarget(gfx::DrawTarget* aTarget, const gfx::IntRect* aRect = nullptr) = 0;
+ virtual TimeDuration GetVsyncInterval() const = 0;
};
} // namespace layers
diff --git a/gfx/layers/wr/WebRenderBridgeParent.cpp b/gfx/layers/wr/WebRenderBridgeParent.cpp
index 014161c83446..af6f14d161c8 100644
--- a/gfx/layers/wr/WebRenderBridgeParent.cpp
+++ b/gfx/layers/wr/WebRenderBridgeParent.cpp
@@ -1607,6 +1607,17 @@ WebRenderBridgeParent::CompositeToTarget(gfx::DrawTarget* aTarget, const gfx::In
MaybeGenerateFrame(/* aForceGenerateFrame */ false);
}
+TimeDuration
+WebRenderBridgeParent::GetVsyncInterval() const
+{
+ // This function should only get called in the root WRBP
+ MOZ_ASSERT(IsRootWebRenderBridgeParent());
+ if (CompositorBridgeParent* cbp = GetRootCompositorBridgeParent()) {
+ return cbp->GetVsyncInterval();
+ }
+ return TimeDuration();
+}
+
void
WebRenderBridgeParent::MaybeGenerateFrame(bool aForceGenerateFrame)
{
diff --git a/gfx/layers/wr/WebRenderBridgeParent.h b/gfx/layers/wr/WebRenderBridgeParent.h
index 61af38500de0..96310b1d3e04 100644
--- a/gfx/layers/wr/WebRenderBridgeParent.h
+++ b/gfx/layers/wr/WebRenderBridgeParent.h
@@ -143,6 +143,7 @@ public:
bool IsPendingComposite() override { return false; }
void FinishPendingComposite() override { }
void CompositeToTarget(gfx::DrawTarget* aTarget, const gfx::IntRect* aRect = nullptr) override;
+ TimeDuration GetVsyncInterval() const override;
// CompositableParentManager
bool IsSameProcess() const override;
diff --git a/js/src/jit/MacroAssembler-inl.h b/js/src/jit/MacroAssembler-inl.h
index be6a641ef9ef..dead510c82a5 100644
--- a/js/src/jit/MacroAssembler-inl.h
+++ b/js/src/jit/MacroAssembler-inl.h
@@ -33,6 +33,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// Stack manipulation functions.
@@ -799,6 +800,7 @@ template void MacroAssembler::storeFloat32(FloatRegister src, const Address& des
template void MacroAssembler::storeFloat32(FloatRegister src, const BaseIndex& dest);
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
#ifndef JS_CODEGEN_ARM64
diff --git a/js/src/jit/MacroAssembler.cpp b/js/src/jit/MacroAssembler.cpp
index 29a793ea32ee..bc6ee7ac3b00 100644
--- a/js/src/jit/MacroAssembler.cpp
+++ b/js/src/jit/MacroAssembler.cpp
@@ -2973,6 +2973,7 @@ MacroAssembler::subFromStackPtr(Register reg)
}
#endif // JS_CODEGEN_ARM64
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// Stack manipulation functions.
@@ -3816,6 +3817,7 @@ MacroAssembler::boundsCheck32PowerOfTwo(Register index, uint32_t length, Label*
}
//}}} check_macroassembler_style
+// clang-format on
void
MacroAssembler::memoryBarrierBefore(const Synchronization& sync) {
diff --git a/js/src/jit/MacroAssembler.h b/js/src/jit/MacroAssembler.h
index 94fd09306b00..d685160ce321 100644
--- a/js/src/jit/MacroAssembler.h
+++ b/js/src/jit/MacroAssembler.h
@@ -350,6 +350,7 @@ class MacroAssembler : public MacroAssemblerSpecific
void Push(RegisterOrSP reg);
#endif
+ // clang-format off
//{{{ check_macroassembler_decl_style
public:
// ===============================================================
@@ -2056,6 +2057,7 @@ class MacroAssembler : public MacroAssemblerSpecific
void speculationBarrier() PER_SHARED_ARCH;
//}}} check_macroassembler_decl_style
+ // clang-format on
public:
// Emits a test of a value against all types in a TypeSet. A scratch
@@ -2819,6 +2821,7 @@ class IonHeapMacroAssembler : public MacroAssembler
}
};
+// clang-format off
//{{{ check_macroassembler_style
inline uint32_t
MacroAssembler::framePushed() const
@@ -2847,6 +2850,7 @@ MacroAssembler::implicitPop(uint32_t bytes)
adjustFrame(-int32_t(bytes));
}
//}}} check_macroassembler_style
+// clang-format on
static inline Assembler::DoubleCondition
JSOpToDoubleCondition(JSOp op)
diff --git a/js/src/jit/arm/MacroAssembler-arm-inl.h b/js/src/jit/arm/MacroAssembler-arm-inl.h
index 370e68960522..de8808ca971b 100644
--- a/js/src/jit/arm/MacroAssembler-arm-inl.h
+++ b/js/src/jit/arm/MacroAssembler-arm-inl.h
@@ -12,6 +12,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
void
@@ -2334,6 +2335,7 @@ MacroAssembler::clampIntToUint8(Register reg)
}
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
void
diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp
index cb41004519d0..d7cc4a956324 100644
--- a/js/src/jit/arm/MacroAssembler-arm.cpp
+++ b/js/src/jit/arm/MacroAssembler-arm.cpp
@@ -4362,6 +4362,7 @@ MacroAssembler::subFromStackPtr(Imm32 imm32)
}
}
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// MacroAssembler high-level usage.
@@ -6175,6 +6176,7 @@ MacroAssembler::speculationBarrier()
}
//}}} check_macroassembler_style
+// clang-format on
void
MacroAssemblerARM::wasmTruncateToInt32(FloatRegister input, Register output, MIRType fromType,
diff --git a/js/src/jit/arm64/MacroAssembler-arm64-inl.h b/js/src/jit/arm64/MacroAssembler-arm64-inl.h
index 21196471ee39..07fbf4b5b196 100644
--- a/js/src/jit/arm64/MacroAssembler-arm64-inl.h
+++ b/js/src/jit/arm64/MacroAssembler-arm64-inl.h
@@ -12,6 +12,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
void
@@ -1981,6 +1982,7 @@ MacroAssembler::clampIntToUint8(Register reg)
}
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
void
diff --git a/js/src/jit/arm64/MacroAssembler-arm64.cpp b/js/src/jit/arm64/MacroAssembler-arm64.cpp
index 75aa2e0c45d1..78d9ef631900 100644
--- a/js/src/jit/arm64/MacroAssembler-arm64.cpp
+++ b/js/src/jit/arm64/MacroAssembler-arm64.cpp
@@ -413,6 +413,7 @@ MacroAssembler::Push(RegisterOrSP reg)
adjustFrame(sizeof(intptr_t));
}
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// MacroAssembler high-level usage.
@@ -2024,6 +2025,7 @@ MacroAssembler::speculationBarrier()
}
//}}} check_macroassembler_style
+// clang-format off
} // namespace jit
} // namespace js
diff --git a/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h b/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
index dcbb4868a8d6..a1513230494f 100644
--- a/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
+++ b/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
@@ -12,6 +12,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
void
@@ -1110,6 +1111,7 @@ MacroAssembler::clampIntToUint8(Register reg)
}
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
} // namespace jit
diff --git a/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp b/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
index eeca8a191a12..6ab1f9a3151c 100644
--- a/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
+++ b/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
@@ -1439,6 +1439,7 @@ MacroAssemblerMIPSShared::asMasm() const
return *static_cast(this);
}
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// MacroAssembler high-level usage.
@@ -2927,3 +2928,5 @@ MacroAssembler::speculationBarrier()
{
MOZ_CRASH();
}
+//}}} check_macroassembler_style
+// clang-format on
diff --git a/js/src/jit/mips32/MacroAssembler-mips32-inl.h b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
index 3d1592ce0e56..894055dd2697 100644
--- a/js/src/jit/mips32/MacroAssembler-mips32-inl.h
+++ b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
@@ -14,6 +14,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
void
@@ -1011,6 +1012,7 @@ MacroAssembler::branchTruncateFloat32MaybeModUint32(FloatRegister src, Register
}
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
void
diff --git a/js/src/jit/mips32/MacroAssembler-mips32.cpp b/js/src/jit/mips32/MacroAssembler-mips32.cpp
index a0ce9a7f81b0..f5544c13106d 100644
--- a/js/src/jit/mips32/MacroAssembler-mips32.cpp
+++ b/js/src/jit/mips32/MacroAssembler-mips32.cpp
@@ -2109,6 +2109,7 @@ MacroAssembler::subFromStackPtr(Imm32 imm32)
}
}
+// clang-format on
//{{{ check_macroassembler_style
// ===============================================================
// Stack manipulation functions.
@@ -2967,3 +2968,4 @@ MacroAssembler::convertUInt64ToDouble(Register64 src, FloatRegister dest, Regist
}
//}}} check_macroassembler_style
+// clang-format on
diff --git a/js/src/jit/mips64/MacroAssembler-mips64-inl.h b/js/src/jit/mips64/MacroAssembler-mips64-inl.h
index 867aade6383e..58859812a2b6 100644
--- a/js/src/jit/mips64/MacroAssembler-mips64-inl.h
+++ b/js/src/jit/mips64/MacroAssembler-mips64-inl.h
@@ -14,6 +14,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
void
@@ -758,6 +759,7 @@ MacroAssembler::branchTruncateFloat32MaybeModUint32(FloatRegister src, Register
}
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
// The specializations for cmpPtrSet are outside the braces because check_macroassembler_style can't yet
diff --git a/js/src/jit/mips64/MacroAssembler-mips64.cpp b/js/src/jit/mips64/MacroAssembler-mips64.cpp
index c8c62ae756ab..c85f2a2bf75a 100644
--- a/js/src/jit/mips64/MacroAssembler-mips64.cpp
+++ b/js/src/jit/mips64/MacroAssembler-mips64.cpp
@@ -1948,6 +1948,7 @@ MacroAssembler::subFromStackPtr(Imm32 imm32)
}
}
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// Stack manipulation functions.
@@ -2759,3 +2760,4 @@ MacroAssembler::convertUInt64ToFloat32(Register64 src_, FloatRegister dest, Regi
}
//}}} check_macroassembler_style
+// clang-format on
diff --git a/js/src/jit/x64/MacroAssembler-x64-inl.h b/js/src/jit/x64/MacroAssembler-x64-inl.h
index e192c0c32ba9..4361cb73773a 100644
--- a/js/src/jit/x64/MacroAssembler-x64-inl.h
+++ b/js/src/jit/x64/MacroAssembler-x64-inl.h
@@ -14,6 +14,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
@@ -964,6 +965,7 @@ MacroAssembler::truncateDoubleToUInt64(Address src, Address dest, Register temp,
}
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
void
diff --git a/js/src/jit/x64/MacroAssembler-x64.cpp b/js/src/jit/x64/MacroAssembler-x64.cpp
index 0f2633e8ffde..990eeea6cf44 100644
--- a/js/src/jit/x64/MacroAssembler-x64.cpp
+++ b/js/src/jit/x64/MacroAssembler-x64.cpp
@@ -303,6 +303,7 @@ MacroAssembler::subFromStackPtr(Imm32 imm32)
}
}
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// ABI function calls.
@@ -1038,3 +1039,4 @@ MacroAssembler::wasmAtomicEffectOp64(const wasm::MemoryAccessDesc& access, Atomi
}
//}}} check_macroassembler_style
+// clang-format on
diff --git a/js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h b/js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h
index 4bbfbb388ffb..a2612cf28535 100644
--- a/js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h
+++ b/js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h
@@ -12,6 +12,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// Move instructions
@@ -1331,6 +1332,7 @@ MacroAssembler::clampIntToUint8(Register reg)
}
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
} // namespace jit
diff --git a/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp b/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
index d50e8e74bb19..a0ebe90d646b 100644
--- a/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
+++ b/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
@@ -270,6 +270,7 @@ MacroAssemblerX86Shared::minMaxFloat32(FloatRegister first, FloatRegister second
bind(&done);
}
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// MacroAssembler high-level usage.
@@ -1673,3 +1674,4 @@ MacroAssembler::speculationBarrier()
}
//}}} check_macroassembler_style
+// clang-format on
diff --git a/js/src/jit/x86/MacroAssembler-x86-inl.h b/js/src/jit/x86/MacroAssembler-x86-inl.h
index 6a80a4c97266..ecddad7558ab 100644
--- a/js/src/jit/x86/MacroAssembler-x86-inl.h
+++ b/js/src/jit/x86/MacroAssembler-x86-inl.h
@@ -14,6 +14,7 @@
namespace js {
namespace jit {
+// clang-format off
//{{{ check_macroassembler_style
void
@@ -1182,6 +1183,7 @@ MacroAssembler::truncateDoubleToUInt64(Address src, Address dest, Register temp,
}
//}}} check_macroassembler_style
+// clang-format on
// ===============================================================
// Note: this function clobbers the source register.
diff --git a/js/src/jit/x86/MacroAssembler-x86.cpp b/js/src/jit/x86/MacroAssembler-x86.cpp
index 17483522bfa9..876af6c6e72f 100644
--- a/js/src/jit/x86/MacroAssembler-x86.cpp
+++ b/js/src/jit/x86/MacroAssembler-x86.cpp
@@ -302,6 +302,7 @@ MacroAssembler::subFromStackPtr(Imm32 imm32)
}
}
+// clang-format off
//{{{ check_macroassembler_style
// ===============================================================
// ABI function calls.
@@ -1274,4 +1275,5 @@ MacroAssembler::convertInt64ToFloat32(Register64 input, FloatRegister output)
}
//}}} check_macroassembler_style
+// clang-format on
diff --git a/mobile/android/locales/filter.py b/mobile/android/locales/filter.py
index 2de041be081b..f80a3c81b8f1 100644
--- a/mobile/android/locales/filter.py
+++ b/mobile/android/locales/filter.py
@@ -68,9 +68,7 @@ def test(mod, path, entity=None):
# we're in mod == "mobile"
if path == "chrome/region.properties":
# only region.properties exceptions remain
- if (re.match(r"browser\.search\.order\.[1-9]", entity) or
- re.match(r"browser\.search\.[a-zA-Z]+\.US", entity) or
- re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
+ if (re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
re.match(r"gecko\.handlerService\.schemes\.", entity) or
re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity) or
re.match(r"browser\.suggestedsites\.", entity)):
diff --git a/mobile/android/locales/l10n.toml b/mobile/android/locales/l10n.toml
index 56ce0d8e73b9..c66d9e1df963 100644
--- a/mobile/android/locales/l10n.toml
+++ b/mobile/android/locales/l10n.toml
@@ -249,8 +249,6 @@ exclude-multi-locale = [
[[filters]]
path = "{l}mobile/chrome/region.properties"
key = [
- "re:^browser\\.search\\.order\\.[1-9]$",
- "re:^browser\\.search\\.[a-zA-Z]+\\.US",
"re:^browser\\.contentHandlers\\.types\\.[0-5]\\..*$",
"re:^gecko\\.handlerService\\.schemes\\..+$",
"re:^gecko\\.handlerService\\.defaultHandlersVersion$",
diff --git a/mobile/locales/filter.py b/mobile/locales/filter.py
index 24b0f7c94f0b..1c3f0f1e5fc4 100644
--- a/mobile/locales/filter.py
+++ b/mobile/locales/filter.py
@@ -69,9 +69,7 @@ def test(mod, path, entity=None):
# we're in mod == "mobile"
if path == "chrome/region.properties":
# only region.properties exceptions remain
- if (re.match(r"browser\.search\.order\.[1-9]", entity) or
- re.match(r"browser\.search\.[a-zA-Z]+\.US", entity) or
- re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
+ if (re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
re.match(r"gecko\.handlerService\.schemes\.", entity) or
re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity) or
re.match(r"browser\.suggestedsites\.", entity)):
diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp
index e1b30fe98b0a..945966f9248d 100644
--- a/netwerk/base/nsStandardURL.cpp
+++ b/netwerk/base/nsStandardURL.cpp
@@ -91,57 +91,93 @@ nsStandardURL::nsSegmentEncoder::nsSegmentEncoder(const Encoding* encoding)
}
int32_t nsStandardURL::
-nsSegmentEncoder::EncodeSegmentCount(const char *str,
- const URLSegment &seg,
- int16_t mask,
- nsCString& result,
- bool &appended,
- uint32_t extraLen)
+nsSegmentEncoder::EncodeSegmentCount(const char *aStr,
+ const URLSegment& aSeg,
+ int16_t aMask,
+ nsCString& aOut,
+ bool &aAppended,
+ uint32_t aExtraLen)
{
- // extraLen is characters outside the segment that will be
+ // aExtraLen is characters outside the segment that will be
// added when the segment is not empty (like the @ following
// a username).
- appended = false;
- if (!str)
+ if (!aStr || aSeg.mLen <= 0) {
+ // Empty segment, so aExtraLen not added per above.
+ aAppended = false;
return 0;
- int32_t len = 0;
- if (seg.mLen > 0) {
- uint32_t pos = seg.mPos;
- len = seg.mLen;
-
- // first honor the origin charset if appropriate. as an optimization,
- // only do this if the segment is non-ASCII. Further, if mEncoding is
- // null, then the origin charset is UTF-8 and there is nothing to do.
- nsAutoCString encBuf;
- if (mEncoding && !nsCRT::IsAscii(str + pos, len)) {
- // we have to encode this segment
- nsresult rv;
- const Encoding* ignored;
- Tie(rv, ignored) =
- mEncoding->Encode(Substring(str + pos, str + pos + len), encBuf);
- if (NS_SUCCEEDED(rv)) {
- str = encBuf.get();
- pos = 0;
- len = encBuf.Length();
- }
- // else some failure occurred... assume UTF-8 is ok.
- }
-
- uint32_t initLen = result.Length();
-
- // now perform any required escaping
- if (NS_EscapeURL(str + pos, len, mask, result)) {
- len = result.Length() - initLen;
- appended = true;
- }
- else if (str == encBuf.get()) {
- result += encBuf; // append only!!
- len = encBuf.Length();
- appended = true;
- }
- len += extraLen;
}
- return len;
+
+ uint32_t origLen = aOut.Length();
+
+ Span span = MakeSpan(aStr + aSeg.mPos, aSeg.mLen);
+
+ // first honor the origin charset if appropriate. as an optimization,
+ // only do this if the segment is non-ASCII. Further, if mEncoding is
+ // null, then the origin charset is UTF-8 and there is nothing to do.
+ if (mEncoding) {
+ size_t upTo = Encoding::ASCIIValidUpTo(AsBytes(span));
+ if (upTo != span.Length()) {
+ // we have to encode this segment
+ char bufferArr[512];
+ Span buffer = MakeSpan(bufferArr);
+
+ auto encoder = mEncoding->NewEncoder();
+
+ nsAutoCString valid; // has to be declared in this scope
+ if (MOZ_UNLIKELY(!IsUTF8(span.From(upTo)))) {
+ MOZ_ASSERT_UNREACHABLE("Invalid UTF-8 passed to nsStandardURL.");
+ // It's UB to pass invalid UTF-8 to
+ // EncodeFromUTF8WithoutReplacement(), so let's make our input valid
+ // UTF-8 by replacing invalid sequences with the REPLACEMENT
+ // CHARACTER.
+ UTF_8_ENCODING->Decode(
+ nsDependentCSubstring(span.Elements(), span.Length()), valid);
+ // This assigment is OK. `span` can't be used after `valid` has
+ // been destroyed because the only way out of the scope that `valid`
+ // was declared in is via return inside the loop below. Specifically,
+ // the return is the only way out of the loop.
+ span = valid;
+ }
+
+ size_t totalRead = 0;
+ for (;;) {
+ uint32_t encoderResult;
+ size_t read;
+ size_t written;
+ Tie(encoderResult, read, written) =
+ encoder->EncodeFromUTF8WithoutReplacement(
+ AsBytes(span.From(totalRead)), AsWritableBytes(buffer), true);
+ totalRead += read;
+ auto bufferWritten = buffer.To(written);
+ if (!NS_EscapeURLSpan(bufferWritten, aMask, aOut)) {
+ aOut.Append(bufferWritten);
+ }
+ if (encoderResult == kInputEmpty) {
+ aAppended = true;
+ // Difference between original and current output
+ // string lengths plus extra length
+ return aOut.Length() - origLen + aExtraLen;
+ }
+ if (encoderResult == kOutputFull) {
+ continue;
+ }
+ aOut.AppendLiteral("%26%23");
+ aOut.AppendInt(encoderResult);
+ aOut.AppendLiteral("%3B");
+ }
+ MOZ_RELEASE_ASSERT(false, "There's supposed to be no way out of the above loop except return.");
+ }
+ }
+
+ if (NS_EscapeURLSpan(span, aMask, aOut)) {
+ aAppended = true;
+ // Difference between original and current output
+ // string lengths plus extra length
+ return aOut.Length() - origLen + aExtraLen;
+ }
+ aAppended = false;
+ // Original segment length plus extra length
+ return span.Length() + aExtraLen;
}
const nsACString &nsStandardURL::
@@ -922,7 +958,7 @@ nsStandardURL::BuildNormalizedSpec(const char *spec,
}
CoalescePath(coalesceFlag, buf + mDirectory.mPos);
}
- mSpec.SetLength(strlen(buf));
+ mSpec.Truncate(strlen(buf));
NS_ASSERTION(mSpec.Length() <= approxLen, "We've overflowed the mSpec buffer!");
MOZ_ASSERT(mSpec.Length() <= (uint32_t) net_GetURLMaxLength(),
"The spec should never be this long, we missed a check.");
diff --git a/testing/raptor/raptor/output.py b/testing/raptor/raptor/output.py
index dcf99f38d4de..02f380356f55 100644
--- a/testing/raptor/raptor/output.py
+++ b/testing/raptor/raptor/output.py
@@ -334,15 +334,7 @@ class Output(object):
'replicates': []}
_subtests[sub]['replicates'].extend([round(x, 3) for x in replicates])
- total_subtest = {
- 'unit': test.subtest_unit,
- 'alertThreshold': float(test.alert_threshold),
- 'lowerIsBetter': test.subtest_lower_is_better,
- 'replicates': [],
- 'name': 'benchmark_score',
- 'value': 0
- }
- subtests = [total_subtest]
+ subtests = []
vals = []
names = _subtests.keys()
diff --git a/testing/talos/talos/tests/devtools/addon/install.rdf b/testing/talos/talos/tests/devtools/addon/install.rdf
index 1ea384f84e64..e0fdad7f5bed 100644
--- a/testing/talos/talos/tests/devtools/addon/install.rdf
+++ b/testing/talos/talos/tests/devtools/addon/install.rdf
@@ -5,6 +5,7 @@
DAMP - Devtools At Maximum Performance
0.0.16
true
+true
)
- ]]>
-