wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to inbound

Browse Source
This commit is contained in:
Wes Kocher 2014-03-05 18:57:07 -08:00
commit 3a9264f10f
33 changed files with 130 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accessible/tests/mochitest/hittest/a11y.ini
View File

@ -2,8 +2,10 @@
support-files = zoom_tree.xul
[test_browser.html]
[text_canvas_hitregion.html]
skip-if = os == "android" || appname == "b2g"
[test_canvas_hitregion.html]
# Disabled everywhere because of failures. It appears this test has
# never executed since its inception.
skip-if = true || (os == "android" || appname == "b2g")
[test_general.html]
[test_menu.xul]
[test_zoom.html]

2
browser/base/content/browser-places.js
View File

@ -1347,7 +1347,7 @@ let BookmarkingUI = {
if (isInBookmarksToolbar)
this.notifier.setAttribute("in-bookmarks-toolbar", true);
let isInOverflowPanel = this.button.classList.contains("overflowedItem");
let isInOverflowPanel = this.button.getAttribute("overflowedItem") == "true";
if (!isInOverflowPanel) {
this.notifier.setAttribute("notification", "finish");
this.button.setAttribute("notification", "finish");

6
browser/base/content/browser.css
View File

@ -257,7 +257,7 @@ toolbarpaletteitem[removable="false"] {
#bookmarks-toolbar-placeholder,
toolbarpaletteitem > #personal-bookmarks > #PlacesToolbar,
#personal-bookmarks[cui-areatype="menu-panel"] > #PlacesToolbar,
#personal-bookmarks[cui-areatype="toolbar"].overflowedItem > #PlacesToolbar {
#personal-bookmarks[cui-areatype="toolbar"][overflowedItem=true] > #PlacesToolbar {
display: none;
}
@ -268,11 +268,11 @@ toolbarpaletteitem > #personal-bookmarks > #PlacesToolbar,
toolbarpaletteitem > #personal-bookmarks > #bookmarks-toolbar-placeholder,
#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder,
#personal-bookmarks[cui-areatype="toolbar"].overflowedItem > #bookmarks-toolbar-placeholder {
#personal-bookmarks[cui-areatype="toolbar"][overflowedItem=true] > #bookmarks-toolbar-placeholder {
display: -moz-box;
}
#zoom-controls[cui-areatype="toolbar"]:not(.overflowedItem) > #zoom-reset-button > .toolbarbutton-text {
#zoom-controls[cui-areatype="toolbar"]:not([overflowedItem=true]) > #zoom-reset-button > .toolbarbutton-text {
display: -moz-box;
}

2
browser/base/content/browser.js
View File

@ -2906,7 +2906,7 @@ const BrowserSearch = {
return;
}
if (placement && placement.area == CustomizableUI.AREA_NAVBAR && searchBar &&
searchBar.parentNode.classList.contains("overflowedItem")) {
searchBar.parentNode.getAttribute("overflowedItem") == "true") {
let navBar = document.getElementById(CustomizableUI.AREA_NAVBAR);
navBar.overflowable.show().then(() => {
focusSearchBar();

4
browser/components/customizableui/content/panelUI.xml
View File

@ -249,11 +249,11 @@
target = edge + center;
}
this._mainViewContainer.style.transform = "translateX(" + target + "px)";
aAnchor.classList.add("panel-multiview-anchor");
aAnchor.setAttribute("panel-multiview-anchor", true);
} else {
this._mainViewContainer.style.transform = "";
if (this.anchorElement)
this.anchorElement.classList.remove("panel-multiview-anchor");
this.anchorElement.removeAttribute("panel-multiview-anchor");
}
this.anchorElement = aAnchor;
]]></body>

14
browser/components/customizableui/src/CustomizableUI.jsm
View File

