reshuff and domi patch

comm-release/patches/1478168-63a1.patch

@@ -2,7 +2,7 @@
 # User Jorg K <jorgk@jorgk.com>
 # Date 1532473048 -7200
 # Node ID 3d1872a693cf87538d50c35eda62183497e18e26
-# Parent  c8be28fbe8108a16be336e58cbf044d2a763c4ac
+# Parent  9973c4d96832751fcbaf1e2e1d908115a6765e80
 Bug 1478168 - Port 1476333: Replace use of pref browser.chromeURL. rs=bustage-fix, f=bgrins DONTBUILD
 
 diff --git a/mail/app/profile/all-thunderbird.js b/mail/app/profile/all-thunderbird.js
@@ -62,7 +62,7 @@ diff --git a/mail/confvars.sh b/mail/confvars.sh
  
 +BROWSER_CHROME_URL=chrome://messenger/content/messengercompose/messengercompose.xul
 +
- MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
+ MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
  MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
  
  MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}

comm-release/patches/1912354-domiselect-25320.patch

@@ -0,0 +1,257 @@
+# HG changeset patch
+# User Matt A. Tobin <email@mattatobin.com>
+# Date 1723226088 18000
+# Node ID 2792065de2accefcae2fcd7ca20162e835e08205
+# Parent  0d2801ed3f280dadaeb835c2b22a0d6e4b3243cc
+Bug 1912354 - Allow DOMi to inspect any DOM element by shift + right click
+
+diff --git a/suite/extensions/inspector/Makefile.in b/suite/extensions/inspector/Makefile.in
+--- a/suite/extensions/inspector/Makefile.in
++++ b/suite/extensions/inspector/Makefile.in
+@@ -5,17 +5,17 @@
+ 
+ DEPTH = ../../../..
+ topsrcdir = @top_srcdir@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+-DOMi_VERSION = 2.0.19
++DOMi_VERSION = 2.0.20
+ 
+ XPI_NAME               = inspector
+ INSTALL_EXTENSION_ID   = inspector@mozilla.org
+ XPI_PKGNAME            = inspector-$(DOMi_VERSION)
+ 
+ DIST_FILES = install.rdf
+ 
+ DEFINES += -DDOMi_VERSION=$(DOMi_VERSION)
+diff --git a/suite/extensions/inspector/base/js/inspector-startup.js b/suite/extensions/inspector/base/js/inspector-startup.js
+new file mode 100644
+--- /dev/null
++++ b/suite/extensions/inspector/base/js/inspector-startup.js
+@@ -0,0 +1,42 @@
++/* 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");
++
++/**
++ * A startup/shutdown observer, triggers init()/uninit() methods
++ * @constructor
++ */
++function InspectorStartup() {}
++InspectorStartup.prototype =
++{
++  classDescription: "DOMi Startup",
++  contractID: "@mozilla.org/domi/startup;1",
++  classID: Components.ID("{4788f52a-0fbb-494c-8ffd-25e0ff39d80d}"),
++  _xpcom_categories: [{ category: "app-startup", service: true }],
++
++  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference]),
++
++  observe: function(subject, topic, data) {
++    switch (topic) {
++      case "app-startup":
++        Services.obs.addObserver(this, "profile-after-change", true);
++        break;
++      case "profile-after-change":
++        if (Services.prefs.getBoolPref("inspector.inspectElementKeyCombo.enabled", false)) {
++          Services.obs.addObserver(this, "quit-application", true);
++          ChromeUtils.import("resource://inspector/InspectElement.jsm");
++          InspectElement.init();
++        }
++        break;
++      case "quit-application":
++        Services.obs.removeObserver(this, "quit-application");
++        InspectElement.uninit();
++        break;
++    }
++  }
++};
++
++var NSGetFactory = XPCOMUtils.generateNSGetFactory([InspectorStartup]);
+diff --git a/suite/extensions/inspector/jar.mn b/suite/extensions/inspector/jar.mn
+--- a/suite/extensions/inspector/jar.mn
++++ b/suite/extensions/inspector/jar.mn
+@@ -8,16 +8,19 @@ inspector.jar:
+ % overlay chrome://inspector/content/inspector.xul chrome://communicator/content/tasksOverlay.xul
+ % overlay chrome://communicator/content/tasksOverlay.xul chrome://inspector/content/tasksOverlay.xul
+ % overlay chrome://communicator/content/pref/preferences.xul chrome://inspector/content/prefs/prefsOverlay.xul
+ % overlay chrome://inspector/content/commandOverlay.xul chrome://inspector/content/viewers/dom/commandOverlay.xul
+ % overlay chrome://inspector/content/commandOverlay.xul chrome://inspector/content/viewers/styleRules/commandOverlay.xul
+ % overlay chrome://inspector/content/keysetOverlay.xul chrome://inspector/content/viewers/dom/keysetOverlay.xul
+ % overlay chrome://inspector/content/popupOverlay.xul chrome://inspector/content/viewers/dom/popupOverlay.xul
+ % overlay chrome://inspector/content/popupOverlay.xul chrome://inspector/content/viewers/styleRules/popupOverlay.xul
++% component {4788f52a-0fbb-494c-8ffd-25e0ff39d80d} components/inspector-startup.js
++% contract @mozilla.org/domi/startup;1 {4788f52a-0fbb-494c-8ffd-25e0ff39d80d}
++% category profile-after-change @mozilla.org/domi/startup;1 @mozilla.org/domi/startup;1
+ #ifdef XPI_NAME
+ %  component {38293526-6b13-4d4f-a075-71939435b408} components/inspector-cmdline.js
+ %  contract @mozilla.org/commandlinehandler/general-startup;1?type=inspector {38293526-6b13-4d4f-a075-71939435b408}
+ %  category command-line-handler m-inspector @mozilla.org/commandlinehandler/general-startup;1?type=inspector
+ #endif
+   content/inspector/inspector.xul                                       (resources/content/inspector.xul)
+   content/inspector/inspector.js                                        (resources/content/inspector.js)
+   content/inspector/inspector.css                                       (resources/content/inspector.css)
+@@ -167,8 +170,9 @@ inspector.jar:
+   skin/modern/inspector/viewers/accessibleTree/accessibleTree.css       (resources/skin/modern/viewers/accessibleTree/accessibleTree.css)
+   skin/modern/inspector/viewers/boxModel/boxModel.css                   (resources/skin/modern/viewers/boxModel/boxModel.css)
+   skin/modern/inspector/viewers/dom/columnsDialog.css                   (resources/skin/modern/viewers/dom/columnsDialog.css)
+   skin/modern/inspector/viewers/dom/dom.css                             (resources/skin/modern/viewers/dom/dom.css)
+   skin/modern/inspector/viewers/dom/findDialog.css                      (resources/skin/modern/viewers/dom/findDialog.css)
+   skin/modern/inspector/viewers/domNode/domNode.css                     (resources/skin/modern/viewers/domNode/domNode.css)
+   skin/modern/inspector/viewers/styleRules/styleRules.css               (resources/skin/modern/viewers/styleRules/styleRules.css)
+   skin/modern/inspector/viewers/xblBindings/xblBindings.css             (resources/skin/modern/viewers/xblBindings/xblBindings.css)
++% resource inspector modules/
+diff --git a/suite/extensions/inspector/modules/InspectElement.jsm b/suite/extensions/inspector/modules/InspectElement.jsm
+new file mode 100644
+--- /dev/null
++++ b/suite/extensions/inspector/modules/InspectElement.jsm
+@@ -0,0 +1,106 @@
++/* 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 EXPORTED_SYMBOLS = ["InspectElement"];
++
++ChromeUtils.import("resource://gre/modules/Services.jsm");
++
++var InspectElement = {
++  handleEvent: function(e) {
++    // Shift + right click
++    if (!e.shiftKey || e.button != 2) {
++      return;
++    }
++
++    try {
++      e.stopPropagation();
++      e.preventDefault();
++    } catch (ex) {}
++
++    if (e.type != "click") {
++      return;
++    }
++
++    let elem = e.originalTarget;
++    let shadowElem = e.target;
++    let win = e.currentTarget;
++    this.inspect(win, elem, shadowElem);
++  },
++  inspect: function(win, elem, shadowElem) {
++    win.openDialog("chrome://inspector/content/", "_blank",
++                   "chrome, all, dialog=no", elem);
++    this.closePopup(elem, win);
++  },
++  closePopup: function (elem, win) {
++    var parent = elem.parentNode;
++    var list = [];
++
++    while (parent != win && parent != null) {
++      if (parent.localName == "menupopup" || parent.localName == "popup") {
++        list.push(parent);
++      }
++      parent = parent.parentNode;
++    }
++
++    var len = list.length;
++
++    if (!len) {
++      return;
++    }
++
++    list[len - 1].hidePopup();
++  },
++  aListener: {
++    onOpenWindow: function (aWindow) {
++      var win = aWindow.docShell.QueryInterface(Ci.nsIInterfaceRequestor)
++                                .getInterface(Ci.nsIDOMWindow);
++
++      win.addEventListener("load", function _inspect() {
++        this.removeEventListener("load", _inspect, false);
++        win.addEventListener("click", InspectElement, true);
++
++        if (Services.appinfo.OS == "WINNT") {
++          return;
++        }
++
++        win.addEventListener("mouseup", InspectElement, false);
++        win.addEventListener("contextmenu", InspectElement, true);
++      }, false);
++    },
++    onCloseWindow: function (aWindow) {},
++    onWindowTitleChange: function (aWindow, aTitle) {},
++  },
++  init: function() {
++     Services.wm.addListener(this.aListener);
++    var cw =  Services.ww.getWindowEnumerator();
++
++    while (cw.hasMoreElements()) {
++      var win = cw.getNext().QueryInterface(Ci.nsIDOMWindow);
++      win.addEventListener("click", InspectElement, true);
++
++      if (Services.appinfo.OS == "WINNT") {
++        continue;
++      }
++
++      win.addEventListener("mouseup", InspectElement, false);
++      win.addEventListener("contextmenu", InspectElement, true);
++    }
++  },
++  uninit: function() {
++    Services.wm.removeListener(this.aListener);
++    var cw =  Services.ww.getWindowEnumerator();
++
++    while (cw.hasMoreElements()) {
++      var win = cw.getNext().QueryInterface(Ci.nsIDOMWindow);
++      win.removeEventListener("click", InspectElement, true);
++
++      if (Services.appinfo.OS == "WINNT") {
++        continue;
++      }
++
++      win.removeEventListener("mouseup", InspectElement, false);
++      win.removeEventListener("contextmenu", InspectElement, true);
++    }
++  }
++}
+\ No newline at end of file
+diff --git a/suite/extensions/inspector/moz.build b/suite/extensions/inspector/moz.build
+--- a/suite/extensions/inspector/moz.build
++++ b/suite/extensions/inspector/moz.build
+@@ -16,13 +16,16 @@ USE_EXTENSION_MANIFEST = True
+ JAR_MANIFESTS += ['jar.mn']
+ 
+ JS_PREFERENCE_FILES += [
+     'resources/content/prefs/inspector.js',
+ ]
+ 
+ EXTRA_COMPONENTS += [
+     'base/js/inspector-cmdline.js',
++    'base/js/inspector-startup.js',
+ ]
+ 
++EXTRA_JS_MODULES += ['modules/InspectElement.jsm']
++
+ FINAL_TARGET_PP_FILES += [
+     'install.rdf',
+ ]
+diff --git a/suite/extensions/inspector/resources/content/prefs/inspector.js b/suite/extensions/inspector/resources/content/prefs/inspector.js
+--- a/suite/extensions/inspector/resources/content/prefs/inspector.js
++++ b/suite/extensions/inspector/resources/content/prefs/inspector.js
+@@ -7,8 +7,12 @@ pref("inspector.blink.border-width", 2);
+ pref("inspector.blink.duration", 1200);
+ pref("inspector.blink.on", true);
+ pref("inspector.blink.speed", 100);
+ pref("inspector.blink.invert", false);
+ pref("inspector.dom.showAnon", true);
+ pref("inspector.dom.showWhitespaceNodes", true);
+ pref("inspector.dom.showAccessibleNodes", false);
+ pref("inspector.dom.showProcessingInstructions", true);
++// Enables inspecting any DOM element by shift + right click
++// This is disabled by default and requires a restart to takeRecords
++// effect.
++pref("inspector.inspectElementKeyCombo.enabled", false);

comm-release/patches/PPPPPPP-tbbranding-253.patch

@@ -1,22 +1,22 @@
 # HG changeset patch
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
 # Date 1621294423 -7200
-# Parent  5cad5f37010eecf45038d07535cd2631539865d2
+# Parent  836bd763431961afdde07981ec9af8b89df3e890
 Bug PPPPPPP - frg 2.53 Use release branding for TB.
 Private patch not for any official SeaMonkey branch.
 
 diff --git a/mail/confvars.sh b/mail/confvars.sh
 --- a/mail/confvars.sh
 +++ b/mail/confvars.sh
-@@ -17,17 +17,17 @@ if test "$OS_ARCH" = "WINNT"; then
-   if ! test "$HAVE_64BIT_BUILD"; then
-     MOZ_VERIFY_MAR_SIGNATURE=1
+@@ -19,17 +19,17 @@ if test "$OS_ARCH" = "WINNT"; then
    fi
  fi
  
  MOZ_APP_VERSION=$THUNDERBIRD_VERSION
  MOZ_APP_VERSION_DISPLAY=$THUNDERBIRD_VERSION_DISPLAY
  
+ BROWSER_CHROME_URL=chrome://messenger/content/messengercompose/messengercompose.xul
+ 
 -MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
 +MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
  MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird

comm-release/patches/series

@@ -2141,6 +2141,19 @@ NOBUG-fixcalbackend-25318.patch
 1437393-fontsasync-25319.patch
 1896174-checkbox-25319.patch
 1437393-fontsasync-format-25319.patch
+1861843-2-version-beta-cr-25319.patch
+1479449-602.patch
+1470307-1-PARTIAL-BACKOUT-25319.patch
+1909858-venkman-25319.patch
+1909864-1-SeekCell-25319.patch
+1909864-2-PickNextCell-25319.patch
+1902849-version-release-cr-25319.patch
+1902851-1-version-prebeta-cr-25320.patch
+1434951-60a1.patch
+1478168-63a1.patch
+1909853-removemsnicq-25320.patch
+1909855-debugqa-esr128-25320.patch
+1909743-suite-prefs-prefers-color-scheme-25320.patch
 PPPPPPP-tbbranding-253.patch
 PPPPPPP-privateprefs-253.patch
 TOP-1534155-PARTIAL-69a1.patch
@@ -2162,23 +2175,11 @@ WIP-1687385-mozconfigs-v2_0-253.patch
 WIP-1070492-composer-findbar-v3-25319.patch
 TOP-1378089-4-WIP-bookmarks-25319.patch
 TOP-1872623-cancelbookmark-25319.patch
-1861843-2-version-beta-cr-25319.patch
-1479449-602.patch
-1902849-version-release-cr-25319.patch
-1902851-1-version-prebeta-cr-25320.patch
 TOP-1906540-mozdevice-removal-comm-25320.patch
-1434951-60a1.patch
-1470307-1-PARTIAL-BACKOUT-25320.patch
-1909743-suite-prefs-prefers-color-scheme-25320.patch
-1909853-removemsnicq-25320.patch
-1909855-debugqa-esr128-25320.patch
-1909858-venkman-25320.patch
-1909864-1-SeekCell-25320.patch
-1909864-2-PickNextCell-25320.patch
 1911830-helpInfo-25320.patch
 1911841-browserChromeURL-25320.patch
-1478168-63a1.patch
 1911844-boxObject-utilityOverlay-25320.patch
 1911845-tabbrowser-dragOver-25320.patch
 1911847-tabbrowser-boxObject-25320.patch
 1911848-tabbrowser-tabDrop-25320.patch
+1912354-domiselect-25320.patch