Backed out 4 changesets (bug 1588142) for failures on browser_canvasframe_helper_02.js. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Thu, 14 Nov 2019 00:18:21 +0200
changeset 501823 b42b424565738fdf7dd1edaddf73bda03df040f5
parent 501822 e17aebea669678319835e399324df56eb14c78cf
child 501824 7272d77d4e808dcbbd1f4f50210786dd326b218a
push id114172
push userdluca@mozilla.com
push dateTue, 19 Nov 2019 11:31:10 +0000
treeherdermozilla-inbound@b5c5ba07d3db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1588142
milestone72.0a1
backs out2284a535c8bc5a34c448665c99bdf0d7ea2d73f2
939b6b3922c2802abedb336712b08e605687e716
1a5f2b044f827e6063218f6f6ff6a6b7e6066106
87336cc7f8a1afe7dbd042fd23de5ae3010b0845
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
Backed out 4 changesets (bug 1588142) for failures on browser_canvasframe_helper_02.js. CLOSED TREE Backed out changeset 2284a535c8bc (bug 1588142) Backed out changeset 939b6b3922c2 (bug 1588142) Backed out changeset 1a5f2b044f82 (bug 1588142) Backed out changeset 87336cc7f8a1 (bug 1588142)
browser/base/content/tabbrowser.js
browser/components/preferences/in-content/preferences.xul
browser/locales/en-US/browser/preferences/preferences.ftl
browser/themes/linux/preferences/in-content/preferences.css
browser/themes/osx/preferences/in-content/preferences.css
browser/themes/osx/preferences/preferences.css
browser/themes/shared/incontentprefs/preferences.inc.css
browser/themes/windows/preferences/in-content/preferences.css
python/l10n/fluent_migrations/bug_1588142_about_preferences_title.py
toolkit/content/tests/browser/browser_label_textlink.js
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -5248,26 +5248,16 @@
         if (!tab || tab.hasAttribute("pending")) {
           return;
         }
 
         if (!browser.docShell || event.target != browser.docShell.document) {
           return;
         }
 