@ -3327,7 +3327,7 @@ function WidgetSingleWrapper(aWidget, aNode) {
});
this.__defineGetter__("overflowed", function() {
return aNode.classList.contains("overflowedItem");
return aNode.getAttribute("overflowedItem") == "true";
});
Object.freeze(this);
@ -3417,7 +3417,7 @@ function XULWidgetSingleWrapper(aWidgetId, aNode) {
});
this.__defineGetter__("overflowed", function() {
return aNode.classList.contains("overflowedItem");
return aNode.getAttribute("overflowedItem") == "true";
});
Object.freeze(this);
@ -3574,7 +3574,7 @@ OverflowableToolbar.prototype = {
if (child.getAttribute("overflows") != "false") {
this._collapsed.set(child.id, this._target.clientWidth);
child.classList.add("overflowedItem");
child.setAttribute("overflowedItem", true);
child.setAttribute("cui-anchorid", this._chevron.id);
CustomizableUIInternal.notifyListeners("onWidgetOverflow", child, this._target);
@ -3632,7 +3632,7 @@ OverflowableToolbar.prototype = {
this._target.appendChild(child);
}
child.removeAttribute("cui-anchorid");
child.classList.remove("overflowedItem");
child.removeAttribute("overflowedItem");
CustomizableUIInternal.notifyListeners("onWidgetUnderflow", child, this._target);
}
@ -3707,7 +3707,7 @@ OverflowableToolbar.prototype = {
let minSize = this._collapsed.get(prevId);
this._collapsed.set(aNode.id, minSize);
aNode.setAttribute("cui-anchorid", this._chevron.id);
aNode.classList.add("overflowedItem");
aNode.setAttribute("overflowedItem", true);
CustomizableUIInternal.notifyListeners("onWidgetOverflow", aNode, this._target);
}
// If it is not overflowed and not in the toolbar, and was not overflowed
@ -3725,7 +3725,7 @@ OverflowableToolbar.prototype = {
if (!nowOverflowed) {
this._collapsed.delete(aNode.id);
aNode.removeAttribute("cui-anchorid");
aNode.classList.remove("overflowedItem");
aNode.removeAttribute("overflowedItem");
CustomizableUIInternal.notifyListeners("onWidgetUnderflow", aNode, this._target);
if (!this._collapsed.size) {
@ -3768,7 +3768,7 @@ OverflowableToolbar.prototype = {
},
getContainerFor: function(aNode) {
if (aNode.classList.contains("overflowedItem")) {
if (aNode.getAttribute("overflowedItem") == "true") {
return this._list;
}
return this._target;

4
browser/components/customizableui/test/browser_884402_customize_from_overflow.js
View File

@ -30,7 +30,7 @@ add_task(function() {
let shownContextPromise = contextMenuShown(contextMenu);
let homeButton = document.getElementById("home-button");
ok(homeButton, "home-button was found");
ok(homeButton.classList.contains("overflowedItem"), "Home button is overflowing");
is(homeButton.getAttribute("overflowedItem"), "true", "Home button is overflowing");
EventUtils.synthesizeMouse(homeButton, 2, 2, {type: "contextmenu", button: 2});
yield shownContextPromise;
@ -74,5 +74,5 @@ add_task(function() {
ok(homeButtonPlacement, "Home button should still have a placement");
is(homeButtonPlacement && homeButtonPlacement.area, "nav-bar", "Home button should be back in the navbar now");
ok(homeButton.classList.contains("overflowedItem"), "Home button should still be overflowed");
is(homeButton.getAttribute("overflowedItem"), "true", "Home button should still be overflowed");
});

14
browser/components/customizableui/test/browser_914138_widget_API_overflowable_toolbar.js
View File

@ -30,14 +30,14 @@ add_task(function() {
ok(!navbar.querySelector("#" + kHomeBtn), "Home button should no longer be in the navbar");
let homeBtnNode = overflowList.querySelector("#" + kHomeBtn);
ok(homeBtnNode, "Home button should be overflowing");
ok(homeBtnNode && homeBtnNode.classList.contains("overflowedItem"), "Home button should have overflowedItem class");
ok(homeBtnNode && homeBtnNode.getAttribute("overflowedItem") == "true", "Home button should have overflowedItem attribute");
let placementOfHomeButton = CustomizableUI.getWidgetIdsInArea(navbar.id).indexOf(kHomeBtn);
CustomizableUI.addWidgetToArea(kTestBtn1, navbar.id, placementOfHomeButton);
ok(!navbar.querySelector("#" + kTestBtn1), "New button should not be in the navbar");
let newButtonNode = overflowList.querySelector("#" + kTestBtn1);
ok(newButtonNode, "New button should be overflowing");
ok(newButtonNode && newButtonNode.classList.contains("overflowedItem"), "New button should have overflowedItem class");
ok(newButtonNode && newButtonNode.getAttribute("overflowedItem") == "true", "New button should have overflowedItem attribute");
let nextEl = newButtonNode && newButtonNode.nextSibling;
is(nextEl && nextEl.id, kHomeBtn, "Test button should be next to home button.");
@ -45,11 +45,11 @@ add_task(function() {
yield waitForCondition(() => !navbar.hasAttribute("overflowing"));
ok(!navbar.hasAttribute("overflowing"), "Should not have an overflowing toolbar.");
ok(navbar.querySelector("#" + kHomeBtn), "Home button should be in the navbar");
ok(homeBtnNode && !homeBtnNode.classList.contains("overflowedItem"), "Home button should no longer have overflowedItem class");
ok(homeBtnNode && (homeBtnNode.getAttribute("overflowedItem") != "true"), "Home button should no longer have overflowedItem attribute");
ok(!overflowList.querySelector("#" + kHomeBtn), "Home button should no longer be overflowing");
ok(navbar.querySelector("#" + kTestBtn1), "Test button should be in the navbar");
ok(!overflowList.querySelector("#" + kTestBtn1), "Test button should no longer be overflowing");
ok(newButtonNode && !newButtonNode.classList.contains("overflowedItem"), "New button should no longer have overflowedItem class");
ok(newButtonNode && (newButtonNode.getAttribute("overflowedItem") != "true"), "New button should no longer have overflowedItem attribute");
let el = document.getElementById(kTestBtn1);
if (el) {
CustomizableUI.removeWidgetFromArea(kTestBtn1);
@ -101,13 +101,13 @@ add_task(function() {
ok(!navbar.querySelector("#" + kHomeBtn), "Home button should no longer be in the navbar");
let homeBtnNode = overflowList.querySelector("#" + kHomeBtn);
ok(homeBtnNode, "Home button should be overflowing");
ok(homeBtnNode && homeBtnNode.classList.contains("overflowedItem"), "Home button should have overflowedItem class");
ok(homeBtnNode && homeBtnNode.getAttribute("overflowedItem") == "true", "Home button should have overflowedItem class");
let testBtnSpec = {id: kTestBtn3, label: "Overflowable widget test", defaultArea: "nav-bar"};
CustomizableUI.createWidget(testBtnSpec);
let testNode = overflowList.querySelector("#" + kTestBtn3);
ok(testNode, "Test button should be overflowing");
ok(testNode && testNode.classList.contains("overflowedItem"), "Test button should have overflowedItem class");
ok(testNode && testNode.getAttribute("overflowedItem") == "true", "Test button should have overflowedItem class");
CustomizableUI.destroyWidget(kTestBtn3);
testNode = document.getElementById(kTestBtn3);
@ -116,7 +116,7 @@ add_task(function() {
CustomizableUI.createWidget(testBtnSpec);
testNode = overflowList.querySelector("#" + kTestBtn3);
ok(testNode, "Test button should be overflowing");
ok(testNode && testNode.classList.contains("overflowedItem"), "Test button should have overflowedItem class");
ok(testNode && testNode.getAttribute("overflowedItem") == "true", "Test button should have overflowedItem class");
CustomizableUI.removeWidgetFromArea(kTestBtn3);
testNode = document.getElementById(kTestBtn3);

1
browser/components/sessionstore/test/browser.ini
View File

@ -86,7 +86,6 @@ support-files =
skip-if = true
[browser_339445.js]
[browser_345898.js]
[browser_346337.js]
[browser_350525.js]
[browser_354894_perwindowpb.js]
[browser_367052.js]

6
browser/devtools/commandline/test/browser.ini
View File

@ -49,8 +49,10 @@ support-files =
[browser_cmd_settings.js]
[browser_gcli_async.js]
[browser_gcli_canon.js]
[browser_gcli_cli.js]
[browser_gcli_completion.js]
[browser_gcli_cli1.js]
[browser_gcli_cli2.js]
[browser_gcli_completion1.js]
[browser_gcli_completion2.js]
[browser_gcli_date.js]
skip-if = true # Disabled until TZ bug is fixed
[browser_gcli_exec.js]

1
browser/devtools/sourceeditor/test/browser.ini
View File

@ -25,4 +25,3 @@ support-files =
[browser_css_autocompletion.js]
[browser_css_statemachine.js]
[browser_vimemacs.js]
[browser_sourceeditor_initialization.js]

12
browser/themes/osx/browser.css
View File

@ -1023,7 +1023,7 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
-moz-image-region: rect(0px, 320px, 64px, 256px);
}
#bookmarks-menu-button[cui-areatype="menu-panel"].panel-multiview-anchor {
#bookmarks-menu-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-moz-image-region: rect(64px, 320px, 128px, 256px);
}
@ -1032,7 +1032,7 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
-moz-image-region: rect(0px, 448px, 64px, 384px);
}
#history-panelmenu[cui-areatype="menu-panel"].panel-multiview-anchor {
#history-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-moz-image-region: rect(64px, 448px, 128px, 384px);
}
@ -1076,7 +1076,7 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
-moz-image-region: rect(0, 960px, 64px, 896px);
}
#characterencoding-button[cui-areatype="menu-panel"].panel-multiview-anchor {
#characterencoding-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-moz-image-region: rect(64px, 960px, 128px, 896px);
}
@ -1120,7 +1120,7 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
-moz-image-region: rect(0px, 1472px, 64px, 1408px);
}
#developer-button[cui-areatype="menu-panel"].panel-multiview-anchor {
#developer-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-moz-image-region: rect(64px, 1472px, 128px, 1408px);
}
@ -1533,12 +1533,12 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
border-bottom-left-radius: 0;
}
#zoom-controls[cui-areatype="toolbar"]:not(.overflowedItem) > #zoom-reset-button {
#zoom-controls[cui-areatype="toolbar"]:not([overflowedItem=true]) > #zoom-reset-button {
min-width: 0;
margin: 0;
}
#zoom-controls[cui-areatype="toolbar"]:not(.overflowedItem) > #zoom-reset-button > .toolbarbutton-text {
#zoom-controls[cui-areatype="toolbar"]:not([overflowedItem=true]) > #zoom-reset-button > .toolbarbutton-text {
padding-top: 8px;
margin: 2px;
}

2
browser/themes/osx/customizableui/panelUIOverlay.css
View File

@ -5,7 +5,7 @@
%include ../../shared/customizableui/panelUIOverlay.inc.css
@media (min-resolution: 2dppx) {
toolbarbutton.panel-multiview-anchor {
toolbarbutton[panel-multiview-anchor=true] {
background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted@2x.png),
linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0));
background-size: 16px, auto;

2
browser/themes/shared/browser.inc
View File

@ -1,5 +1,5 @@
%filter substitution
%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button
%define inAnyPanel :-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)
%define inAnyPanel :-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])
%define nestedButtons #zoom-out-button, #zoom-in-button, #cut-button, #copy-button, #paste-button

15
browser/themes/shared/customizableui/panelUIOverlay.inc.css
View File

@ -693,22 +693,22 @@ menuitem.subviewbutton@menuStateActive@,
height: 16px;
}
#PanelUI-footer > #PanelUI-footer-inner.panel-multiview-anchor,
toolbarbutton.panel-multiview-anchor {
#PanelUI-footer > #PanelUI-footer-inner[panel-multiview-anchor=true],
toolbarbutton[panel-multiview-anchor=true] {
background-color: Highlight;
background-image: linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0));
}
toolbarbutton.panel-multiview-anchor {
toolbarbutton[panel-multiview-anchor=true] {
background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted.png),
linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0));
background-position: right 5px center;
background-repeat: no-repeat;
}
#PanelUI-footer > #PanelUI-footer-inner.panel-multiview-anchor,
toolbarbutton.panel-multiview-anchor,
toolbarbutton.panel-multiview-anchor > .toolbarbutton-menubutton-button {
#PanelUI-footer > #PanelUI-footer-inner[panel-multiview-anchor=true],
toolbarbutton[panel-multiview-anchor=true],
toolbarbutton[panel-multiview-anchor=true] > .toolbarbutton-menubutton-button {
color: HighlightText;
}
@ -844,7 +844,8 @@ toolbarpaletteitem[place="palette"] > #search-container {
padding-right: 10px;
}
#widget-overflow-list > .overflowedItem {
toolbaritem[overflowedItem=true],
toolbarbutton[overflowedItem=true] {
width: 100%;
max-width: @menuPanelWidth@;
min-height: 36px;

8
browser/themes/shared/menupanel.inc.css
View File

@ -15,7 +15,7 @@ toolbarpaletteitem[place="palette"] > #bookmarks-menu-button {
-moz-image-region: rect(0px, 160px, 32px, 128px);
}
#bookmarks-menu-button[cui-areatype="menu-panel"].panel-multiview-anchor {
#bookmarks-menu-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-moz-image-region: rect(32px, 160px, 64px, 128px);
}
@ -24,7 +24,7 @@ toolbarpaletteitem[place="palette"] > #history-panelmenu {
-moz-image-region: rect(0px, 224px, 32px, 192px);
}
#history-panelmenu[cui-areatype="menu-panel"].panel-multiview-anchor {
#history-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-moz-image-region: rect(32px, 224px, 64px, 192px);
}
@ -68,7 +68,7 @@ toolbarpaletteitem[place="palette"] > #characterencoding-button {
-moz-image-region: rect(0px, 480px, 32px, 448px);
}
#characterencoding-button[cui-areatype="menu-panel"].panel-multiview-anchor {
#characterencoding-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-moz-image-region: rect(32px, 480px, 64px, 448px);
}
@ -112,7 +112,7 @@ toolbarpaletteitem[place="palette"] > #developer-button {
-moz-image-region: rect(0px, 736px, 32px, 704px);
}
#developer-button[cui-areatype="menu-panel"].panel-multiview-anchor {
#developer-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-moz-image-region: rect(32px, 736px, 64px, 704px);
}

6
browser/themes/windows/browser.css
View File

@ -478,8 +478,8 @@ menuitem.bookmark-item {
list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
}
.toolbarbutton-1 > .toolbarbutton-menu-dropmarker:-moz-lwtheme-brighttext,
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-brighttext {
toolbar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:-moz-lwtheme-brighttext,
toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-brighttext {
list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
}
@ -1462,7 +1462,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
-moz-margin-start: 5px;
}
#bookmarks-menu-button[cui-areatype="toolbar"]:not(.bookmark-item):not(.overflowedItem) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"]:not(.bookmark-item):not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
padding-top: 2px;
padding-bottom: 2px;
}

1
dom/encoding/test/unit/mochitest.ini
View File

@ -7,4 +7,3 @@
[test_hz-gb-2312.js]
[test_iso-2022-jp.js]
[test_shift_jis.js]
[test_singlebytes.js]

82
dom/imptests/html/mochitest.ini
View File

@ -172,41 +172,41 @@ support-files =
skip-if = true # bug 859075
[html/browsers/the-window-object/test_window-properties.html]
[html/browsers/the-window-object/test_window-prototype-chain.html]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-case.html]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-case.xhtml]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-id.html]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-id.xhtml]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-namespace.html]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-namespace.xhtml]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.html]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.xhtml]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-null-undef.html]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-null-undef.xhtml]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-param.html]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-param.xhtml]
[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-same.html]
[html/dom/documents/dom-tree-accessors/test_Document.getElementsByClassName-null-undef.html]
[html/dom/documents/dom-tree-accessors/test_Element.getElementsByClassName-null-undef.html]
[html/dom/documents/dom-tree-accessors/test_document.body-getter.html]
[html/dom/documents/dom-tree-accessors/test_document.body-setter-01.html]
[html/dom/documents/dom-tree-accessors/test_document.embeds-document.plugins-01.html]
[html/dom/documents/dom-tree-accessors/test_document.getElementsByClassName-same.html]
[html/dom/documents/dom-tree-accessors/test_document.head-01.html]
[html/dom/documents/dom-tree-accessors/test_document.head-02.html]
[html/dom/documents/dom-tree-accessors/test_document.images.html]
[html/dom/documents/dom-tree-accessors/test_document.title-01.html]
[html/dom/documents/dom-tree-accessors/test_document.title-02.xhtml]
[html/dom/documents/dom-tree-accessors/test_document.title-03.html]
[html/dom/documents/dom-tree-accessors/test_document.title-04.xhtml]
[html/dom/documents/dom-tree-accessors/test_document.title-05.html]
[html/dom/documents/dom-tree-accessors/test_document.title-06.html]
[html/dom/documents/dom-tree-accessors/test_document.title-07.html]
[html/dom/documents/dom-tree-accessors/test_nameditem-01.html]
[html/dom/documents/dom-tree-accessors/test_nameditem-02.html]
[html/dom/documents/dom-tree-accessors/test_nameditem-03.html]
[html/dom/documents/dom-tree-accessors/test_nameditem-04.html]
[html/dom/documents/dom-tree-accessors/test_nameditem-05.html]
[html/dom/documents/dom-tree-accessors/test_nameditem-06.html]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-case.html]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-case.xhtml]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-id.html]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-id.xhtml]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-namespace.html]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-namespace.xhtml]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-newelements.html]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-newelements.xhtml]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-null-undef.html]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-null-undef.xhtml]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-param.html]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-param.xhtml]
[html/dom/documents/dta/doc.gEBN/test_document.getElementsByName-same.html]
[html/dom/documents/dta/test_Document.getElementsByClassName-null-undef.html]
[html/dom/documents/dta/test_Element.getElementsByClassName-null-undef.html]
[html/dom/documents/dta/test_document.body-getter.html]
[html/dom/documents/dta/test_document.body-setter-01.html]
[html/dom/documents/dta/test_document.embeds-document.plugins-01.html]
[html/dom/documents/dta/test_document.getElementsByClassName-same.html]
[html/dom/documents/dta/test_document.head-01.html]
[html/dom/documents/dta/test_document.head-02.html]
[html/dom/documents/dta/test_document.images.html]
[html/dom/documents/dta/test_document.title-01.html]
[html/dom/documents/dta/test_document.title-02.xhtml]
[html/dom/documents/dta/test_document.title-03.html]
[html/dom/documents/dta/test_document.title-04.xhtml]
[html/dom/documents/dta/test_document.title-05.html]
[html/dom/documents/dta/test_document.title-06.html]
[html/dom/documents/dta/test_document.title-07.html]
[html/dom/documents/dta/test_nameditem-01.html]
[html/dom/documents/dta/test_nameditem-02.html]
[html/dom/documents/dta/test_nameditem-03.html]
[html/dom/documents/dta/test_nameditem-04.html]
[html/dom/documents/dta/test_nameditem-05.html]
[html/dom/documents/dta/test_nameditem-06.html]
[html/dom/elements/global-attributes/test_classlist-nonstring.html]
[html/dom/elements/global-attributes/test_dataset-delete.html]
[html/dom/elements/global-attributes/test_dataset-enumeration.html]
@ -217,12 +217,12 @@ skip-if = true # bug 859075
[html/dom/elements/global-attributes/test_document-dir.html]
[html/dom/elements/global-attributes/test_id-attribute.html]
[html/dom/elements/global-attributes/test_id-name.html]
[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-01.html]
[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-02.html]
[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-03.html]
[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-04.html]
[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_heading-obsolete-attributes-01.html]
[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_script-IDL-event-htmlfor.html]
[html/obsolete/implreq/oeaaa/test_document-color-01.html]
[html/obsolete/implreq/oeaaa/test_document-color-02.html]
[html/obsolete/implreq/oeaaa/test_document-color-03.html]
[html/obsolete/implreq/oeaaa/test_document-color-04.html]
[html/obsolete/implreq/oeaaa/test_heading-obsolete-attributes-01.html]
[html/obsolete/implreq/oeaaa/test_script-IDL-event-htmlfor.html]
[html/semantics/document-metadata/the-title-element/test_title.text-01.html]
[html/semantics/document-metadata/the-title-element/test_title.text-02.xhtml]
[html/semantics/document-metadata/the-title-element/test_title.text-03.html]

3
dom/tests/mochitest/notification/chrome.ini
View File

@ -1,3 +0,0 @@
[DEFAULT]
[test_system_principal.xul]

3
dom/tests/mochitest/notification/moz.build
View File

@ -5,6 +5,3 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOCHITEST_MANIFESTS += ['mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']

12
dom/tests/mochitest/webcomponents/mochitest.ini
View File

@ -5,16 +5,16 @@ support-files =
[test_bug900724.html]
[test_content_element.html]
[test_nested_content_element.html]
[test_dyanmic_content_element_matching.html]
[test_dynamic_content_element_matching.html]
[test_document_register.html]
[test_document_register_base_queue.html]
[test_document_register_lifecycle.html]
[test_document_register_parser.html]
[test_document_register_stack.html]
[test_template.html]
[test_shadow_root.html]
[test_shadow_root_inert_element.html]
[test_shadow_root_style.html]
[test_shadow_root_style_multiple_shadow.html]
[test_shadow_root_style_order.html]
[test_shadowroot.html]
[test_shadowroot_inert_element.html]
[test_shadowroot_style.html]
[test_shadowroot_style_multiple_shadow.html]
[test_shadowroot_style_order.html]
[test_style_fallback_content.html]

10
mobile/android/base/home/HomePager.java
View File

