Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1583377 - Remove xul:page and replace consumers with xul:window r=NeilDeakin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D46869

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Brian Grinstead 2019-09-27 13:04:20 +00:00
parent 75dadec055
commit 5532d17616
15 changed files with 53 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/base/content/test/contextMenu/subtst_contextmenu_xul.xul
View File

@ -3,7 +3,7 @@
- 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/. -->
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml">
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml">
<label id="test-xul-text-link-label" is="text-link" value="XUL text-link label" href="https://www.mozilla.com"/>
</page>
</window>

7
browser/base/content/webext-panels.xul
View File

@ -9,15 +9,14 @@
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
<!DOCTYPE page [
<!DOCTYPE window [
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
%browserDTD;
<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd">
%textcontextDTD;
]>
<page id="webextpanels-window"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
<window id="webextpanels-window"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script src="chrome://global/content/contentAreaUtils.js"/>
<script src="chrome://browser/content/browser.js"/>
@ -77,4 +76,4 @@
/>
</menulist>
</popupset>
</page>
</window>

17
browser/components/places/content/bookmarksSidebar.xul
View File

@ -8,7 +8,7 @@
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/sidebar.css"?>
<!DOCTYPE page [
<!DOCTYPE window [
<!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
%placesDTD;
<!ENTITY % editMenuDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
@ -17,13 +17,12 @@
%browserDTD;
]>
<page id="bookmarksPanel"
class="sidebar-panel"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="init();"
onunload="PlacesUIUtils.setMouseoverURL('', window);"
aria-label="&bookmarksButton.label;">
<window id="bookmarksPanel"
class="sidebar-panel"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="init();"
onunload="PlacesUIUtils.setMouseoverURL('', window);"
aria-label="&bookmarksButton.label;">
<script src="chrome://browser/content/places/bookmarksSidebar.js"/>
<script src="chrome://global/content/globalOverlay.js"/>
@ -59,4 +58,4 @@
<treechildren view="bookmarks-view"
class="sidebar-placesTreechildren" flex="1" tooltip="bhTooltip"/>
</tree>
</page>
</window>

18
browser/components/places/content/historySidebar.xul
View File

@ -8,7 +8,7 @@
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/sidebar.css"?>
<!DOCTYPE page [
<!DOCTYPE window [
<!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
%placesDTD;
<!ENTITY % editMenuDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
@ -17,13 +17,13 @@
%browserDTD;
]>
<page id="history-panel"
class="sidebar-panel"
orient="vertical"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="HistorySidebarInit();"
onunload="PlacesUIUtils.setMouseoverURL('', window);"
aria-label="&historyButton.label;">
<window id="history-panel"
class="sidebar-panel"
orient="vertical"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="HistorySidebarInit();"
onunload="PlacesUIUtils.setMouseoverURL('', window);"
aria-label="&historyButton.label;">
<script src="chrome://browser/content/places/historySidebar.js"/>
<script src="chrome://global/content/globalOverlay.js"/>
@ -90,4 +90,4 @@
</treecols>
<treechildren class="sidebar-placesTreechildren" flex="1" tooltip="bhTooltip"/>
</tree>
</page>
</window>

16
browser/components/preferences/in-content/preferences.xul
View File

@ -16,18 +16,18 @@
<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?>
<!DOCTYPE page>
<!DOCTYPE window>
<!-- @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 -->
<page 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:; style-src chrome: data: 'unsafe-inline'; object-src 'none'"
role="document"
data-l10n-id="pref-page"
data-l10n-attrs="title">
<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:; style-src chrome: data: 'unsafe-inline'; object-src 'none'"
role="document"
data-l10n-id="pref-page"
data-l10n-attrs="title">
<linkset>
<html:link rel="localization" href="branding/brand.ftl"/>
@ -217,4 +217,4 @@
</vbox>
</vbox>
</stack>
</page>
</window>

6
browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.xul
View File

@ -2,8 +2,8 @@
<!--
XUL Widget Test for Bug 1184989
-->
<page title="Bug 1184989 Test"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<window title="Bug 1184989 Test"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox id="container" style="height: 200px; overflow: auto;">
<vbox style="height: 500px;">
@ -23,4 +23,4 @@
</vbox>
</vbox>
</page>
</window>

4
layout/xul/nsBoxFrame.cpp
View File

@ -950,8 +950,8 @@ nsresult nsBoxFrame::AttributeChanged(int32_t aNameSpaceID, nsAtom* aAttribute,
// Ignore 'width', 'height', 'screenX', 'screenY' and 'sizemode' on a
// <window>.
if (mContent->IsAnyOfXULElements(nsGkAtoms::window, nsGkAtoms::page,
nsGkAtoms::dialog, nsGkAtoms::wizard) &&
if (mContent->IsAnyOfXULElements(nsGkAtoms::window, nsGkAtoms::dialog,
nsGkAtoms::wizard) &&
(nsGkAtoms::width == aAttribute || nsGkAtoms::height == aAttribute ||
nsGkAtoms::screenX == aAttribute || nsGkAtoms::screenY == aAttribute ||
nsGkAtoms::sizemode == aAttribute)) {

4
toolkit/content/tests/chrome/frame_popup_anchor.xul
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
@ -78,4 +78,4 @@ function nextTest()
]]>
</script>
</page>
</window>

8
toolkit/content/tests/chrome/frame_subframe_origin_subframe1.xul
View File

@ -4,9 +4,9 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<page id="frame1"
style="background-color:green;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<window id="frame1"
style="background-color:green;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
<spacer height="10px"/>
@ -39,4 +39,4 @@ function mouseMove(e) {
window.addEventListener("mousemove", mouseMove, false);
</script>
</page>
</window>

8
toolkit/content/tests/chrome/frame_subframe_origin_subframe2.xul
View File

@ -4,9 +4,9 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<page id="frame2"
style="background-color:red;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<window id="frame2"
style="background-color:red;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
<spacer height="10px"/>
@ -35,4 +35,4 @@ function mouseMove(e) {
window.addEventListener("mousemove",mouseMove, false);
</script>
</page>
</window>

9
toolkit/content/xul.css
View File

@ -90,8 +90,7 @@ iframe {
/******** window & page ******/
window,
page {
window {
overflow: -moz-hidden-unscrollable;
-moz-box-orient: vertical;
}
@ -554,12 +553,6 @@ dialog:root /* override :root from above */ {
-moz-box-orient: vertical;
}
/********* page ************/
page {
-moz-box-orient: vertical;
}
/********** wizard **********/
wizard,

12
toolkit/mozapps/extensions/content/extensions.xul
View File

@ -19,11 +19,11 @@
- sha512-kSDNX67wegjpcf8CSj/L6h46a0QUKm2CyijGxC5PhSWVvPU9gdd28QVBBFq9t8N5UGKUFdDcZsjYbGSlYG0y3g==
- *) the extensions.webservice.discoverURL using data:, http:, and https:
-->
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
csp="default-src chrome:; frame-src chrome: data: http: https:; script-src chrome: 'sha512-4o5Uf4E4EG+90Mb820FH2YFDf4IuX4bfUwQC7reK1ZhgcXWJBKMK2330XIELaFJJ8HiPffS9mP60MPjuXMIrHA==' 'sha512-kSDNX67wegjpcf8CSj/L6h46a0QUKm2CyijGxC5PhSWVvPU9gdd28QVBBFq9t8N5UGKUFdDcZsjYbGSlYG0y3g=='; object-src 'none'"
id="addons-page" data-l10n-id="addons-window"
role="application" windowtype="Addons:Manager">
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
csp="default-src chrome:; frame-src chrome: data: http: https:; script-src chrome: 'sha512-4o5Uf4E4EG+90Mb820FH2YFDf4IuX4bfUwQC7reK1ZhgcXWJBKMK2330XIELaFJJ8HiPffS9mP60MPjuXMIrHA==' 'sha512-kSDNX67wegjpcf8CSj/L6h46a0QUKm2CyijGxC5PhSWVvPU9gdd28QVBBFq9t8N5UGKUFdDcZsjYbGSlYG0y3g=='; object-src 'none'"
id="addons-page" data-l10n-id="addons-window"
role="application" windowtype="Addons:Manager">
<xhtml:link rel="shortcut icon"
href="chrome://mozapps/skin/extensions/extensionGeneric-16.svg"/>
@ -293,4 +293,4 @@
</hbox>
<addon-abuse-report-xulframe hidden="true"></addon-abuse-report-xulframe>
</stack>
</page>
</window>

1
toolkit/themes/linux/global/global.css
View File

@ -38,7 +38,6 @@
/* ::::: root elements ::::: */
window,
page,
dialog,
wizard {
-moz-appearance: dialog;

1
toolkit/themes/osx/global/global.css
View File

@ -30,7 +30,6 @@
/* ::::: root elements ::::: */
window,
page,
dialog,
wizard {
-moz-appearance: dialog;

1
toolkit/themes/windows/global/global.css
View File

@ -36,7 +36,6 @@
/* ::::: root elements ::::: */
window,
page,
dialog,
wizard {
background-color: -moz-Dialog;