Bug 1695519 - Remove obsolete checks and references related to wyciwyg protocol. r=Gijs,annevk
authorDanilo Bargen <mail@dbrgn.ch>
Thu, 20 May 2021 08:41:29 +0000
changeset 580196 274924028c4ccd2814dc55540843b147b92447eb
parent 580195 d5cddd2fecd121067cd054d497921ab7fbca4bcb
child 580197 8707a9007c1768ace636d3b16bfffd27143f110d
push id38479
push usermalexandru@mozilla.com
push dateFri, 21 May 2021 09:57:54 +0000
treeherdermozilla-central@9d30cff8f9d4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, annevk
bugs1695519, 1489308
milestone90.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
Bug 1695519 - Remove obsolete checks and references related to wyciwyg protocol. r=Gijs,annevk Support for the wyciwyg protocol was removed two years ago (see bug 1489308). Differential Revision: https://phabricator.services.mozilla.com/D114418
modules/libpref/init/all.js
toolkit/modules/BrowserUtils.jsm
toolkit/modules/sessionstore/SessionHistory.jsm
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4376,17 +4376,17 @@ pref("services.common.log.logger.tokense
   pref("services.sync.engine.addons", true);
   pref("services.sync.engine.addresses", false);
   pref("services.sync.engine.bookmarks", true);
   pref("services.sync.engine.creditcards", false);
   pref("services.sync.engine.history", true);
   pref("services.sync.engine.passwords", true);
   pref("services.sync.engine.prefs", true);
   pref("services.sync.engine.tabs", true);
-  pref("services.sync.engine.tabs.filteredUrls", "^(about:.*|resource:.*|chrome:.*|wyciwyg:.*|file:.*|blob:.*|moz-extension:.*)$");
+  pref("services.sync.engine.tabs.filteredUrls", "^(about:.*|resource:.*|chrome:.*|file:.*|blob:.*|moz-extension:.*)$");
 
   // The addresses and CC engines might not actually be available at all.
   pref("services.sync.engine.addresses.available", false);
   pref("services.sync.engine.creditcards.available", false);
 
   // If true, add-on sync ignores changes to the user-enabled flag. This
   // allows people to have the same set of add-ons installed across all
   // profiles while maintaining different enabled states.
--- a/toolkit/modules/BrowserUtils.jsm
+++ b/toolkit/modules/BrowserUtils.jsm
@@ -131,17 +131,16 @@ var BrowserUtils = {
     }
 
     let scheme = url.scheme;
 
     return !(
       "about" == scheme ||
       "resource" == scheme ||
       "chrome" == scheme ||
-      "wyciwyg" == scheme ||
       "blob" == scheme ||
       "moz-extension" == scheme
     );
   },
 };
 
 XPCOMUtils.defineLazyPreferenceGetter(
   BrowserUtils,
--- a/toolkit/modules/sessionstore/SessionHistory.jsm
+++ b/toolkit/modules/sessionstore/SessionHistory.jsm
@@ -298,24 +298,16 @@ var SessionHistoryInternal = {
     }
 
     if (shEntry.childCount > 0 && !shEntry.hasDynamicallyAddedChild()) {
       let children = [];
       for (let i = 0; i < shEntry.childCount; i++) {
         let child = shEntry.GetChildAt(i);
 
         if (child) {
-          // Don't try to restore framesets containing wyciwyg URLs.
-          // (cf. bug 424689 and bug 450595).  Note that these may be left
-          // over from pre-wyciwyg-removal profiles.
-          if (child.URI.schemeIs("wyciwyg")) {
-            children.length = 0;
-            break;
-          }
-
           children.push(this.serializeEntry(child));
         }
       }
 
       if (children.length) {
         entry.children = children;
       }
     }