-        // Ignore empty title changes on internal pages. This prevents the title
-        // from changing while Fluent is populating the (initially-empty) title
-        // element.
-        if (
-          !browser.contentTitle &&
-          browser.contentPrincipal.isSystemPrincipal
-        ) {
-          return;
-        }
-
         var titleChanged = this.setTabTitle(tab);
         if (titleChanged && !tab.selected && !tab.hasAttribute("busy")) {
           tab.setAttribute("titlechanged", "true");
         }
       });
 
       this.addEventListener("oop-browser-crashed", event => {
         if (!event.isTrusted) {
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -11,64 +11,62 @@
   href="chrome://browser/skin/preferences/in-content/preferences.css"?>
 <?xml-stylesheet
   href="chrome://browser/content/preferences/handlers.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?>
 
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        role="document">
+<!DOCTYPE window>
 
-<head>
-  <!-- @CSP: The 'oncommand' handler for 'focusSearch1' can not easily be rewritten (see Bug 371900)
-       hence we are allowing the inline handler in the script-src directive using the hash
-       sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ==
-       Additionally we should remove 'unsafe-inline' from style-src, see Bug 1579160 -->
-  <meta http-equiv="Content-Security-Policy" content="default-src chrome:; script-src chrome: 'sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ=='; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'" />
-
-  <title data-l10n-id="pref-page-title"></title>
+<!-- @CSP: The 'oncommand' handler for 'focusSearch1' can not easily be rewritten (see Bug 371900)
+     hence we are allowing the inline handler in the script-src directive using the hash
+     sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ==
+     Additionally we should remove 'unsafe-inline' from style-src, see Bug 1579160 -->
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        csp="default-src chrome:; script-src chrome: 'sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ=='; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'"
+        role="document"
+        data-l10n-id="pref-page"
+        data-l10n-attrs="title">
 
-  <link rel="localization" href="branding/brand.ftl"/>
-  <link rel="localization" href="browser/branding/brandings.ftl"/>
-  <link rel="localization" href="browser/branding/sync-brand.ftl"/>
-  <link rel="localization" href="browser/preferences/preferences.ftl"/>
-  <!-- Used by fontbuilder.js -->
-  <link rel="localization" href="browser/preferences/fonts.ftl"/>
+  <linkset>
+    <html:link rel="localization" href="branding/brand.ftl"/>
+    <html:link rel="localization" href="browser/branding/brandings.ftl"/>
+    <html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
+    <html:link rel="localization" href="browser/preferences/preferences.ftl"/>
+    <!-- Used by fontbuilder.js -->
+    <html:link rel="localization" href="browser/preferences/fonts.ftl"/>
 
-  <!-- Links below are only used for search-l10n-ids into subdialogs -->
-  <link rel="localization" href="browser/preferences/blocklists.ftl"/>
-  <link rel="localization" href="browser/preferences/clearSiteData.ftl"/>
-  <link rel="localization" href="browser/preferences/colors.ftl"/>
-  <link rel="localization" href="browser/preferences/connection.ftl"/>
-  <link rel="localization" href="browser/preferences/languages.ftl"/>
-  <link rel="localization" href="browser/preferences/permissions.ftl"/>
-  <link rel="localization" href="browser/preferences/selectBookmark.ftl"/>
-  <link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
-  <link rel="localization" href="browser/aboutDialog.ftl"/>
-  <link rel="localization" href="browser/sanitize.ftl"/>
-  <link rel="localization" href="toolkit/updates/history.ftl"/>
-  <link rel="localization" href="security/certificates/deviceManager.ftl"/>
-  <link rel="localization" href="security/certificates/certManager.ftl"/>
+    <!-- Links below are only used for search-l10n-ids into subdialogs -->
+    <html:link rel="localization" href="browser/preferences/blocklists.ftl"/>
+    <html:link rel="localization" href="browser/preferences/clearSiteData.ftl"/>
+    <html:link rel="localization" href="browser/preferences/colors.ftl"/>
+    <html:link rel="localization" href="browser/preferences/connection.ftl"/>
+    <html:link rel="localization" href="browser/preferences/languages.ftl"/>
+    <html:link rel="localization" href="browser/preferences/permissions.ftl"/>
+    <html:link rel="localization" href="browser/preferences/selectBookmark.ftl"/>
+    <html:link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
+    <html:link rel="localization" href="browser/aboutDialog.ftl"/>
+    <html:link rel="localization" href="browser/sanitize.ftl"/>
+    <html:link rel="localization" href="toolkit/updates/history.ftl"/>
+    <html:link rel="localization" href="security/certificates/deviceManager.ftl"/>
+    <html:link rel="localization" href="security/certificates/certManager.ftl"/>
+  </linkset>
 
-  <link rel="shortcut icon" href="chrome://browser/skin/settings.svg"/>
+  <html:link rel="shortcut icon"
+              href="chrome://browser/skin/settings.svg"/>
 
   <script src="chrome://browser/content/utilityOverlay.js"/>
   <script src="chrome://global/content/preferencesBindings.js"/>
   <script src="chrome://browser/content/preferences/in-content/preferences.js"/>
   <script src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
   <script src="chrome://browser/content/preferences/in-content/findInPage.js"/>
   <script src="chrome://browser/content/preferences/in-content/subdialogs.js"/>
-</head>
-
-<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <stringbundle id="pkiBundle"
                 src="chrome://pippki/locale/pippki.properties"/>
   <stringbundle id="browserBundle"
                 src="chrome://browser/locale/browser.properties"/>
 
   <stack id="preferences-stack" flex="1">
   <hbox flex="1">
@@ -214,10 +212,9 @@
                 data-l10n-id="close-button"/>
       </hbox>
       <browser class="dialogFrame"
                autoscroll="false"
                disablehistory="true"/>
     </vbox>
   </vbox>
   </stack>
-</html:body>
-</html>
+</window>
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -4,21 +4,22 @@
 
 do-not-track-description = Send websites a “Do Not Track” signal that you don’t want to be tracked
 do-not-track-learn-more = Learn more
 do-not-track-option-default-content-blocking-known =
     .label = Only when { -brand-short-name } is set to block known trackers
 do-not-track-option-always =
     .label = Always
 
-pref-page-title =
-    { PLATFORM() ->
-        [windows] Options
-       *[other] Preferences
-    }
+pref-page =
+    .title =
+        { PLATFORM() ->
+            [windows] Options
+           *[other] Preferences
+        }
 
 # This is used to determine the width of the search field in about:preferences,
 # in order to make the entire placeholder string visible
 #
 # Please keep the placeholder string short to avoid truncation.
 #
 # Notice: The value of the `.style` attribute is a CSS string, and the `width`
 # is the name of the CSS property. It is intended only to adjust the element's width.
--- a/browser/themes/linux/preferences/in-content/preferences.css
+++ b/browser/themes/linux/preferences/in-content/preferences.css
@@ -1,15 +1,15 @@
 /* - 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 ../../../shared/incontentprefs/preferences.inc.css
 
-body {
+:root > * {
   font-size: 1.11em;
 }
 
 .treecol-sortdirection {
   /* override the Linux only toolkit rule */
   -moz-appearance: none;
 }
 
--- a/browser/themes/osx/preferences/in-content/preferences.css
+++ b/browser/themes/osx/preferences/in-content/preferences.css
@@ -1,15 +1,15 @@
 /* - 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 ../../../shared/incontentprefs/preferences.inc.css
 
-body {
+:root > * {
   font-size: 1.36em;
 }
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
   margin-top: 2px;
   margin-inline-start: 2px;
   margin-inline-end: 8px !important;
 }
--- a/browser/themes/osx/preferences/preferences.css
+++ b/browser/themes/osx/preferences/preferences.css
@@ -2,17 +2,17 @@
 # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # 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 ../../../../toolkit/themes/osx/global/shared.inc
 
-:root {
+window {
   font: -moz-dialog;
 }
 
 tabpanels {
   padding: 20px 7px 7px;
 }
 
 #popupPolicyRow {
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -2,41 +2,26 @@
 /* - 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/. */
 %endif
 @namespace html "http://www.w3.org/1999/xhtml";
 
 :root {
   --in-content-warning-container: var(--grey-20);
-  text-rendering: optimizeLegibility;
 }
 
 @supports -moz-bool-pref("browser.in-content.dark-mode") {
 @media (prefers-color-scheme: dark) {
   :root {
     --in-content-warning-container: var(--grey-90-a30);
   }
 }
 }
 
-:root,
-body {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-  width: 100%;
-  overflow: hidden;
-}
-
-body {
-  display: -moz-box;
-  -moz-box-orient: vertical;
-}
-
 * {
   -moz-user-select: text;
 }
 
 /*
   The default min-height:auto value makes grid items (and XUL flex items) refuse
   to be smaller than their content. In this case, we have some tall very content
   inside of us, and yet we don't want to be taller than the viewport (and we know
--- a/browser/themes/windows/preferences/in-content/preferences.css
+++ b/browser/themes/windows/preferences/in-content/preferences.css
@@ -1,13 +1,13 @@
 /* - 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 ../../../shared/incontentprefs/preferences.inc.css
 
-body {
+:root > * {
   font-size: 1.25em;
 }
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
   margin-inline-end: 9px;
 }
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1588142_about_preferences_title.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-from fluent.migrate import COPY_PATTERN
-from fluent.migrate.helpers import transforms_from
-
-def migrate(ctx):
-    """Bug 1588142 - about:preferences - migrate the root xul:window element to an html:html element, part {index}."""
-
-    ctx.add_transforms(
-        "browser/browser/preferences/preferences.ftl",
-        "browser/browser/preferences/preferences.ftl",
-        transforms_from(
-"""
-pref-page-title = {COPY_PATTERN(from_file, "pref-page.title")}
-""", from_file="browser/browser/preferences/preferences.ftl"))
--- a/toolkit/content/tests/browser/browser_label_textlink.js
+++ b/toolkit/content/tests/browser/browser_label_textlink.js
@@ -4,17 +4,17 @@ add_task(async function() {
     async function(browser) {
       let newTabURL = "http://www.example.com/";
       await ContentTask.spawn(browser, newTabURL, async function(newTabURL) {
         let doc = content.document;
         let label = doc.createXULElement("label", { is: "text-link" });
         label.href = newTabURL;
         label.id = "textlink-test";
         label.textContent = "click me";
-        doc.body.append(label);
+        doc.documentElement.append(label);
       });
 
       // Test that click will open tab in foreground.
       let awaitNewTab = BrowserTestUtils.waitForNewTab(gBrowser, newTabURL);
       await BrowserTestUtils.synthesizeMouseAtCenter(
         "#textlink-test",
         {},
         browser