@ -216,10 +216,8 @@ public class HomePager extends ViewPager {
public void setCurrentItem(int item, boolean smoothScroll) {
super.setCurrentItem(item, smoothScroll);
// Android doesn't call onPageSelected when there is only one page. Make sure we activate
// the banner in this case.
if (mHomeBanner != null && getAdapter().getCount() == 1) {
mHomeBanner.setActive(true);
if (mDecor != null) {
mDecor.onPageSelected(item);
}
}
@ -263,10 +261,6 @@ public class HomePager extends ViewPager {
mDecor.removeAllPagerViews();
}
if (mHomeBanner != null) {
mHomeBanner.setActive(false);
}
final HomeAdapter adapter = (HomeAdapter) getAdapter();
// Destroy any existing panels currently loaded

11
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -476,7 +476,16 @@ class TreeMetadataEmitter(LoggingMixin):
filtered = m.tests
if filter_inactive:
filtered = m.active_tests(disabled=False, **self.mozinfo)
# We return tests that don't exist because we want manifests
# defining tests that don't exist to result in error.
filtered = m.active_tests(exists=False, disabled=False,
**self.mozinfo)
missing = [t['name'] for t in filtered if not os.path.exists(t['path'])]
if missing:
raise SandboxValidationError('Test manifest (%s) lists '
'test that does not exist: %s' % (
path, ', '.join(missing)))
out_dir = mozpath.join(install_prefix, manifest_reldir)

0
python/mozbuild/mozbuild/test/backend/data/test-manifests-duplicate-support-files/test_bar.js Normal file
View File

0
python/mozbuild/mozbuild/test/backend/data/test-manifests-written/mochitest.js Normal file
View File

1
python/mozbuild/mozbuild/test/frontend/data/test-manifest-missing-test-file/mochitest.ini Normal file
View File

@ -0,0 +1 @@
[test_missing.html]

4
python/mozbuild/mozbuild/test/frontend/data/test-manifest-missing-test-file/moz.build Normal file
View File

@ -0,0 +1,4 @@
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
MOCHITEST_MANIFESTS += ['mochitest.ini']

0
python/mozbuild/mozbuild/test/frontend/data/test-manifest-unmatched-generated/test_foo Normal file
View File

8
python/mozbuild/mozbuild/test/frontend/test_emitter.py
View File

@ -476,6 +476,14 @@ class TestEmitterBasic(unittest.TestCase):
self.assertEqual(o.installs[expected],
('testing/mochitest/tests/child/support-file.txt', False))
def test_test_manifest_missing_test_error(self):
"""Missing test files should result in error."""
reader = self.reader('test-manifest-missing-test-file')
with self.assertRaisesRegexp(SandboxValidationError,
'lists test that does not exist: test_missing.html'):
self.read_topsrcdir(reader)
def test_ipdl_sources(self):
reader = self.reader('ipdl_sources')
objs = self.read_topsrcdir(reader)

10
toolkit/themes/windows/global/inContentUI.css
View File

@ -25,18 +25,16 @@ html|html {
}
%ifdef WINDOWS_AERO
@media (-moz-windows-default-theme) {
@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
(-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
*|*:root {
color: #000;
background-color: #CCD9EA;
background-image: /* Texture */
url("chrome://global/skin/inContentUI/background-texture.png");
}
}
@media (-moz-windows-compositor) {
@media (-moz-windows-glass) {
*|*:root {
color: #000;
/* Blame shorlander for this monstrosity. */
background-image: /* Side gradients */
linear-gradient(to right,
@ -74,7 +72,7 @@ html|html {
}
%ifdef WINDOWS_AERO
@media (-moz-windows-compositor) {
@media (-moz-windows-glass) {
/* Buttons */
*|button,
menulist,

11
tools/update-packaging/make_incremental_update.sh
View File

@ -235,17 +235,6 @@ for ((i=0; $i<$num_newfiles; i=$i+1)); do
copy_perm "$newdir/$f" "$workdir/$f"
if check_for_add_if_not_update "$f"; then
# Raise an exception if a new channel-prefs.js or update-settings.ini file
# is found to prevent it from being to a new location like happened in
# bug 756325.
if [ `basename $f` = "channel-prefs.js" ]; then
notice "new channel-prefs.js file found: $f"
exit 1
fi
if [ `basename $f` = "update-settings.ini" ]; then
notice "new update-settings.ini file found: $f"
exit 1
fi
make_add_if_not_instruction "$f" "$updatemanifestv3"
else
make_add_instruction "$f" "$updatemanifestv2" "$updatemanifestv3"

9
tools/update-packaging/make_incremental_updates.py
View File

@ -366,15 +366,6 @@ def create_partial_patch(from_dir_path, to_dir_path, patch_filename, shas, patch
add_filenames.sort(reverse=True)
for filename in add_filenames:
if os.path.basename(filename) in add_if_not_list:
# Raise an exception if a new channel-prefs.js or
# update-settings.ini file is found to prevent it from being
# to a new location like happened in bug 756325.
if os.path.basename(filename) == 'channel-prefs.js':
raise Exception, "new channel-prefs.js file found: "+filename
if os.path.basename(filename) == 'update-settings.ini':
raise Exception, "new update-settings.ini file found: "+filename
create_add_if_not_patch_for_file(to_dir_hash[filename], patch_info)
else:
create_add_patch_for_file(to_dir_hash[filename], patch_info)