author | Ed Lee <edilee@mozilla.com> |
Wed, 02 May 2018 19:58:28 -0700 | |
changeset 416924 | 2a5a941c2db9c64d18a7b56cb7112ae7ac14fc52 |
parent 416923 | abdaa1f91c4c9ec56f77af5c9310eb20e84b6b8d |
child 416925 | 05cf749971979f41084cd6e1d501035e329d9d9d |
push id | 33943 |
push user | csabou@mozilla.com |
push date | Fri, 04 May 2018 17:19:55 +0000 |
treeherder | mozilla-central@ef1db4e8bf06 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | Gijs |
bugs | 1438367 |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -18,16 +18,22 @@ namespace mozilla { namespace browser { NS_IMPL_ISUPPORTS(AboutRedirector, nsIAboutModule) bool AboutRedirector::sNewTabPageEnabled = false; +static const uint32_t ACTIVITY_STREAM_FLAGS = + nsIAboutModule::ALLOW_SCRIPT | + nsIAboutModule::ENABLE_INDEXED_DB | + nsIAboutModule::URI_MUST_LOAD_IN_CHILD | + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT; + struct RedirEntry { const char* id; const char* url; uint32_t flags; }; /* Entries which do not have URI_SAFE_FOR_UNTRUSTED_CONTENT will run with chrome @@ -73,31 +79,21 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::HIDE_FROM_ABOUTABOUT }, { "sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT }, { "welcomeback", "chrome://browser/content/aboutWelcomeBack.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT }, // Actual activity stream URL for home and newtab are set in channel creation - // Linkable because of indexeddb use (bug 1228118) - { "home", "about:blank", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | - nsIAboutModule::ALLOW_SCRIPT | - nsIAboutModule::MAKE_LINKABLE | - nsIAboutModule::ENABLE_INDEXED_DB }, + { "home", "about:blank", ACTIVITY_STREAM_FLAGS }, + { "newtab", "about:blank", ACTIVITY_STREAM_FLAGS }, { "library", "chrome://browser/content/aboutLibrary.xhtml", nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT }, - { "newtab", "about:blank", - nsIAboutModule::ENABLE_INDEXED_DB | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT }, { "preferences", "chrome://browser/content/preferences/in-content/preferences.xul", nsIAboutModule::ALLOW_SCRIPT }, { "downloads", "chrome://browser/content/downloads/contentAreaDownloadsView.xul", nsIAboutModule::ALLOW_SCRIPT }, { "reader", "chrome://global/content/reader/aboutReader.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD |