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 fx-team to central, a=merge CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2015-09-16 10:14:30 -07:00
commit 25f8e1cd0d
148 changed files with 5599 additions and 5313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6807,10 +6807,6 @@ var gIdentityHandler = {
delete this._identityIcon;
return this._identityIcon = document.getElementById("page-proxy-favicon");
},
get _permissionsContainer () {
delete this._permissionsContainer;
return this._permissionsContainer = document.getElementById("identity-popup-permissions");
},
get _permissionList () {
delete this._permissionList;
return this._permissionList = document.getElementById("identity-popup-permission-list");
@ -6826,14 +6822,12 @@ var gIdentityHandler = {
delete this._identityIconLabel;
delete this._identityIconCountryLabel;
delete this._identityIcon;
delete this._permissionsContainer;
delete this._permissionList;
this._identityBox = document.getElementById("identity-box");
this._identityIcons = document.getElementById("identity-icons");
this._identityIconLabel = document.getElementById("identity-icon-label");
this._identityIconCountryLabel = document.getElementById("identity-icon-country-label");
this._identityIcon = document.getElementById("page-proxy-favicon");
this._permissionsContainer = document.getElementById("identity-popup-permissions");
this._permissionList = document.getElementById("identity-popup-permission-list");
},
@ -7325,8 +7319,6 @@ var gIdentityHandler = {
let item = this._createPermissionItem(permission, state);
this._permissionList.appendChild(item);
}
this._permissionsContainer.hidden = !this._permissionList.hasChildNodes();
},
setPermission: function (aPermission, aState) {

12
browser/base/content/test/general/browser_permissions.js
View File

@ -18,15 +18,19 @@ add_task(function* testMainViewVisible() {
let tab = gBrowser.selectedTab = gBrowser.addTab();
yield promiseTabLoadEvent(tab, PERMISSIONS_PAGE);
let permissionsList = document.getElementById("identity-popup-permission-list");
let emptyLabel = permissionsList.nextSibling;
gIdentityHandler._identityBox.click();
ok(is_hidden(gIdentityHandler._permissionsContainer), "The container is hidden");
ok(!is_hidden(emptyLabel), "List of permissions is empty");
gIdentityHandler._identityPopup.hidden = true;
gIdentityHandler.setPermission("install", 1);
gIdentityHandler._identityBox.click();
ok(!is_hidden(gIdentityHandler._permissionsContainer), "The container is visible");
let menulists = gIdentityHandler._permissionsContainer.querySelectorAll("menulist");
ok(is_hidden(emptyLabel), "List of permissions is not empty");
let menulists = permissionsList.querySelectorAll("menulist");
is(menulists.length, 1, "One permission visible in main view");
is(menulists[0].id, "identity-popup-permission:install", "Install permission visible");
is(menulists[0].value, "1", "Correct value on install menulist");
@ -35,6 +39,6 @@ add_task(function* testMainViewVisible() {
gIdentityHandler.setPermission("install", SitePermissions.getDefault("install"));
gIdentityHandler._identityBox.click();
ok(is_hidden(gIdentityHandler._permissionsContainer), "The container is hidden");
ok(!is_hidden(emptyLabel), "List of permissions is empty");
gIdentityHandler._identityPopup.hidden = true;
});

20
browser/branding/aurora/content/jar.mn
View File

@ -4,16 +4,16 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png (about.png)
content/branding/about-background.png (about-background.png)
content/branding/about-logo.png (about-logo.png)
content/branding/about-logo@2x.png (about-logo@2x.png)
content/branding/about-wordmark.svg (about-wordmark.svg)
content/branding/icon48.png (icon48.png)
content/branding/icon64.png (icon64.png)
content/branding/about.png
content/branding/about-background.png
content/branding/about-logo.png
content/branding/about-logo@2x.png
content/branding/about-wordmark.svg
content/branding/icon48.png
content/branding/icon64.png
content/branding/icon16.png (../default16.png)
content/branding/icon32.png (../default32.png)
content/branding/icon128.png (../mozicon128.png)
content/branding/identity-icons-brand.svg (identity-icons-brand.svg)
content/branding/silhouette-40.svg (silhouette-40.svg)
content/branding/aboutDialog.css (aboutDialog.css)
content/branding/identity-icons-brand.svg
content/branding/silhouette-40.svg
content/branding/aboutDialog.css

2
browser/branding/aurora/locales/jar.mn
View File

@ -9,4 +9,4 @@
# Aurora branding only exists in en-US
locale/branding/brand.dtd (en-US/brand.dtd)
locale/branding/brand.properties (en-US/brand.properties)
locale/branding/browserconfig.properties (browserconfig.properties)
locale/branding/browserconfig.properties

20
browser/branding/nightly/content/jar.mn
View File

@ -4,16 +4,16 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png (about.png)
content/branding/about-background.png (about-background.png)
content/branding/about-logo.png (about-logo.png)
content/branding/about-logo@2x.png (about-logo@2x.png)
content/branding/about-wordmark.svg (about-wordmark.svg)
content/branding/icon48.png (icon48.png)
content/branding/icon64.png (icon64.png)
content/branding/about.png
content/branding/about-background.png
content/branding/about-logo.png
content/branding/about-logo@2x.png
content/branding/about-wordmark.svg
content/branding/icon48.png
content/branding/icon64.png
content/branding/icon16.png (../default16.png)
content/branding/icon32.png (../default32.png)
content/branding/icon128.png (../mozicon128.png)
content/branding/identity-icons-brand.svg (identity-icons-brand.svg)
content/branding/silhouette-40.svg (silhouette-40.svg)
content/branding/aboutDialog.css (aboutDialog.css)
content/branding/identity-icons-brand.svg
content/branding/silhouette-40.svg
content/branding/aboutDialog.css

2
browser/branding/nightly/locales/jar.mn
View File

@ -9,4 +9,4 @@
# Nightly branding only exists in en-US
locale/branding/brand.dtd (en-US/brand.dtd)
locale/branding/brand.properties (en-US/brand.properties)
locale/branding/browserconfig.properties (browserconfig.properties)
locale/branding/browserconfig.properties

18
browser/branding/official/content/jar.mn
View File

@ -4,15 +4,15 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png (about.png)
content/branding/about-logo.png (about-logo.png)
content/branding/about-logo@2x.png (about-logo@2x.png)
content/branding/about-wordmark.svg (about-wordmark.svg)
content/branding/icon48.png (icon48.png)
content/branding/icon64.png (icon64.png)
content/branding/about.png
content/branding/about-logo.png
content/branding/about-logo@2x.png
content/branding/about-wordmark.svg
content/branding/icon48.png
content/branding/icon64.png
content/branding/icon16.png (../default16.png)
content/branding/icon32.png (../default32.png)
content/branding/icon128.png (../mozicon128.png)
content/branding/identity-icons-brand.svg (identity-icons-brand.svg)
content/branding/silhouette-40.svg (silhouette-40.svg)
content/branding/aboutDialog.css (aboutDialog.css)
content/branding/identity-icons-brand.svg
content/branding/silhouette-40.svg
content/branding/aboutDialog.css

2
browser/branding/official/locales/jar.mn
View File

@ -8,4 +8,4 @@
% locale branding @AB_CD@ %locale/branding/
locale/branding/brand.dtd (%brand.dtd)
* locale/branding/brand.properties (%brand.properties)
* locale/branding/browserconfig.properties (browserconfig.properties)
* locale/branding/browserconfig.properties

20
browser/branding/unofficial/content/jar.mn
View File

@ -4,16 +4,16 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png (about.png)
content/branding/about-background.png (about-background.png)
content/branding/about-logo.png (about-logo.png)
content/branding/about-logo@2x.png (about-logo@2x.png)
content/branding/about-wordmark.svg (about-wordmark.svg)
content/branding/icon48.png (icon48.png)
content/branding/icon64.png (icon64.png)
content/branding/about.png
content/branding/about-background.png
content/branding/about-logo.png
content/branding/about-logo@2x.png
content/branding/about-wordmark.svg
content/branding/icon48.png
content/branding/icon64.png
content/branding/icon16.png (../default16.png)
content/branding/icon32.png (../default32.png)
content/branding/icon128.png (../mozicon128.png)
content/branding/identity-icons-brand.svg (identity-icons-brand.svg)
content/branding/silhouette-40.svg (silhouette-40.svg)
content/branding/aboutDialog.css (aboutDialog.css)
content/branding/identity-icons-brand.svg
content/branding/silhouette-40.svg
content/branding/aboutDialog.css

2
browser/branding/unofficial/locales/jar.mn
View File

@ -9,4 +9,4 @@
# Unofficial branding only exists in en-US
locale/branding/brand.dtd (en-US/brand.dtd)
locale/branding/brand.properties (en-US/brand.properties)
locale/branding/browserconfig.properties (browserconfig.properties)
locale/branding/browserconfig.properties

3
browser/components/controlcenter/content/panel.inc.xul
View File

@ -81,11 +81,12 @@
</hbox>
<!-- Permissions Section -->
<hbox id="identity-popup-permissions" class="identity-popup-section">
<hbox class="identity-popup-section">
<vbox id="identity-popup-permissions-content" flex="1">
<label class="identity-popup-headline"
value="&identity.permissions;"/>
<vbox id="identity-popup-permission-list"/>
<description>&identity.permissionsEmpty;</description>
</vbox>
</hbox>
</panelview>

12
browser/components/extensions/jar.mn
View File

@ -3,9 +3,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
browser.jar:
content/browser/extension.svg (extension.svg)
content/browser/ext-utils.js (ext-utils.js)
content/browser/ext-contextMenus.js (ext-contextMenus.js)
content/browser/ext-browserAction.js (ext-browserAction.js)
content/browser/ext-tabs.js (ext-tabs.js)
content/browser/ext-windows.js (ext-windows.js)
content/browser/extension.svg
content/browser/ext-utils.js
content/browser/ext-contextMenus.js
content/browser/ext-browserAction.js
content/browser/ext-tabs.js
content/browser/ext-windows.js

2
browser/components/loop/ui/index.html
View File

@ -2,7 +2,7 @@
<!-- 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/. -->
<html>
<html id="outer-html">
<head>
<meta charset="utf-8">
<title>Loop UI Components Showcase</title>

17
browser/components/loop/ui/ui-showcase.css
View File

@ -2,15 +2,20 @@
* 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/. */
body {
/* Override the hidden in common.css. Very important otherwise you can't
* scroll the showcase.
html[dir="rtl"]:not(.outer-html) {
/* Temporary work around and visual hack -
* Scope the root body overflow visible to remove the scroll bars that appear
* inside an iFrame. Can remove this rule after core layout fix for
* https://bugzilla.mozilla.org/show_bug.cgi?id=1204680 has landed.
*/
overflow: visible;
overflow: hidden;
}
.overflow-hidden {
overflow: hidden;
body {
/* Override the "overflow: hidden" rule on the body in common.css.
* Very important; otherwise you can't scroll the showcase.
*/
overflow: visible;
}
.showcase {

4
browser/components/pocket/jar.mn
View File

@ -3,8 +3,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
browser.jar:
content/browser/pocket/main.js (main.js)
content/browser/pocket/pktApi.js (pktApi.js)
content/browser/pocket/main.js
content/browser/pocket/pktApi.js
content/browser/pocket/panels/saved.html (panels/saved.html)
content/browser/pocket/panels/signup.html (panels/signup.html)
content/browser/pocket/panels/css/normalize.css (panels/css/normalize.css)

8
browser/components/tabview/jar.mn
View File

@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
browser.jar:
content/browser/tabview.css (tabview.css)
* content/browser/tabview.js (tabview.js)
content/browser/tabview.html (tabview.html)
content/browser/tabview-content.js (content.js)
content/browser/tabview.css
* content/browser/tabview.js
content/browser/tabview.html
content/browser/tabview-content.js (content.js)

7
browser/devtools/framework/selection.js
View File

@ -6,9 +6,10 @@
"use strict";
const {Cu, Ci} = require("chrome");
const { Cu, Ci } = require("chrome");
const { getRootBindingParent } = require("devtools/toolkit/layout/utils");
let EventEmitter = require("devtools/toolkit/event-emitter");
let LayoutHelpers = require("devtools/toolkit/layout-helpers");
/**
* API
@ -228,7 +229,7 @@ Selection.prototype = {
let doc = this.document;
if (doc && doc.defaultView) {
let docEl = doc.documentElement;
let bindingParent = LayoutHelpers.getRootBindingParent(rawNode);
let bindingParent = getRootBindingParent(rawNode);
if (docEl.contains(bindingParent)) {
return true;

2
browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_02.js
View File

@ -9,7 +9,7 @@ Bug 1014547 - CSS transforms highlighter
Test that the highlighter elements created have the right size and coordinates.
Note that instead of hard-coding values here, the assertions are made by
comparing with the result of LayoutHelpers.getAdjustedQuads.
comparing with the result of getAdjustedQuads.
There's a separate test for checking that getAdjustedQuads actually returns
sensible values

6
browser/devtools/markupview/markup-view.js
View File

@ -32,7 +32,7 @@ const {setTimeout, clearTimeout, setInterval, clearInterval} = require("sdk/time
const {parseAttribute} = require("devtools/shared/node-attribute-parser");
const ELLIPSIS = Services.prefs.getComplexValue("intl.ellipsis", Ci.nsIPrefLocalizedString).data;
const {Task} = require("resource://gre/modules/Task.jsm");
const LayoutHelpers = require("devtools/toolkit/layout-helpers");
const {scrollIntoViewIfNeeded} = require("devtools/toolkit/layout/utils");
Cu.import("resource://gre/modules/devtools/Templater.jsm");
Cu.import("resource://gre/modules/Services.jsm");
@ -75,8 +75,6 @@ function MarkupView(aInspector, aFrame, aControllerWindow) {
this._elt = this.doc.querySelector("#root");
this.htmlEditor = new HTMLEditor(this.doc);
this.layoutHelpers = new LayoutHelpers(this.doc.defaultView);
try {
this.maxChildren = Services.prefs.getIntPref("devtools.markup.pagesize");
} catch(ex) {
@ -940,7 +938,7 @@ MarkupView.prototype = {
}
return this._ensureVisible(aNode);
}).then(() => {
this.layoutHelpers.scrollIntoViewIfNeeded(this.getContainer(aNode).editor.elt, centered);
scrollIntoViewIfNeeded(this.getContainer(aNode).editor.elt, centered);
}, e => {
// Only report this rejection as an error if the panel hasn't been
// destroyed in the meantime.

75
browser/devtools/shared/test/browser_layoutHelpers-getBoxQuads.js
View File

@ -1,45 +1,42 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that LayoutHelpers.getAdjustedQuads works properly in a variety of use
// cases including iframes, scroll and zoom
// Tests getAdjustedQuads works properly in a variety of use cases including
// iframes, scroll and zoom
const {utils: Cu} = Components;
const LayoutHelpers = require("devtools/toolkit/layout-helpers");
let {getAdjustedQuads} = require("devtools/toolkit/layout/utils");
const TEST_URI = TEST_URI_ROOT + "browser_layoutHelpers-getBoxQuads.html";
function test() {
addTab(TEST_URI, function(browser, tab) {
let doc = browser.contentDocument;
let win = doc.defaultView;
info("Creating a new LayoutHelpers instance for the test window");
let helper = new LayoutHelpers(win);
ok(helper.getAdjustedQuads, "getAdjustedQuads is defined");
ok(typeof getAdjustedQuads === "function", "getAdjustedQuads is defined");
info("Running tests");
returnsTheRightDataStructure(doc, helper);
isEmptyForMissingNode(doc, helper);
isEmptyForHiddenNodes(doc, helper);
defaultsToBorderBoxIfNoneProvided(doc, helper);
returnsLikeGetBoxQuadsInSimpleCase(doc, helper);
takesIframesOffsetsIntoAccount(doc, helper);
takesScrollingIntoAccount(doc, helper);
takesZoomIntoAccount(doc, helper);
returnsMultipleItemsForWrappingInlineElements(doc, helper);
returnsTheRightDataStructure(doc);
isEmptyForMissingNode(doc);
isEmptyForHiddenNodes(doc);
defaultsToBorderBoxIfNoneProvided(doc);
returnsLikeGetBoxQuadsInSimpleCase(doc);
takesIframesOffsetsIntoAccount(doc);
takesScrollingIntoAccount(doc);
takesZoomIntoAccount(doc);
returnsMultipleItemsForWrappingInlineElements(doc);
gBrowser.removeCurrentTab();
finish();
});
}
function returnsTheRightDataStructure(doc, helper) {
function returnsTheRightDataStructure(doc) {
info("Checks that the returned data contains bounds and 4 points");
let node = doc.querySelector("body");
let [res] = helper.getAdjustedQuads(node, "content");
let [res] = getAdjustedQuads(doc.defaultView, node, "content");
ok("bounds" in res, "The returned data has a bounds property");
ok("p1" in res, "The returned data has a p1 property");
@ -59,33 +56,33 @@ function returnsTheRightDataStructure(doc, helper) {
}
}
function isEmptyForMissingNode(doc, helper) {
function isEmptyForMissingNode(doc) {
info("Checks that null is returned for invalid nodes");
for (let input of [null, undefined, "", 0]) {
is(helper.getAdjustedQuads(input).length, 0, "A 0-length array is returned" +
is(getAdjustedQuads(doc.defaultView, input).length, 0, "A 0-length array is returned" +
"for input " + input);
}
}
function isEmptyForHiddenNodes(doc, helper) {
function isEmptyForHiddenNodes(doc) {
info("Checks that null is returned for nodes that aren't rendered");
let style = doc.querySelector("#styles");
is(helper.getAdjustedQuads(style).length, 0,
is(getAdjustedQuads(doc.defaultView, style).length, 0,
"null is returned for a <style> node");
let hidden = doc.querySelector("#hidden-node");
is(helper.getAdjustedQuads(hidden).length, 0,
is(getAdjustedQuads(doc.defaultView, hidden).length, 0,
"null is returned for a hidden node");
}
function defaultsToBorderBoxIfNoneProvided(doc, helper) {
function defaultsToBorderBoxIfNoneProvided(doc) {
info("Checks that if no boxtype is passed, then border is the default one");
let node = doc.querySelector("#simple-node-with-margin-padding-border");
let [withBoxType] = helper.getAdjustedQuads(node, "border");
let [withoutBoxType] = helper.getAdjustedQuads(node);
let [withBoxType] = getAdjustedQuads(doc.defaultView, node, "border");
let [withoutBoxType] = getAdjustedQuads(doc.defaultView, node);
for (let boundProp of
["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
@ -102,7 +99,7 @@ function defaultsToBorderBoxIfNoneProvided(doc, helper) {
}
}
function returnsLikeGetBoxQuadsInSimpleCase(doc, helper) {
function returnsLikeGetBoxQuadsInSimpleCase(doc) {
info("Checks that for an element in the main frame, without scroll nor zoom" +
"that the returned value is similar to the returned value of getBoxQuads");
@ -112,7 +109,7 @@ function returnsLikeGetBoxQuadsInSimpleCase(doc, helper) {
let expected = node.getBoxQuads({
box: region
})[0];
let [actual] = helper.getAdjustedQuads(node, region);
let [actual] = getAdjustedQuads(doc.defaultView, node, region);
for (let boundProp of
["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
@ -131,7 +128,7 @@ function returnsLikeGetBoxQuadsInSimpleCase(doc, helper) {
}
}
function takesIframesOffsetsIntoAccount(doc, helper) {
function takesIframesOffsetsIntoAccount(doc) {
info("Checks that the quad returned for a node inside iframes that have " +
"margins takes those offsets into account");
@ -139,7 +136,7 @@ function takesIframesOffsetsIntoAccount(doc, helper) {
let subIframe = rootIframe.contentDocument.querySelector("iframe");
let innerNode = subIframe.contentDocument.querySelector("#inner-node");
let [quad] = helper.getAdjustedQuads(innerNode, "content");
let [quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
//rootIframe margin + subIframe margin + node margin + node border + node padding
let p1x = 10 + 10 + 10 + 10 + 10;
@ -150,7 +147,7 @@ function takesIframesOffsetsIntoAccount(doc, helper) {
is(quad.p2.x, p2x, "The inner node's p2 x position is correct");
}
function takesScrollingIntoAccount(doc, helper) {
function takesScrollingIntoAccount(doc) {
info("Checks that the quad returned for a node inside multiple scrolled " +
"containers takes the scroll values into account");
@ -164,7 +161,7 @@ function takesScrollingIntoAccount(doc, helper) {
subScrolledNode.scrollTop = 200;
let innerNode = doc.querySelector("#inner-scrolled-node");
let [quad] = helper.getAdjustedQuads(innerNode, "content");
let [quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
is(quad.p1.x, 0, "p1.x of the scrolled node is correct after scrolling down");
is(quad.p1.y, -300, "p1.y of the scrolled node is correct after scrolling down");
@ -172,12 +169,12 @@ function takesScrollingIntoAccount(doc, helper) {
scrolledNode.scrollTop = 0;
subScrolledNode.scrollTop = 0;
[quad] = helper.getAdjustedQuads(innerNode, "content");
[quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
is(quad.p1.x, 0, "p1.x of the scrolled node is correct after scrolling up");
is(quad.p1.y, 0, "p1.y of the scrolled node is correct after scrolling up");
}
function takesZoomIntoAccount(doc, helper) {
function takesZoomIntoAccount(doc) {
info("Checks that if the page is zoomed in/out, the quad returned is correct");
// Hard-coding coordinates in this zoom test is a bad idea as it can vary
@ -185,11 +182,11 @@ function takesZoomIntoAccount(doc, helper) {
// bigger quad and zooming out produces a smaller quad
let node = doc.querySelector("#simple-node-with-margin-padding-border");
let [defaultQuad] = helper.getAdjustedQuads(node);
let [defaultQuad] = getAdjustedQuads(doc.defaultView, node);
info("Zoom in");
window.FullZoom.enlarge();
let [zoomedInQuad] = helper.getAdjustedQuads(node);
let [zoomedInQuad] = getAdjustedQuads(doc.defaultView, node);
ok(zoomedInQuad.bounds.width > defaultQuad.bounds.width,
"The zoomed in quad is bigger than the default one");
@ -199,7 +196,7 @@ function takesZoomIntoAccount(doc, helper) {
info("Zoom out");
window.FullZoom.reset();
window.FullZoom.reduce();
let [zoomedOutQuad] = helper.getAdjustedQuads(node);
let [zoomedOutQuad] = getAdjustedQuads(doc.defaultView, node);
ok(zoomedOutQuad.bounds.width < defaultQuad.bounds.width,
"The zoomed out quad is smaller than the default one");
@ -209,11 +206,11 @@ function takesZoomIntoAccount(doc, helper) {
window.FullZoom.reset();
}
function returnsMultipleItemsForWrappingInlineElements(doc, helper) {
function returnsMultipleItemsForWrappingInlineElements(doc) {
info("Checks that several quads are returned for inline elements that span line-breaks");
let node = doc.querySelector("#inline");
let quads = helper.getAdjustedQuads(node, "content");
let quads = getAdjustedQuads(doc.defaultView, node, "content");
// At least 3 because of the 2 <br />, maybe more depending on the window size.
ok(quads.length >= 3, "Multiple quads were returned");

20
browser/devtools/shared/test/browser_layoutHelpers.js
View File

@ -2,8 +2,7 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that scrollIntoViewIfNeeded works properly.
const LayoutHelpers = require("devtools/toolkit/layout-helpers");
let {scrollIntoViewIfNeeded} = require("devtools/toolkit/layout/utils");
const TEST_URI = TEST_URI_ROOT + "browser_layoutHelpers.html";
@ -14,7 +13,6 @@ add_task(function*() {
});
function runTest(win) {
let lh = new LayoutHelpers(win);
let some = win.document.getElementById('some');
some.style.top = win.innerHeight + 'px';
@ -24,35 +22,35 @@ function runTest(win) {
let xPos = Math.floor(win.innerWidth / 2);
win.scroll(xPos, win.innerHeight + 2); // Above the viewport.
lh.scrollIntoViewIfNeeded(some);
scrollIntoViewIfNeeded(some);
is(win.scrollY, Math.floor(win.innerHeight / 2) + 1,
'Element completely hidden above should appear centered.');
is(win.scrollX, xPos,
'scrollX position has not changed.');
win.scroll(win.innerWidth / 2, win.innerHeight + 1); // On the top edge.
lh.scrollIntoViewIfNeeded(some);
scrollIntoViewIfNeeded(some);
is(win.scrollY, win.innerHeight,
'Element partially visible above should appear above.');
is(win.scrollX, xPos,
'scrollX position has not changed.');
win.scroll(win.innerWidth / 2, 0); // Just below the viewport.
lh.scrollIntoViewIfNeeded(some);
scrollIntoViewIfNeeded(some);
is(win.scrollY, Math.floor(win.innerHeight / 2) + 1,
'Element completely hidden below should appear centered.');
is(win.scrollX, xPos,
'scrollX position has not changed.');
win.scroll(win.innerWidth / 2, 1); // On the bottom edge.
lh.scrollIntoViewIfNeeded(some);
scrollIntoViewIfNeeded(some);
is(win.scrollY, 2,
'Element partially visible below should appear below.');
is(win.scrollX, xPos,
'scrollX position has not changed.');
win.scroll(win.innerWidth / 2, win.innerHeight + 2); // Above the viewport.
lh.scrollIntoViewIfNeeded(some, false);
scrollIntoViewIfNeeded(some, false);
is(win.scrollY, win.innerHeight,
'Element completely hidden above should appear above ' +
'if parameter is false.');
@ -60,7 +58,7 @@ function runTest(win) {
'scrollX position has not changed.');
win.scroll(win.innerWidth / 2, win.innerHeight + 1); // On the top edge.
lh.scrollIntoViewIfNeeded(some, false);
scrollIntoViewIfNeeded(some, false);
is(win.scrollY, win.innerHeight,
'Element partially visible above should appear above ' +
'if parameter is false.');
@ -68,7 +66,7 @@ function runTest(win) {
'scrollX position has not changed.');
win.scroll(win.innerWidth / 2, 0); // Below the viewport.
lh.scrollIntoViewIfNeeded(some, false);
scrollIntoViewIfNeeded(some, false);
is(win.scrollY, 2,
'Element completely hidden below should appear below ' +
'if parameter is false.');
@ -76,7 +74,7 @@ function runTest(win) {
'scrollX position has not changed.');
win.scroll(win.innerWidth / 2, 1); // On the bottom edge.
lh.scrollIntoViewIfNeeded(some, false);
scrollIntoViewIfNeeded(some, false);
is(win.scrollY, 2,
'Element partially visible below should appear below ' +
'if parameter is false.');

10
browser/devtools/shared/test/test-actor.js
View File

@ -7,7 +7,7 @@
// A helper actor for brower/devtools/inspector tests.
let { Cc, Ci, Cu, Cr } = require("chrome");
const LayoutHelpers = require("devtools/toolkit/layout-helpers");
const {getElementFromPoint, getAdjustedQuads} = require("devtools/toolkit/layout/utils");
const promise = require("promise");
const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
let DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
@ -28,7 +28,7 @@ let dumpn = msg => {
* highlighter actor.
* The instance provides methods to get/set attributes/text/style on nodes of
* the highlighter, inserted into the nsCanvasFrame.
* @see /toolkit/devtools/server/actors/highlighter.js
* @see /toolkit/devtools/server/actors/highlighters.js
* @param {String} actorID
*/
function getHighlighterCanvasFrameHelper(conn, actorID) {
@ -239,8 +239,7 @@ const TestActor = exports.TestActor = protocol.ActorClass({
}),
assertElementAtPoint: protocol.method(function (x, y, selector) {
let helper = new LayoutHelpers(this.content);
let elementAtPoint = helper.getElementFromPoint(this.content.document, x, y);
let elementAtPoint = getElementFromPoint(this.content.document, x, y);
if (!elementAtPoint) {
throw new Error("Unable to find element at (" + x + ", " + y + ")");
}
@ -266,10 +265,9 @@ const TestActor = exports.TestActor = protocol.ActorClass({
*/
getAllAdjustedQuads: protocol.method(function(selector) {
let regions = {};
let helper = new LayoutHelpers(this.content);
let node = this._querySelector(selector);
for (let boxType of ["content", "padding", "border", "margin"]) {
regions[boxType] = helper.getAdjustedQuads(node, boxType);
regions[boxType] = getAdjustedQuads(this.content, node, boxType);
}
return regions;

4
browser/devtools/shared/widgets/Graphs.js
View File

@ -7,7 +7,7 @@ const { Cc, Ci, Cu, Cr } = require("chrome");
const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
const { Heritage, setNamedTimeout, clearNamedTimeout } = require("resource:///modules/devtools/ViewHelpers.jsm");
const LayoutHelpers = require("devtools/toolkit/layout-helpers");
const { getCurrentZoom } = require("devtools/toolkit/layout/utils");
loader.lazyRequireGetter(this, "promise");
loader.lazyRequireGetter(this, "EventEmitter",
@ -925,7 +925,7 @@ AbstractCanvasGraph.prototype = {
// The coordinates need to be modified with the current zoom level
// to prevent them from being wrong.
let zoom = LayoutHelpers.getCurrentZoom(this._canvas);
let zoom = getCurrentZoom(this._canvas);
mouseX /= zoom;
mouseY /= zoom;

6
browser/devtools/tilt/test/browser_tilt_utils05.js
View File

@ -55,11 +55,11 @@ function test() {
iframe.contentWindow.innerHeight,
"The content window height wasn't calculated correctly.");
let lh = new LayoutHelpers(gBrowser.contentWindow);
let nodeCoordinates = lh.getRect(
let nodeCoordinates = getRect(
gBrowser.contentWindow,
iframe.contentDocument.getElementById("test-div"), iframe.contentWindow);
let frameOffset = lh.getIframeContentOffset(iframe);
let frameOffset = getIframeContentOffset(iframe);
let frameRect = iframe.getBoundingClientRect();
is(nodeCoordinates.top, frameRect.top + frameOffset[0] + 98,

6
browser/devtools/tilt/test/browser_tilt_utils07.js
View File

@ -104,11 +104,11 @@ function test() {
iframe.contentWindow.innerHeight,
"The content window height wasn't calculated correctly.");
let lh = new LayoutHelpers(gBrowser.contentWindow);
let nodeCoordinates = lh.getRect(
let nodeCoordinates = getRect(
gBrowser.contentWindow,
iframe.contentDocument.getElementById("test-div"), iframe.contentWindow);
let frameOffset = lh.getIframeContentOffset(iframe);
let frameOffset = getIframeContentOffset(iframe);
let frameRect = iframe.getBoundingClientRect();
is(nodeCoordinates.top, frameRect.top + frameOffset[0],

2
browser/devtools/tilt/test/head.js
View File

@ -9,7 +9,7 @@ let {EPSILON, TiltMath, vec3, mat3, mat4, quat4} = require("devtools/tilt/tilt-m
let TiltUtils = require("devtools/tilt/tilt-utils");
let {TiltVisualizer} = require("devtools/tilt/tilt-visualizer");
let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
let LayoutHelpers = require("devtools/toolkit/layout-helpers");
let {getRect, getIframeContentOffset} = require("devtools/toolkit/layout/utils");
const DEFAULT_HTML = "data:text/html," +

5
browser/devtools/tilt/tilt-utils.js
View File

@ -6,10 +6,10 @@
"use strict";
const {Cc, Ci, Cu} = require("chrome");
const {getRect} = require("devtools/toolkit/layout/utils");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
let LayoutHelpers = require("devtools/toolkit/layout-helpers");
const STACK_THICKNESS = 15;
@ -405,9 +405,8 @@ TiltUtils.DOM = {
*/
getNodePosition: function TUD_getNodePosition(aContentWindow, aNode,
aParentPosition) {
let lh = new LayoutHelpers(aContentWindow);
// get the x, y, width and height coordinates of the node
let coord = lh.getRect(aNode, aContentWindow);
let coord = getRect(aContentWindow, aNode, aContentWindow);
if (!coord) {
return null;
}

6
browser/devtools/webaudioeditor/controller.js
View File

@ -185,9 +185,9 @@ let WebAudioEditorController = {
* Called when a new node is created. Creates an `AudioNodeView` instance
* for tracking throughout the editor.
*/
_onCreateNode: Task.async(function* (nodeActor) {
yield gAudioNodes.add(nodeActor);
}),
_onCreateNode: function (nodeActor) {
gAudioNodes.add(nodeActor);
},
/**
* Called on `destroy-node` when an AudioNode is GC'd. Removes

52
browser/devtools/webaudioeditor/models.js
View File

@ -24,36 +24,12 @@ const AudioNodeModel = Class({
initialize: function (actor) {
this.actor = actor;
this.id = actor.actorID;
this.type = actor.type;
this.bypassable = actor.bypassable;
this._bypassed = false;
this.connections = [];
},
/**
* After instantiating the AudioNodeModel, calling `setup` caches values
* from the actor onto the model. In this case, only the type of audio node.
*
* @return promise
*/
setup: Task.async(function* () {
yield this.getType();
// Query bypass status on start up
this._bypassed = yield this.isBypassed();
// Store whether or not this node is bypassable in the first place
this.bypassable = !AUDIO_NODE_DEFINITION[this.type].unbypassable;
}),
/**
* A proxy for the underlying AudioNodeActor to fetch its type
* and subsequently assign the type to the instance.
*
* @return Promise->String
*/
getType: Task.async(function* () {
this.type = yield this.actor.getType();
return this.type;
}),
/**
* Stores connection data inside this instance of this audio node connecting
* to another node (destination). If connecting to another node's AudioParam,
@ -84,10 +60,10 @@ const AudioNodeModel = Class({
/**
* Gets the bypass status of the audio node.
*
* @return Promise->Boolean
* @return Boolean
*/
isBypassed: function () {
return this.actor.isBypassed();
return this._bypassed;
},
/**
@ -162,7 +138,9 @@ const AudioNodeModel = Class({
graph.addEdge(null, this.id, edge.destination, options);
}
}
},
toString: () => "[object AudioNodeModel]",
});
@ -200,25 +178,21 @@ const AudioNodesCollection = Class({
* constructor, and adds the model to the internal collection store of this
* instance.
*
* Also calls `setup` on the model itself, and sets up event piping, so that
* events emitted on each model propagate to the collection itself.
*
* Emits "add" event on instance when completed.
*
* @param Object obj
* @return Promise->AudioNodeModel
* @return AudioNodeModel
*/
add: Task.async(function* (obj) {
add: function (obj) {
let node = new this.model(obj);
node.collection = this;
yield node.setup();
this.models.add(node);
node.on("*", this._onModelEvent);
coreEmit(this, "add", node);
return node;
}),
},
/**
* Removes an AudioNodeModel from the internal collection. Calls `delete` method
@ -308,5 +282,7 @@ const AudioNodesCollection = Class({
// Pipe the event to the collection
coreEmit(this, eventName, node, ...args);
}
}
},
toString: () => "[object AudioNodeCollection]",
});

9
browser/devtools/webaudioeditor/test/browser.ini
View File

@ -12,9 +12,10 @@ support-files =
doc_connect-multi-param.html
doc_iframe-context.html
doc_automation.html
doc_bug_1112378.html
doc_bug_1125817.html
doc_bug_1130901.html
doc_bug_1112378.html
doc_bug_1141261.html
440hz_sine.ogg
head.js
@ -22,9 +23,10 @@ support-files =
[browser_audionode-actor-get-params-01.js]
[browser_audionode-actor-get-params-02.js]
[browser_audionode-actor-get-set-param.js]
[browser_audionode-actor-get-type.js]
[browser_audionode-actor-is-source.js]
[browser_audionode-actor-type.js]
[browser_audionode-actor-source.js]
[browser_audionode-actor-bypass.js]
[browser_audionode-actor-bypassable.js]
[browser_audionode-actor-connectnode-disconnect.js]
[browser_audionode-actor-connectparam.js]
skip-if = true # bug 1092571
@ -52,6 +54,7 @@ skip-if = true # bug 1092571
[browser_wa_graph-render-04.js]
[browser_wa_graph-render-05.js]
skip-if = true # bug 1092571
[browser_wa_graph-render-06.js]
[browser_wa_graph-selected.js]
[browser_wa_graph-zoom.js]
[browser_wa_inspector.js]

38
browser/devtools/webaudioeditor/test/browser_audionode-actor-bypassable.js Normal file
View File

@ -0,0 +1,38 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/**
* Test AudioNode#bypassable
*/
add_task(function*() {
let { target, front } = yield initBackend(SIMPLE_NODES_URL);
let [_, nodes] = yield Promise.all([
front.setup({ reload: true }),
getN(front, "create-node", 14)
]);
let actualBypassability = nodes.map(node => node.bypassable);
let expectedBypassability = [
false, // AudioDestinationNode
true, // AudioBufferSourceNode
true, // ScriptProcessorNode
true, // AnalyserNode
true, // GainNode
true, // DelayNode
true, // BiquadFilterNode
true, // WaveShaperNode
true, // PannerNode
true, // ConvolverNode
false, // ChannelSplitterNode
false, // ChannelMergerNode
true, // DynamicsCompressNode
true, // OscillatorNode
];
expectedBypassability.forEach((bypassable, i) => {
is(actualBypassability[i], bypassable, `${nodes[i].type} has correct ".bypassable" status`);
});
yield removeTab(target.tab);
});

10
browser/devtools/webaudioeditor/test/browser_audionode-actor-is-source.js → browser/devtools/webaudioeditor/test/browser_audionode-actor-source.js
View File

@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
/**
* Test AudioNode#isSource()
* Test AudioNode#source
*/
add_task(function*() {
@ -12,15 +12,15 @@ add_task(function*() {
getN(front, "create-node", 14)
]);
let actualTypes = yield Promise.all(nodes.map(node => node.getType()));
let isSourceResult = yield Promise.all(nodes.map(node => node.isSource()));
let actualTypes = nodes.map(node => node.type);
let isSourceResult = nodes.map(node => node.source);
actualTypes.forEach((type, i) => {
let shouldBeSource = type === "AudioBufferSourceNode" || type === "OscillatorNode";
if (shouldBeSource)
is(isSourceResult[i], true, type + "'s isSource() yields into `true`");
is(isSourceResult[i], true, type + "'s `source` is `true`");
else
is(isSourceResult[i], false, type + "'s isSource() yields into `false`");
is(isSourceResult[i], false, type + "'s `source` is `false`");
});
yield removeTab(target.tab);

4
browser/devtools/webaudioeditor/test/browser_audionode-actor-get-type.js → browser/devtools/webaudioeditor/test/browser_audionode-actor-type.js
View File

@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
/**
* Test AudioNode#getType()
* Test AudioNode#type
*/
add_task(function*() {
@ -12,7 +12,7 @@ add_task(function*() {
getN(front, "create-node", 14)
]);
let actualTypes = yield Promise.all(nodes.map(node => node.getType()));
let actualTypes = nodes.map(node => node.type);
let expectedTypes = [
"AudioDestinationNode",
"AudioBufferSourceNode", "ScriptProcessorNode", "AnalyserNode", "GainNode",

3
browser/devtools/webaudioeditor/test/browser_wa_controller-01.js
View File

@ -18,7 +18,8 @@ add_task(function*() {
let [actors] = yield Promise.all([
once(gAudioNodes, "add", 2),
once(gAudioNodes, "disconnect")
once(gAudioNodes, "disconnect"),
waitForGraphRendered(panelWin, 2, 0)
]);
ok(true, "Successfully disconnected a just-created node.");

25
browser/devtools/webaudioeditor/test/browser_wa_graph-render-06.js Normal file
View File

@ -0,0 +1,25 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/**
* Tests to ensure that param connections trigger graph redraws
*/
const BUG_1141261_URL = EXAMPLE_URL + "doc_bug_1141261.html";
add_task(function*() {
let { target, panel } = yield initWebAudioEditor(BUG_1141261_URL);
let { panelWin } = panel;
let { gFront, $, $$, EVENTS } = panelWin;
reload(target);
let [actors] = yield Promise.all([
getN(gFront, "create-node", 3),
waitForGraphRendered(panelWin, 3, 1, 0)
]);
ok(true, "Graph correctly shows gain node as disconnected");
yield teardown(target);
});

10
browser/devtools/webaudioeditor/test/browser_wa_inspector-bypass-01.js
View File

@ -18,12 +18,8 @@ add_task(function*() {
]);
let nodeIds = actors.map(actor => actor.actorID);
click(panelWin, findGraphNode(panelWin, nodeIds[1]));
// Wait for the node to be set as well as the inspector to come fully into the view
yield Promise.all([
waitForInspectorRender(panelWin, EVENTS),
once(panelWin, EVENTS.UI_INSPECTOR_TOGGLED)
]);
yield clickGraphNode(panelWin, findGraphNode(panelWin, nodeIds[1]), true);
let $bypass = $("toolbarbutton.bypass");
@ -49,9 +45,7 @@ add_task(function*() {
ok(!findGraphNode(panelWin, nodeIds[1]).classList.contains("bypassed"),
"AudioNode no longer has 'bypassed' class.");
click(panelWin, findGraphNode(panelWin, nodeIds[0]));
yield once(panelWin, EVENTS.UI_INSPECTOR_NODE_SET);
yield clickGraphNode(panelWin, findGraphNode(panelWin, nodeIds[0]));
is((yield actors[0].isBypassed()), false, "Unbypassable AudioNodeActor is not bypassed.");
is($bypass.checked, false, "Button is 'off' for unbypassable nodes");

5
browser/devtools/webaudioeditor/test/browser_wa_reset-01.js
View File

@ -4,7 +4,7 @@
///////////////////
//
// Whitelisting this test.
// As part of bug 1077403, the leaking uncaught rejection should be fixed.
// As part of bug 1077403, the leaking uncaught rejection should be fixed.
//
thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Connection closed");
@ -53,6 +53,7 @@ add_task(function*() {
reload(target);
yield Promise.all([navigating, started]);
let rendered = waitForGraphRendered(panel.panelWin, 3, 2);
is($("#reload-notice").hidden, true,
"The 'reload this page' notice should be hidden after context found after reload.");
@ -61,5 +62,7 @@ add_task(function*() {
is($("#content").hidden, false,
"The tool's content should reappear without closing and reopening the toolbox.");
yield rendered;
yield teardown(target);
});

5
browser/devtools/webaudioeditor/test/browser_webaudio-actor-destroy-node.js
View File

@ -21,9 +21,8 @@ add_task(function*() {
let destroyed = yield waitUntilDestroyed;
let destroyedTypes = yield Promise.all(destroyed.map(actor => actor.getType()));
destroyedTypes.forEach((type, i) => {
ok(type, "AudioBufferSourceNode", "Only buffer nodes are destroyed");
destroyed.forEach((node, i) => {
ok(node.type, "AudioBufferSourceNode", "Only buffer nodes are destroyed");
ok(actorIsInList(created, destroyed[i]),
"`destroy-node` called only on AudioNodes in current document.");
});

10
browser/devtools/webaudioeditor/test/browser_webaudio-actor-simple.js
View File

@ -14,13 +14,9 @@ add_task(function*() {
get2(front, "connect-node")
]);
let destType = yield destNode.getType();
let oscType = yield oscNode.getType();
let gainType = yield gainNode.getType();
is(destType, "AudioDestinationNode", "WebAudioActor:create-node returns AudioNodeActor for AudioDestination");
is(oscType, "OscillatorNode", "WebAudioActor:create-node returns AudioNodeActor");
is(gainType, "GainNode", "WebAudioActor:create-node returns AudioNodeActor");
is(destNode.type, "AudioDestinationNode", "WebAudioActor:create-node returns AudioNodeActor for AudioDestination");
is(oscNode.type, "OscillatorNode", "WebAudioActor:create-node returns AudioNodeActor");
is(gainNode.type, "GainNode", "WebAudioActor:create-node returns AudioNodeActor");
let { source, dest } = connect1;
is(source.actorID, oscNode.actorID, "WebAudioActor:connect-node returns correct actor with ID on source (osc->gain)");

25
browser/devtools/webaudioeditor/test/doc_bug_1141261.html Normal file
View File

@ -0,0 +1,25 @@
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
<!doctype html>
<html>
<head>
<meta charset="utf-8"/>
<title>Web Audio Editor test page</title>
</head>
<body>
<script type="text/javascript;version=1.8">
"use strict";
let ctx = new AudioContext();
let osc = ctx.createOscillator();
let gain = ctx.createGain();
osc.connect(gain);
gain.connect(ctx.destination);
gain.disconnect();
</script>
</body>
</html>

8
browser/devtools/webaudioeditor/views/inspector.js
View File

@ -88,7 +88,7 @@ let InspectorView = {
else {
$("#web-audio-editor-details-pane-empty").setAttribute("hidden", "true");
$("#web-audio-editor-tabs").removeAttribute("hidden");
yield this._buildToolbar();
this._buildToolbar();
window.emit(EVENTS.UI_INSPECTOR_NODE_SET, this._currentNode.id);
}
}),
@ -111,11 +111,11 @@ let InspectorView = {
this.hideImmediately();
},
_buildToolbar: Task.async(function* () {
_buildToolbar: function () {
let node = this.getCurrentAudioNode();
let bypassable = node.bypassable;
let bypassed = yield node.isBypassed();
let bypassed = node.isBypassed();
let button = $("#audio-node-toolbar .bypass");
if (!bypassable) {
@ -129,7 +129,7 @@ let InspectorView = {
} else {
button.setAttribute("checked", true);
}
}),
},
/**
* Event handlers

2
browser/devtools/webide/test/browser_tabs.js
View File

@ -11,6 +11,8 @@ function test() {
Task.spawn(function*() {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
// Since we test the connections set below, destroy the server in case it
// was left open.
DebuggerServer.destroy();

1
browser/devtools/webide/test/head.js
View File

@ -25,6 +25,7 @@ if (window.location === "chrome://browser/content/browser.xul") {
Services.prefs.setBoolPref("devtools.webide.enabled", true);
Services.prefs.setBoolPref("devtools.webide.enableLocalRuntime", true);
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
Services.prefs.setCharPref("devtools.webide.addonsURL", TEST_BASE + "addons/simulators.json");
Services.prefs.setCharPref("devtools.webide.simulatorAddonsURL", TEST_BASE + "addons/fxos_#SLASHED_VERSION#_simulator-#OS#.xpi");

2
browser/devtools/webide/test/sidebars/browser_tabs.js
View File

@ -11,8 +11,6 @@ function test() {
Task.spawn(function*() {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
// Since we test the connections set below, destroy the server in case it
// was left open.
DebuggerServer.destroy();

1
browser/devtools/webide/test/sidebars/chrome.ini
View File

@ -19,5 +19,6 @@ skip-if = buildapp == 'b2g' || (os == "mac" && (os_version == "10.8" || os_versi
[test_fullscreenToolbox.html]
[test_device_preferences.html]
[test_device_permissions.html]
[test_device_runtime.html]
[test_device_settings.html]
[test_telemetry.html]

2
browser/devtools/webide/test/sidebars/test_addons.html
View File

@ -92,8 +92,6 @@
Task.spawn(function*() {
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
ok(!Devices.helperAddonInstalled, "Helper not installed");
let win = yield openWebIDE(true);

1
browser/devtools/webide/test/sidebars/test_autoconnect_runtime.html
View File

@ -20,7 +20,6 @@
Task.spawn(function*() {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

1
browser/devtools/webide/test/sidebars/test_autoselect_project.html
View File

@ -20,7 +20,6 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

1
browser/devtools/webide/test/sidebars/test_device_permissions.html
View File

@ -20,7 +20,6 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

1
browser/devtools/webide/test/sidebars/test_device_preferences.html
View File

@ -20,7 +20,6 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

83
browser/devtools/webide/test/sidebars/test_device_runtime.html Normal file
View File

@ -0,0 +1,83 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf8">
<title></title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
<script type="application/javascript;version=1.8" src="head.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<script type="application/javascript;version=1.8">
window.onload = function() {
SimpleTest.waitForExplicitFinish();
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
if (!DebuggerServer.initialized) {
DebuggerServer.init();
DebuggerServer.addBrowserActors();
}
let win = yield openWebIDE();
let detailsIframe = win.document.querySelector("#deck-panel-runtimedetails");
yield connectToLocalRuntime(win);
let details = win.document.querySelector("#cmd_showRuntimeDetails");
ok(!details.hasAttribute("disabled"), "info cmd enabled");
let deck = win.document.querySelector("#deck");
win.Cmds.showRuntimeDetails();
is(deck.selectedPanel, detailsIframe, "info iframe selected");
yield nextTick();
yield lazyIframeIsLoaded(detailsIframe);
yield detailsIframe.contentWindow.getDescriptionPromise;
// device info and permissions content is checked in other tests
// We just test one value to make sure we get something
let doc = detailsIframe.contentWindow.document;
let trs = doc.querySelectorAll("tr");
let found = false;
for (let tr of trs) {
let [name,val] = tr.querySelectorAll("td");
if (name.textContent == "appid") {
found = true;
is(val.textContent, Services.appinfo.ID, "appid has the right value");
break;
}
}
ok(found, "Found appid line");
doc.querySelector("#close").click();
ok(!deck.selectedPanel, "No panel selected");
DebuggerServer.destroy();
yield closeWebIDE(win);
SimpleTest.finish();
}).then(null, e => {
ok(false, "Exception: " + e);
SimpleTest.finish();
});
}
</script>
</body>
</html>

2
browser/devtools/webide/test/sidebars/test_device_settings.html
View File

@ -25,8 +25,6 @@
Cu.import("resource://gre/modules/SettingsRequestManager.jsm");
}
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
if (!DebuggerServer.initialized) {
DebuggerServer.init();
DebuggerServer.addBrowserActors();

1
browser/devtools/webide/test/sidebars/test_duplicate_import.html
View File

@ -18,7 +18,6 @@
SimpleTest.waitForExplicitFinish();
Task.spawn(function*() {
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
let win = yield openWebIDE();
let docProject = getProjectDocument(win);
let packagedAppLocation = getTestFilePath("../app");

1
browser/devtools/webide/test/sidebars/test_fullscreenToolbox.html
View File

@ -29,7 +29,6 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
let win = yield openWebIDE();
let docProject = getProjectDocument(win);
let docRuntime = getRuntimeDocument(win);

1
browser/devtools/webide/test/sidebars/test_import.html
View File

@ -18,7 +18,6 @@
SimpleTest.waitForExplicitFinish();
Task.spawn(function*() {
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
let win = yield openWebIDE();
let docProject = getProjectDocument(win);
let packagedAppLocation = getTestFilePath("../app");

1
browser/devtools/webide/test/sidebars/test_manifestUpdate.html
View File

@ -21,7 +21,6 @@
let {TextDecoder, OS} = Cu.import("resource://gre/modules/osfile.jsm", {});
Task.spawn(function* () {
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
let win = yield openWebIDE();
let AppManager = win.AppManager;

1
browser/devtools/webide/test/sidebars/test_newapp.html
View File

@ -19,7 +19,6 @@
SimpleTest.waitForExplicitFinish();
Task.spawn(function* () {
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
let win = yield openWebIDE();
let tmpDir = FileUtils.getDir("TmpD", []);
yield win.projectList.newApp({

2
browser/devtools/webide/test/sidebars/test_runtime.html
View File

@ -18,8 +18,6 @@
window.onload = function() {
SimpleTest.waitForExplicitFinish();
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
let win;
SimpleTest.registerCleanupFunction(() => {

2
browser/devtools/webide/test/sidebars/test_telemetry.html
View File

@ -286,8 +286,6 @@
});
Task.spawn(function*() {
Services.prefs.setBoolPref("devtools.webide.sidebars", true);
if (!DebuggerServer.initialized) {
DebuggerServer.init();
DebuggerServer.addBrowserActors();

2
browser/devtools/webide/test/test_addons.html
View File

@ -92,6 +92,8 @@
Task.spawn(function* () {
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
ok(!Devices.helperAddonInstalled, "Helper not installed");
let win = yield openWebIDE(true);

1
browser/devtools/webide/test/test_autoconnect_runtime.html
View File

@ -20,6 +20,7 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

1
browser/devtools/webide/test/test_autoselect_project.html
View File

@ -20,6 +20,7 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

1
browser/devtools/webide/test/test_device_permissions.html
View File

@ -20,6 +20,7 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

1
browser/devtools/webide/test/test_device_preferences.html
View File

@ -20,6 +20,7 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

1
browser/devtools/webide/test/test_device_runtime.html
View File

@ -20,6 +20,7 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
if (!DebuggerServer.initialized) {
DebuggerServer.init();

2
browser/devtools/webide/test/test_device_settings.html
View File

@ -25,6 +25,8 @@
Cu.import("resource://gre/modules/SettingsRequestManager.jsm");
}
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
if (!DebuggerServer.initialized) {
DebuggerServer.init();
DebuggerServer.addBrowserActors();

1
browser/devtools/webide/test/test_duplicate_import.html
View File

@ -19,6 +19,7 @@
SimpleTest.waitForExplicitFinish();
Task.spawn(function* () {
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
let win = yield openWebIDE();
let packagedAppLocation = getTestFilePath("app");
let hostedAppManifest = TEST_BASE + "hosted_app.manifest";

1
browser/devtools/webide/test/test_fullscreenToolbox.html
View File

@ -30,6 +30,7 @@
Task.spawn(function* () {
const { DebuggerServer } = require("devtools/server/main");
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
win = yield openWebIDE();
win.AppManager.update("runtime-list");

1
browser/devtools/webide/test/test_import.html
View File

@ -19,6 +19,7 @@
SimpleTest.waitForExplicitFinish();
Task.spawn(function*() {
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
let win = yield openWebIDE();
let packagedAppLocation = getTestFilePath("app");

1
browser/devtools/webide/test/test_manifestUpdate.html
View File

@ -21,6 +21,7 @@
let {TextDecoder, OS} = Cu.import("resource://gre/modules/osfile.jsm", {});
Task.spawn(function* () {
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
let win = yield openWebIDE();
let AppManager = win.AppManager;

35
browser/devtools/webide/test/test_newapp.html
View File

@ -19,25 +19,26 @@
SimpleTest.waitForExplicitFinish();
Task.spawn(function* () {
let win = yield openWebIDE();
let tmpDir = FileUtils.getDir("TmpD", []);
yield win.projectList.newApp({
index: 0,
name: "webideTmpApp",
folder: tmpDir
});
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
let win = yield openWebIDE();
let tmpDir = FileUtils.getDir("TmpD", []);
yield win.projectList.newApp({
index: 0,
name: "webideTmpApp",
folder: tmpDir
});
let project = win.AppManager.selectedProject;
tmpDir = FileUtils.getDir("TmpD", ["webidetmpapp"]);
ok(tmpDir.isDirectory(), "Directory created");
is(project.location, tmpDir.path, "Location is valid (and lowercase)");
is(project.name, "webideTmpApp", "name field has been updated");
let project = win.AppManager.selectedProject;
tmpDir = FileUtils.getDir("TmpD", ["webidetmpapp"]);
ok(tmpDir.isDirectory(), "Directory created");
is(project.location, tmpDir.path, "Location is valid (and lowercase)");
is(project.name, "webideTmpApp", "name field has been updated");
// Clean up
tmpDir.remove(true);
yield closeWebIDE(win);
yield removeAllProjects();
SimpleTest.finish();
// Clean up
tmpDir.remove(true);
yield closeWebIDE(win);
yield removeAllProjects();
SimpleTest.finish();
});
}
</script>

2
browser/devtools/webide/test/test_runtime.html
View File

@ -18,6 +18,8 @@
window.onload = function() {
SimpleTest.waitForExplicitFinish();
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
let win;
SimpleTest.registerCleanupFunction(() => {

1
browser/devtools/webide/test/test_simulators.html
View File

@ -42,6 +42,7 @@
}
Task.spawn(function* () {
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
let win = yield openWebIDE(false);

2
browser/devtools/webide/test/test_telemetry.html
View File

@ -286,6 +286,8 @@
});
Task.spawn(function*() {
Services.prefs.setBoolPref("devtools.webide.sidebars", false);
if (!DebuggerServer.initialized) {
DebuggerServer.init();
DebuggerServer.addBrowserActors();

2
browser/devtools/webide/webide-prefs.js
View File

@ -32,4 +32,4 @@ pref("devtools.webide.widget.inNavbarByDefault", false);
#endif
pref("devtools.webide.zoom", "1");
pref("devtools.webide.busyTimeout", 10000);
pref("devtools.webide.sidebars", false);
pref("devtools.webide.sidebars", true);

2
browser/extensions/pdfjs/README.mozilla
View File

@ -1,3 +1,3 @@
This is the pdf.js project output, https://github.com/mozilla/pdf.js
Current extension version is: 1.1.403
Current extension version is: 1.1.469

15
browser/extensions/pdfjs/content/build/pdf.js
View File

@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {};
}
PDFJS.version = '1.1.403';
PDFJS.build = '88e0326';
PDFJS.version = '1.1.469';
PDFJS.build = 'f06aa6a';
(function pdfjsWrapper() {
// Use strict in our context only - users might not want it
@ -3953,6 +3953,9 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
this.current = this.stateStack.pop();
this.ctx.restore();
// Ensure that the clipping path is reset (fixes issue6413.pdf).
this.pendingClip = null;
this.cachedGetSinglePixelWidth = null;
}
},
@ -4340,6 +4343,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var textHScale = current.textHScale * fontDirection;
var glyphsLength = glyphs.length;
var vertical = font.vertical;
var spacingDir = vertical ? 1 : -1;
var defaultVMetrics = font.defaultVMetrics;
var widthAdvanceScale = fontSize * current.fontMatrix[0];
@ -4386,7 +4390,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
x += fontDirection * wordSpacing;
continue;
} else if (isNum(glyph)) {
x += -glyph * fontSize * 0.001;
x += spacingDir * glyph * fontSize / 1000;
continue;
}
@ -4456,6 +4460,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var font = current.font;
var fontSize = current.fontSize;
var fontDirection = current.fontDirection;
var spacingDir = font.vertical ? 1 : -1;
var charSpacing = current.charSpacing;
var wordSpacing = current.wordSpacing;
var textHScale = current.textHScale * fontDirection;
@ -4463,7 +4468,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var glyphsLength = glyphs.length;
var isTextInvisible =
current.textRenderingMode === TextRenderingMode.INVISIBLE;
var i, glyph, width;
var i, glyph, width, spacingLength;
if (isTextInvisible || fontSize === 0) {
return;
@ -4484,7 +4489,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
current.x += wordSpacing * textHScale;
continue;
} else if (isNum(glyph)) {
var spacingLength = -glyph * 0.001 * fontSize;
spacingLength = spacingDir * glyph * fontSize / 1000;
this.ctx.translate(spacingLength, 0);
current.x += spacingLength * textHScale;
continue;

73
browser/extensions/pdfjs/content/build/pdf.worker.js vendored
View File

@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {};
}
PDFJS.version = '1.1.403';
PDFJS.build = '88e0326';
PDFJS.version = '1.1.469';
PDFJS.build = 'f06aa6a';
(function pdfjsWrapper() {
// Use strict in our context only - users might not want it
@ -2506,12 +2506,11 @@ var PDFDocument = (function PDFDocumentClosure() {
return shadow(this, 'documentInfo', docInfo);
},
get fingerprint() {
var xref = this.xref, idArray, hash, fileID = '';
var xref = this.xref, hash, fileID = '';
var idArray = xref.trailer.get('ID');
if (xref.trailer.has('ID')) {
idArray = xref.trailer.get('ID');
}
if (idArray && isArray(idArray) && idArray[0] !== EMPTY_FINGERPRINT) {
if (idArray && isArray(idArray) && idArray[0] && isString(idArray[0]) &&
idArray[0] !== EMPTY_FINGERPRINT) {
hash = stringToBytes(idArray[0]);
} else {
if (this.stream.ensureRange) {
@ -10902,11 +10901,12 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var arr = args[0];
var combinedGlyphs = [];
var arrLength = arr.length;
var state = stateManager.state;
for (i = 0; i < arrLength; ++i) {
var arrItem = arr[i];
if (isString(arrItem)) {
Array.prototype.push.apply(combinedGlyphs,
self.handleText(arrItem, stateManager.state));
self.handleText(arrItem, state));
} else if (isNum(arrItem)) {
combinedGlyphs.push(arrItem);
}
@ -11302,17 +11302,26 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
if (typeof items[j] === 'string') {
buildTextGeometry(items[j], textChunk);
} else {
var val = items[j] / 1000;
if (!textState.font.vertical) {
offset = -val * textState.fontSize * textState.textHScale *
textState.textMatrix[0];
textState.translateTextMatrix(offset, 0);
textChunk.width += offset;
} else {
offset = -val * textState.fontSize *
textState.textMatrix[3];
// PDF Specification 5.3.2 states:
// The number is expressed in thousandths of a unit of text
// space.
// This amount is subtracted from the current horizontal or
// vertical coordinate, depending on the writing mode.
// In the default coordinate system, a positive adjustment
// has the effect of moving the next glyph painted either to
// the left or down by the given amount.
var val = items[j] * textState.fontSize / 1000;
if (textState.font.vertical) {
offset = val * textState.textMatrix[3];
textState.translateTextMatrix(0, offset);
// Value needs to be added to height to paint down.
textChunk.height += offset;
} else {
offset = val * textState.textHScale *
textState.textMatrix[0];
textState.translateTextMatrix(offset, 0);
// Value needs to be subtracted from width to paint left.
textChunk.width -= offset;
}
if (items[j] < 0 && textState.font.spaceWidth > 0) {
var fakeSpaces = -items[j] / textState.font.spaceWidth;
@ -17036,7 +17045,7 @@ var Font = (function FontClosure() {
* Read the appropriate subtable from the cmap according to 9.6.6.4 from
* PDF spec
*/
function readCmapTable(cmap, font, isSymbolicFont) {
function readCmapTable(cmap, font, isSymbolicFont, hasEncoding) {
var segment;
var start = (font.start ? font.start : 0) + cmap.offset;
font.pos = start;
@ -17067,7 +17076,7 @@ var Font = (function FontClosure() {
// Continue the loop since there still may be a higher priority
// table.
} else if (platformId === 3 && encodingId === 1 &&
(!isSymbolicFont || !potentialTable)) {
((!isSymbolicFont && hasEncoding) || !potentialTable)) {
useTable = true;
if (!isSymbolicFont) {
canBreak = true;
@ -17204,7 +17213,13 @@ var Font = (function FontClosure() {
});
}
} else {
error('cmap table has unsupported format: ' + format);
warn('cmap table has unsupported format: ' + format);
return {
platformId: -1,
encodingId: -1,
mappings: [],
hasShortCmap: false
};
}
// removing duplicate entries
@ -18010,13 +18025,14 @@ var Font = (function FontClosure() {
} else {
// Most of the following logic in this code branch is based on the
// 9.6.6.4 of the PDF spec.
var cmapTable = readCmapTable(tables.cmap, font, this.isSymbolicFont);
var hasEncoding =
properties.differences.length > 0 || !!properties.baseEncodingName;
var cmapTable =
readCmapTable(tables.cmap, font, this.isSymbolicFont, hasEncoding);
var cmapPlatformId = cmapTable.platformId;
var cmapEncodingId = cmapTable.encodingId;
var cmapMappings = cmapTable.mappings;
var cmapMappingsLength = cmapMappings.length;
var hasEncoding = properties.differences.length ||
!!properties.baseEncodingName;
// The spec seems to imply that if the font is symbolic the encoding
// should be ignored, this doesn't appear to work for 'preistabelle.pdf'
@ -29894,6 +29910,9 @@ var Parser = (function ParserClosure() {
this.shift();
return true;
} catch (e) {
if (e instanceof MissingDataException) {
throw e;
}
// Upon failure, the caller should reset this.lexer.pos to a known good
// state and call this.shift() twice to reset the buffers.
return false;
@ -30361,6 +30380,7 @@ var Parser = (function ParserClosure() {
},
makeFilter: function Parser_makeFilter(stream, name, maybeLength, params) {
if (stream.dict.get('Length') === 0 && !maybeLength) {
warn('Empty "' + name + '" stream.');
return new NullStream(stream);
}
try {
@ -38862,14 +38882,13 @@ var bidi = PDFJS.bidi = (function bidiClosure() {
// don't mirror as characters are already mirrored in the pdf
// Finally, return string
var result = '';
for (i = 0, ii = chars.length; i < ii; ++i) {
var ch = chars[i];
if (ch !== '<' && ch !== '>') {
result += ch;
if (ch === '<' || ch === '>') {
chars[i] = '';
}
}
return createBidiText(result, isLTR);
return createBidiText(chars.join(''), isLTR);
}
return bidi;

BIN
browser/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 183 B

BIN
browser/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 205 B

BIN
browser/extensions/pdfjs/content/web/images/treeitem-collapsed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 128 B

BIN
browser/extensions/pdfjs/content/web/images/treeitem-collapsed@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 149 B

BIN
browser/extensions/pdfjs/content/web/images/treeitem-expanded.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 125 B

BIN
browser/extensions/pdfjs/content/web/images/treeitem-expanded@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 B

63
browser/extensions/pdfjs/content/web/viewer.css
View File

@ -1235,10 +1235,12 @@ a:focus > .thumbnail > .thumbnailSelectionRing,
padding: 3px 4px 0;
}
html[dir='ltr'] .outlineWithDeepNesting > .outlineItem,
html[dir='ltr'] .outlineItem > .outlineItems {
margin-left: 20px;
}
html[dir='rtl'] .outlineWithDeepNesting > .outlineItem,
html[dir='rtl'] .outlineItem > .outlineItems {
margin-right: 20px;
}
@ -1248,6 +1250,8 @@ html[dir='rtl'] .outlineItem > .outlineItems {
text-decoration: none;
display: inline-block;
min-width: 95%;
min-width: calc(100% - 4px); /* Subtract the right padding (left, in RTL mode)
of the container. */
height: auto;
margin-bottom: 1px;
border-radius: 2px;
@ -1266,7 +1270,7 @@ html[dir='rtl'] .outlineItem > .outlineItems {
}
html[dir='ltr'] .outlineItem > a {
padding: 2px 0 5px 10px;
padding: 2px 0 5px 4px;
}
html[dir='ltr'] .attachmentsItem > button {
padding: 2px 0 3px 7px;
@ -1274,13 +1278,49 @@ html[dir='ltr'] .attachmentsItem > button {
}
html[dir='rtl'] .outlineItem > a {
padding: 2px 10px 5px 0;
padding: 2px 4px 5px 0;
}
html[dir='rtl'] .attachmentsItem > button {
padding: 2px 7px 3px 0;
text-align: right;
}
.outlineItemToggler {
position: relative;
height: 0;
width: 0;
color: hsla(0,0%,100%,.5);
}
.outlineItemToggler::before {
content: url(images/treeitem-expanded.png);
display: inline-block;
position: absolute;
}
html[dir='ltr'] .outlineItemToggler.outlineItemsHidden::before {
content: url(images/treeitem-collapsed.png);
}
html[dir='rtl'] .outlineItemToggler.outlineItemsHidden::before {
content: url(images/treeitem-collapsed-rtl.png);
}
.outlineItemToggler.outlineItemsHidden ~ .outlineItems {
display: none;
}
html[dir='ltr'] .outlineItemToggler {
float: left;
}
html[dir='rtl'] .outlineItemToggler {
float: right;
}
html[dir='ltr'] .outlineItemToggler::before {
right: 4px;
}
html[dir='rtl'] .outlineItemToggler::before {
left: 4px;
}
.outlineItemToggler:hover,
.outlineItemToggler:hover + a,
.outlineItemToggler:hover ~ .outlineItems,
.outlineItem > a:hover,
.attachmentsItem > button:hover {
background-color: hsla(0,0%,100%,.02);
@ -1289,6 +1329,7 @@ html[dir='rtl'] .attachmentsItem > button {
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
0 0 1px hsla(0,0%,100%,.2) inset,
0 0 1px hsla(0,0%,0%,.2);
border-radius: 2px;
color: hsla(0,0%,100%,.9);
}
@ -1704,6 +1745,24 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
.secondaryToolbarButton.documentProperties::before {
content: url(images/secondaryToolbarButton-documentProperties@2x.png);
}
.outlineItemToggler::before {
transform: scale(0.5);
top: -1px;
content: url(images/treeitem-expanded@2x.png);
}
html[dir='ltr'] .outlineItemToggler.outlineItemsHidden::before {
content: url(images/treeitem-collapsed@2x.png);
}
html[dir='rtl'] .outlineItemToggler.outlineItemsHidden::before {
content: url(images/treeitem-collapsed-rtl@2x.png);
}
html[dir='ltr'] .outlineItemToggler::before {
right: 0;
}
html[dir='rtl'] .outlineItemToggler::before {
left: 0;
}
}
@media print {

128
browser/extensions/pdfjs/content/web/viewer.js
View File

@ -104,6 +104,12 @@ var CustomStyle = (function CustomStyleClosure() {
return CustomStyle;
})();
var NullCharactersRegExp = /\x00/g;
function removeNullCharacters(str) {
return str.replace(NullCharactersRegExp, '');
}
function getFileName(url) {
var anchor = url.indexOf('#');
var query = url.indexOf('?');
@ -5373,6 +5379,10 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
this.canvas.height = 0;
delete this.canvas;
}
if (this.image) {
this.image.removeAttribute('src');
delete this.image;
}
},
update: function PDFThumbnailView_update(rotation) {
@ -5393,28 +5403,53 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
_getPageDrawContext:
function PDFThumbnailView_getPageDrawContext(noCtxScale) {
var canvas = document.createElement('canvas');
canvas.id = this.renderingId;
canvas.className = 'thumbnailImage';
canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
{page: this.id}, 'Thumbnail of Page {{page}}'));
this.canvas = canvas;
this.div.setAttribute('data-loaded', true);
this.ring.appendChild(canvas);
var ctx = canvas.getContext('2d');
var outputScale = getOutputScale(ctx);
canvas.width = (this.canvasWidth * outputScale.sx) | 0;
canvas.height = (this.canvasHeight * outputScale.sy) | 0;
canvas.style.width = this.canvasWidth + 'px';
canvas.style.height = this.canvasHeight + 'px';
if (!noCtxScale && outputScale.scaled) {
ctx.scale(outputScale.sx, outputScale.sy);
}
var image = document.createElement('img');
this.image = image;
image.id = this.renderingId;
image.className = 'thumbnailImage';
image.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
{ page: this.id }, 'Thumbnail of Page {{page}}'));
image.style.width = canvas.style.width;
image.style.height = canvas.style.height;
return ctx;
},
/**
* @private
*/
_convertCanvasToImage: function PDFThumbnailView_convertCanvasToImage() {
if (!this.canvas) {
return;
}
this.image.src = this.canvas.toDataURL();
this.div.setAttribute('data-loaded', true);
this.ring.appendChild(this.image);
// Zeroing the width and height causes Firefox to release graphics
// resources immediately, which can greatly reduce memory consumption.
this.canvas.width = 0;
this.canvas.height = 0;
delete this.canvas;
},
draw: function PDFThumbnailView_draw() {
if (this.renderingState !== RenderingStates.INITIAL) {
console.error('Must be in new state before drawing');
@ -5444,6 +5479,7 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
return;
}
self.renderingState = RenderingStates.FINISHED;
self._convertCanvasToImage();
if (!error) {
resolveRenderPromise(undefined);
@ -5501,6 +5537,7 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
if (img.width <= 2 * canvas.width) {
ctx.drawImage(img, 0, 0, img.width, img.height,
0, 0, canvas.width, canvas.height);
this._convertCanvasToImage();
return;
}
// drawImage does an awful job of rescaling the image, doing it gradually.
@ -5525,6 +5562,7 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
}
ctx.drawImage(reducedImage, 0, 0, reducedWidth, reducedHeight,
0, 0, canvas.width, canvas.height);
this._convertCanvasToImage();
}
};
@ -5736,6 +5774,7 @@ var PDFOutlineView = (function PDFOutlineViewClosure() {
this.container = options.container;
this.outline = options.outline;
this.linkService = options.linkService;
this.lastToggleIsShow = true;
}
PDFOutlineView.prototype = {
@ -5744,6 +5783,7 @@ var PDFOutlineView = (function PDFOutlineViewClosure() {
while (container.firstChild) {
container.removeChild(container.firstChild);
}
this.lastToggleIsShow = true;
},
/**
@ -5769,6 +5809,51 @@ var PDFOutlineView = (function PDFOutlineViewClosure() {
};
},
/**
* Prepend a button before an outline item which allows the user to toggle
* the visibility of all outline items at that level.
*
* @private
*/
_addToggleButton: function PDFOutlineView_addToggleButton(div) {
var toggler = document.createElement('div');
toggler.className = 'outlineItemToggler';
toggler.onclick = function(event) {
event.stopPropagation();
toggler.classList.toggle('outlineItemsHidden');
if (event.shiftKey) {
var shouldShowAll = !toggler.classList.contains('outlineItemsHidden');
this._toggleOutlineItem(div, shouldShowAll);
}
}.bind(this);
div.insertBefore(toggler, div.firstChild);
},
/**
* Toggle the visibility of the subtree of an outline item.
*
* @param {Element} root - the root of the outline (sub)tree.
* @param {boolean} state - whether to show the outline (sub)tree. If false,
* the outline subtree rooted at |root| will be collapsed.
*
* @private
*/
_toggleOutlineItem: function PDFOutlineView_toggleOutlineItem(root, show) {
this.lastToggleIsShow = show;
var togglers = root.querySelectorAll('.outlineItemToggler');
for (var i = 0, ii = togglers.length; i < ii; ++i) {
togglers[i].classList[show ? 'remove' : 'add']('outlineItemsHidden');
}
},
/**
* Collapse or expand all subtrees of the outline.
*/
toggleOutlineTree: function PDFOutlineView_toggleOutlineTree() {
this._toggleOutlineItem(this.container, !this.lastToggleIsShow);
},
render: function PDFOutlineView_render() {
var outline = this.outline;
var outlineCount = 0;
@ -5780,7 +5865,9 @@ var PDFOutlineView = (function PDFOutlineViewClosure() {
return;
}
var queue = [{ parent: this.container, items: this.outline }];
var fragment = document.createDocumentFragment();
var queue = [{ parent: fragment, items: this.outline }];
var hasAnyNesting = false;
while (queue.length > 0) {
var levelData = queue.shift();
for (var i = 0, len = levelData.items.length; i < len; i++) {
@ -5789,10 +5876,13 @@ var PDFOutlineView = (function PDFOutlineViewClosure() {
div.className = 'outlineItem';
var element = document.createElement('a');
this._bindLink(element, item);
element.textContent = item.title;
element.textContent = removeNullCharacters(item.title);
div.appendChild(element);
if (item.items.length > 0) {
hasAnyNesting = true;
this._addToggleButton(div);
var itemsDiv = document.createElement('div');
itemsDiv.className = 'outlineItems';
div.appendChild(itemsDiv);
@ -5803,6 +5893,11 @@ var PDFOutlineView = (function PDFOutlineViewClosure() {
outlineCount++;
}
}
if (hasAnyNesting) {
this.container.classList.add('outlineWithDeepNesting');
}
this.container.appendChild(fragment);
this._dispatchEvent(outlineCount);
}
@ -5885,7 +5980,7 @@ var PDFAttachmentView = (function PDFAttachmentViewClosure() {
div.className = 'attachmentsItem';
var button = document.createElement('button');
this._bindLink(button, item.content, filename);
button.textContent = filename;
button.textContent = removeNullCharacters(filename);
div.appendChild(button);
this.container.appendChild(div);
}
@ -6083,6 +6178,12 @@ var PDFViewerApplication = {
}
PDFJS.disableRange = value;
}),
Preferences.get('disableStream').then(function resolved(value) {
if (PDFJS.disableStream === true) {
return;
}
PDFJS.disableStream = value;
}),
Preferences.get('disableAutoFetch').then(function resolved(value) {
PDFJS.disableAutoFetch = value;
}),
@ -7072,6 +7173,11 @@ function webViewerInitialized() {
PDFViewerApplication.switchSidebarView('outline');
});
document.getElementById('viewOutline').addEventListener('dblclick',
function() {
PDFViewerApplication.outline.toggleOutlineTree();
});
document.getElementById('viewAttachments').addEventListener('click',
function() {
PDFViewerApplication.switchSidebarView('attachments');

1
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -733,6 +733,7 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY identity.moreInfoLinkText2 "More Information">
<!ENTITY identity.permissions "Permissions">
<!ENTITY identity.permissionsEmpty "You have not granted this site any special permissions.">
<!-- Name for the tabs toolbar as spoken by screen readers.
The word "toolbar" is appended automatically and should not be contained below! -->

6
browser/locales/en-US/pdfviewer/viewer.properties
View File

@ -67,7 +67,11 @@ document_properties.title=Document Properties…
document_properties_label=Document Properties…
document_properties_file_name=File name:
document_properties_file_size=File size:
# LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
# will be replaced by the PDF file size in kilobytes, respectively in bytes.
document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
# LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
# will be replaced by the PDF file size in megabytes, respectively in bytes.
document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
document_properties_title=Title:
document_properties_author=Author:
@ -75,6 +79,8 @@ document_properties_subject=Subject:
document_properties_keywords=Keywords:
document_properties_creation_date=Creation Date:
document_properties_modification_date=Modification Date:
# LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
# will be replaced by the creation/modification date, and time, of the PDF file.
document_properties_date_string={{date}}, {{time}}
document_properties_creator=Creator:
document_properties_producer=PDF Producer:

253
browser/themes/linux/jar.mn
View File

@ -5,6 +5,7 @@
browser.jar:
% skin browser classic/1.0 %skin/classic/browser/
% override chrome://global/skin/icons/warning-16.png moz-icon://stock/gtk-dialog-warning?size=menu
#include ../shared/jar.inc.mn
skin/classic/browser/sanitizeDialog.css
* skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css)
skin/classic/browser/aboutSessionRestore-window-icon.png
@ -13,24 +14,11 @@ browser.jar:
skin/classic/browser/aboutCertError_sectionCollapsed.png
skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
skin/classic/browser/aboutCertError_sectionExpanded.png
skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css)
skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg)
skin/classic/browser/aboutNetError_alert.svg (../shared/aboutNetError_alert.svg)
skin/classic/browser/aboutSocialError.css (../shared/aboutSocialError.css)
* skin/classic/browser/aboutProviderDirectory.css (../shared/aboutProviderDirectory.css)
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/aboutSyncTabs.css
#endif
skin/classic/browser/aboutTabCrashed.css (../shared/aboutTabCrashed.css)
skin/classic/browser/actionicon-tab.png
skin/classic/browser/addons/addon-install-blocked.svg (../shared/addons/addon-install-blocked.svg)
skin/classic/browser/addons/addon-install-confirm.svg (../shared/addons/addon-install-confirm.svg)
skin/classic/browser/addons/addon-install-downloading.svg (../shared/addons/addon-install-downloading.svg)
skin/classic/browser/addons/addon-install-error.svg (../shared/addons/addon-install-error.svg)
skin/classic/browser/addons/addon-install-installed.svg (../shared/addons/addon-install-installed.svg)
skin/classic/browser/addons/addon-install-restart.svg (../shared/addons/addon-install-restart.svg)
skin/classic/browser/addons/addon-install-warning.svg (../shared/addons/addon-install-warning.svg)
skin/classic/browser/addons/addon-install-anchor.svg (../shared/addons/addon-install-anchor.svg)
* skin/classic/browser/browser.css
* skin/classic/browser/devedition.css
* skin/classic/browser/browser-lightweightTheme.css
@ -101,34 +89,6 @@ browser.jar:
skin/classic/browser/update-badge-failed.svg (../shared/update-badge-failed.svg)
skin/classic/browser/urlbar-arrow.png (../shared/urlbar-arrow.png)
skin/classic/browser/urlbar-arrow@2x.png (../shared/urlbar-arrow@2x.png)
skin/classic/browser/session-restore.svg (../shared/incontent-icons/session-restore.svg)
skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg)
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png)
skin/classic/browser/reader-tour@2x.png (../shared/reader/reader-tour@2x.png)
skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg)
skin/classic/browser/webRTC-shareDevice-16.png (../shared/webrtc/webRTC-shareDevice-16.png)
skin/classic/browser/webRTC-shareDevice-16@2x.png (../shared/webrtc/webRTC-shareDevice-16@2x.png)
skin/classic/browser/webRTC-shareDevice-64.png (../shared/webrtc/webRTC-shareDevice-64.png)
skin/classic/browser/webRTC-shareDevice-64@2x.png (../shared/webrtc/webRTC-shareDevice-64@2x.png)
skin/classic/browser/webRTC-sharingDevice-16.png (../shared/webrtc/webRTC-sharingDevice-16.png)
skin/classic/browser/webRTC-sharingDevice-16@2x.png (../shared/webrtc/webRTC-sharingDevice-16@2x.png)
skin/classic/browser/webRTC-shareMicrophone-16.png (../shared/webrtc/webRTC-shareMicrophone-16.png)
skin/classic/browser/webRTC-shareMicrophone-16@2x.png (../shared/webrtc/webRTC-shareMicrophone-16@2x.png)
skin/classic/browser/webRTC-shareMicrophone-64.png (../shared/webrtc/webRTC-shareMicrophone-64.png)
skin/classic/browser/webRTC-shareMicrophone-64@2x.png (../shared/webrtc/webRTC-shareMicrophone-64@2x.png)
skin/classic/browser/webRTC-sharingMicrophone-16.png (../shared/webrtc/webRTC-sharingMicrophone-16.png)
skin/classic/browser/webRTC-sharingMicrophone-16@2x.png (../shared/webrtc/webRTC-sharingMicrophone-16@2x.png)
skin/classic/browser/webRTC-shareScreen-16.png (../shared/webrtc/webRTC-shareScreen-16.png)
skin/classic/browser/webRTC-shareScreen-16@2x.png (../shared/webrtc/webRTC-shareScreen-16@2x.png)
skin/classic/browser/webRTC-shareScreen-64.png (../shared/webrtc/webRTC-shareScreen-64.png)
skin/classic/browser/webRTC-shareScreen-64@2x.png (../shared/webrtc/webRTC-shareScreen-64@2x.png)
skin/classic/browser/webRTC-sharingScreen-16.png (../shared/webrtc/webRTC-sharingScreen-16.png)
skin/classic/browser/webRTC-sharingScreen-16@2x.png (../shared/webrtc/webRTC-sharingScreen-16@2x.png)
skin/classic/browser/webRTC-indicator.css (../shared/webrtc/indicator.css)
skin/classic/browser/webRTC-camera-white-16.png (../shared/webrtc/camera-white-16.png)
skin/classic/browser/webRTC-microphone-white-16.png (../shared/webrtc/microphone-white-16.png)
skin/classic/browser/webRTC-screen-white-16.png (../shared/webrtc/screen-white-16.png)
skin/classic/browser/loop/menuPanel.png (loop/menuPanel.png)
skin/classic/browser/loop/menuPanel@2x.png (loop/menuPanel@2x.png)
skin/classic/browser/loop/toolbar.png (loop/toolbar.png)
@ -183,12 +143,6 @@ browser.jar:
skin/classic/browser/newtab/close.png (../shared/newtab/close.png)
skin/classic/browser/newtab/controls.svg (../shared/newtab/controls.svg)
skin/classic/browser/newtab/whimsycorn.png (../shared/newtab/whimsycorn.png)
skin/classic/browser/panic-panel/header.png (../shared/panic-panel/header.png)
skin/classic/browser/panic-panel/header@2x.png (../shared/panic-panel/header@2x.png)
skin/classic/browser/panic-panel/header-small.png (../shared/panic-panel/header-small.png)
skin/classic/browser/panic-panel/header-small@2x.png (../shared/panic-panel/header-small@2x.png)
skin/classic/browser/panic-panel/icons.png (../shared/panic-panel/icons.png)
skin/classic/browser/panic-panel/icons@2x.png (../shared/panic-panel/icons@2x.png)
skin/classic/browser/places/autocomplete-star.png (places/autocomplete-star.png)
skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png)
skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png)
@ -231,13 +185,6 @@ browser.jar:
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
skin/classic/browser/preferences/search.css (preferences/search.css)
skin/classic/browser/privatebrowsing/attention.png (../shared/privatebrowsing/attention.png)
skin/classic/browser/privatebrowsing/attention@2x.png (../shared/privatebrowsing/attention@2x.png)
skin/classic/browser/privatebrowsing/check.png (../shared/privatebrowsing/check.png)
skin/classic/browser/privatebrowsing/check@2x.png (../shared/privatebrowsing/check@2x.png)
skin/classic/browser/privatebrowsing/mask.svg (../shared/privatebrowsing/mask.svg)
skin/classic/browser/privatebrowsing/shield-page.png (../shared/privatebrowsing/shield-page.png)
skin/classic/browser/privatebrowsing/shield-page@2x.png (../shared/privatebrowsing/shield-page@2x.png)
skin/classic/browser/social/services-16.png (social/services-16.png)
skin/classic/browser/social/services-64.png (social/services-64.png)
skin/classic/browser/social/share-button.png (social/share-button.png)
@ -280,193 +227,6 @@ browser.jar:
skin/classic/browser/translating-16@2x.png (../shared/translation/translating-16@2x.png)
skin/classic/browser/translation-16.png (../shared/translation/translation-16.png)
skin/classic/browser/translation-16@2x.png (../shared/translation/translation-16@2x.png)
skin/classic/browser/devedition/urlbar-history-dropmarker.svg (../shared/devedition/urlbar-history-dropmarker.svg)
skin/classic/browser/devedition/urlbar-arrow.png (../shared/devedition/urlbar-arrow.png)
skin/classic/browser/devedition/urlbar-arrow@2x.png (../shared/devedition/urlbar-arrow@2x.png)
* skin/classic/browser/devtools/common.css (../shared/devtools/common.css)
* skin/classic/browser/devtools/dark-theme.css (../shared/devtools/dark-theme.css)
* skin/classic/browser/devtools/light-theme.css (../shared/devtools/light-theme.css)
skin/classic/browser/devtools/add.svg (../shared/devtools/images/add.svg)
skin/classic/browser/devtools/filters.svg (../shared/devtools/filters.svg)
skin/classic/browser/devtools/filter-swatch.svg (../shared/devtools/images/filter-swatch.svg)
skin/classic/browser/devtools/pseudo-class.svg (../shared/devtools/images/pseudo-class.svg)
skin/classic/browser/devtools/controls.png (../shared/devtools/images/controls.png)
skin/classic/browser/devtools/controls@2x.png (../shared/devtools/images/controls@2x.png)
skin/classic/browser/devtools/animation-fast-track.svg (../shared/devtools/images/animation-fast-track.svg)
skin/classic/browser/devtools/performance-icons.svg (../shared/devtools/images/performance-icons.svg)
skin/classic/browser/devtools/newtab.png (../shared/devtools/images/newtab.png)
skin/classic/browser/devtools/newtab@2x.png (../shared/devtools/images/newtab@2x.png)
skin/classic/browser/devtools/newtab-inverted.png (../shared/devtools/images/newtab-inverted.png)
skin/classic/browser/devtools/newtab-inverted@2x.png (../shared/devtools/images/newtab-inverted@2x.png)
* skin/classic/browser/devtools/widgets.css (../shared/devtools/widgets.css)
skin/classic/browser/devtools/power.svg (../shared/devtools/images/power.svg)
skin/classic/browser/devtools/filetype-dir-close.svg (../shared/devtools/images/filetypes/dir-close.svg)
skin/classic/browser/devtools/filetype-dir-open.svg (../shared/devtools/images/filetypes/dir-open.svg)
skin/classic/browser/devtools/filetype-globe.svg (../shared/devtools/images/filetypes/globe.svg)
skin/classic/browser/devtools/filetype-store.svg (../shared/devtools/images/filetypes/store.svg)
skin/classic/browser/devtools/commandline-icon.png (../shared/devtools/images/commandline-icon.png)
skin/classic/browser/devtools/commandline-icon@2x.png (../shared/devtools/images/commandline-icon@2x.png)
skin/classic/browser/devtools/command-paintflashing.png (../shared/devtools/images/command-paintflashing.png)
skin/classic/browser/devtools/command-paintflashing@2x.png (../shared/devtools/images/command-paintflashing@2x.png)
skin/classic/browser/devtools/command-screenshot.png (../shared/devtools/images/command-screenshot.png)
skin/classic/browser/devtools/command-screenshot@2x.png (../shared/devtools/images/command-screenshot@2x.png)
skin/classic/browser/devtools/command-responsivemode.png (../shared/devtools/images/command-responsivemode.png)
skin/classic/browser/devtools/command-responsivemode@2x.png (../shared/devtools/images/command-responsivemode@2x.png)
skin/classic/browser/devtools/command-scratchpad.png (../shared/devtools/images/command-scratchpad.png)
skin/classic/browser/devtools/command-scratchpad@2x.png (../shared/devtools/images/command-scratchpad@2x.png)
skin/classic/browser/devtools/command-tilt.png (../shared/devtools/images/command-tilt.png)
skin/classic/browser/devtools/command-tilt@2x.png (../shared/devtools/images/command-tilt@2x.png)
skin/classic/browser/devtools/command-pick.png (../shared/devtools/images/command-pick.png)
skin/classic/browser/devtools/command-pick@2x.png (../shared/devtools/images/command-pick@2x.png)
skin/classic/browser/devtools/command-frames.png (../shared/devtools/images/command-frames.png)
skin/classic/browser/devtools/command-frames@2x.png (../shared/devtools/images/command-frames@2x.png)
skin/classic/browser/devtools/command-console.png (../shared/devtools/images/command-console.png)
skin/classic/browser/devtools/command-console@2x.png (../shared/devtools/images/command-console@2x.png)
skin/classic/browser/devtools/command-eyedropper.png (../shared/devtools/images/command-eyedropper.png)
skin/classic/browser/devtools/command-eyedropper@2x.png (../shared/devtools/images/command-eyedropper@2x.png)
skin/classic/browser/devtools/command-rulers.png (../shared/devtools/images/command-rulers.png)
skin/classic/browser/devtools/command-rulers@2x.png (../shared/devtools/images/command-rulers@2x.png)
skin/classic/browser/devtools/alerticon-warning.png (../shared/devtools/images/alerticon-warning.png)
skin/classic/browser/devtools/alerticon-warning@2x.png (../shared/devtools/images/alerticon-warning@2x.png)
* skin/classic/browser/devtools/ruleview.css (../shared/devtools/ruleview.css)
* skin/classic/browser/devtools/webconsole.css (../shared/devtools/webconsole.css)
skin/classic/browser/devtools/webconsole.svg (../shared/devtools/images/webconsole.svg)
skin/classic/browser/devtools/commandline.css (../shared/devtools/commandline.css)
skin/classic/browser/devtools/markup-view.css (../shared/devtools/markup-view.css)
skin/classic/browser/devtools/editor-error.png (../shared/devtools/images/editor-error.png)
skin/classic/browser/devtools/editor-breakpoint.png (../shared/devtools/images/editor-breakpoint.png)
skin/classic/browser/devtools/editor-debug-location.png (../shared/devtools/images/editor-debug-location.png)
skin/classic/browser/devtools/editor-debug-location@2x.png (../shared/devtools/images/editor-debug-location@2x.png)
skin/classic/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
skin/classic/browser/devtools/animationinspector.css (../shared/devtools/animationinspector.css)
* skin/classic/browser/devtools/canvasdebugger.css (../shared/devtools/canvasdebugger.css)
skin/classic/browser/devtools/debugger.css (../shared/devtools/debugger.css)
skin/classic/browser/devtools/eyedropper.css (../shared/devtools/eyedropper.css)
* skin/classic/browser/devtools/netmonitor.css (../shared/devtools/netmonitor.css)
skin/classic/browser/devtools/performance.css (../shared/devtools/performance.css)
skin/classic/browser/devtools/memory.css (../shared/devtools/memory.css)
skin/classic/browser/devtools/promisedebugger.css (../shared/devtools/promisedebugger.css)
skin/classic/browser/devtools/timeline-filter.svg (../shared/devtools/images/timeline-filter.svg)
* skin/classic/browser/devtools/scratchpad.css (../shared/devtools/scratchpad.css)
skin/classic/browser/devtools/shadereditor.css (../shared/devtools/shadereditor.css)
* skin/classic/browser/devtools/splitview.css (../shared/devtools/splitview.css)
skin/classic/browser/devtools/styleeditor.css (../shared/devtools/styleeditor.css)
skin/classic/browser/devtools/storage.css (../shared/devtools/storage.css)
skin/classic/browser/devtools/webaudioeditor.css (../shared/devtools/webaudioeditor.css)
skin/classic/browser/devtools/magnifying-glass.png (../shared/devtools/images/magnifying-glass.png)
skin/classic/browser/devtools/magnifying-glass@2x.png (../shared/devtools/images/magnifying-glass@2x.png)
skin/classic/browser/devtools/magnifying-glass-light.png (../shared/devtools/images/magnifying-glass-light.png)
skin/classic/browser/devtools/magnifying-glass-light@2x.png (../shared/devtools/images/magnifying-glass-light@2x.png)
skin/classic/browser/devtools/itemToggle.png (../shared/devtools/images/itemToggle.png)
skin/classic/browser/devtools/itemToggle@2x.png (../shared/devtools/images/itemToggle@2x.png)
skin/classic/browser/devtools/itemArrow-dark-rtl.svg (../shared/devtools/images/itemArrow-dark-rtl.svg)
skin/classic/browser/devtools/itemArrow-dark-ltr.svg (../shared/devtools/images/itemArrow-dark-ltr.svg)
skin/classic/browser/devtools/itemArrow-rtl.svg (../shared/devtools/images/itemArrow-rtl.svg)
skin/classic/browser/devtools/itemArrow-ltr.svg (../shared/devtools/images/itemArrow-ltr.svg)
skin/classic/browser/devtools/noise.png (../shared/devtools/images/noise.png)
skin/classic/browser/devtools/dropmarker.svg (../shared/devtools/images/dropmarker.svg)
skin/classic/browser/devtools/layoutview.css (../shared/devtools/layoutview.css)
skin/classic/browser/devtools/debugger-collapse.png (../shared/devtools/images/debugger-collapse.png)
skin/classic/browser/devtools/debugger-collapse@2x.png (../shared/devtools/images/debugger-collapse@2x.png)
skin/classic/browser/devtools/debugger-expand.png (../shared/devtools/images/debugger-expand.png)
skin/classic/browser/devtools/debugger-expand@2x.png (../shared/devtools/images/debugger-expand@2x.png)
skin/classic/browser/devtools/debugger-pause.png (../shared/devtools/images/debugger-pause.png)
skin/classic/browser/devtools/debugger-pause@2x.png (../shared/devtools/images/debugger-pause@2x.png)
skin/classic/browser/devtools/debugger-play.png (../shared/devtools/images/debugger-play.png)
skin/classic/browser/devtools/debugger-play@2x.png (../shared/devtools/images/debugger-play@2x.png)
skin/classic/browser/devtools/fast-forward.png (../shared/devtools/images/fast-forward.png)
skin/classic/browser/devtools/fast-forward@2x.png (../shared/devtools/images/fast-forward@2x.png)
skin/classic/browser/devtools/rewind.png (../shared/devtools/images/rewind.png)
skin/classic/browser/devtools/rewind@2x.png (../shared/devtools/images/rewind@2x.png)
skin/classic/browser/devtools/debugger-step-in.png (../shared/devtools/images/debugger-step-in.png)
skin/classic/browser/devtools/debugger-step-in@2x.png (../shared/devtools/images/debugger-step-in@2x.png)
skin/classic/browser/devtools/debugger-step-out.png (../shared/devtools/images/debugger-step-out.png)
skin/classic/browser/devtools/debugger-step-out@2x.png (../shared/devtools/images/debugger-step-out@2x.png)
skin/classic/browser/devtools/debugger-step-over.png (../shared/devtools/images/debugger-step-over.png)
skin/classic/browser/devtools/debugger-step-over@2x.png (../shared/devtools/images/debugger-step-over@2x.png)
skin/classic/browser/devtools/debugger-blackbox.png (../shared/devtools/images/debugger-blackbox.png)
skin/classic/browser/devtools/debugger-blackbox@2x.png (../shared/devtools/images/debugger-blackbox@2x.png)
skin/classic/browser/devtools/debugger-prettyprint.png (../shared/devtools/images/debugger-prettyprint.png)
skin/classic/browser/devtools/debugger-prettyprint@2x.png (../shared/devtools/images/debugger-prettyprint@2x.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
skin/classic/browser/devtools/tracer-icon.png (../shared/devtools/images/tracer-icon.png)
skin/classic/browser/devtools/tracer-icon@2x.png (../shared/devtools/images/tracer-icon@2x.png)
skin/classic/browser/devtools/responsive-se-resizer.png (../shared/devtools/images/responsivemode/responsive-se-resizer.png)
skin/classic/browser/devtools/responsive-se-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-se-resizer@2x.png)
skin/classic/browser/devtools/responsive-vertical-resizer.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer.png)
skin/classic/browser/devtools/responsive-vertical-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer@2x.png)
skin/classic/browser/devtools/responsive-horizontal-resizer.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer.png)
skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer@2x.png)
skin/classic/browser/devtools/responsiveui-rotate.png (../shared/devtools/images/responsivemode/responsiveui-rotate.png)
skin/classic/browser/devtools/responsiveui-rotate@2x.png (../shared/devtools/images/responsivemode/responsiveui-rotate@2x.png)
skin/classic/browser/devtools/responsiveui-touch.png (../shared/devtools/images/responsivemode/responsiveui-touch.png)
skin/classic/browser/devtools/responsiveui-touch@2x.png (../shared/devtools/images/responsivemode/responsiveui-touch@2x.png)
skin/classic/browser/devtools/responsiveui-screenshot.png (../shared/devtools/images/responsivemode/responsiveui-screenshot.png)
skin/classic/browser/devtools/responsiveui-screenshot@2x.png (../shared/devtools/images/responsivemode/responsiveui-screenshot@2x.png)
skin/classic/browser/devtools/toggle-tools.png (../shared/devtools/images/toggle-tools.png)
skin/classic/browser/devtools/toggle-tools@2x.png (../shared/devtools/images/toggle-tools@2x.png)
skin/classic/browser/devtools/dock-bottom@2x.png (../shared/devtools/images/dock-bottom@2x.png)
skin/classic/browser/devtools/dock-bottom-minimize@2x.png (../shared/devtools/images/dock-bottom-minimize@2x.png)
skin/classic/browser/devtools/dock-bottom-maximize@2x.png (../shared/devtools/images/dock-bottom-maximize@2x.png)
skin/classic/browser/devtools/dock-side@2x.png (../shared/devtools/images/dock-side@2x.png)
* skin/classic/browser/devtools/floating-scrollbars.css (../shared/devtools/floating-scrollbars.css)
skin/classic/browser/devtools/floating-scrollbars-light.css (../shared/devtools/floating-scrollbars-light.css)
* skin/classic/browser/devtools/inspector.css (../shared/devtools/inspector.css)
skin/classic/browser/devtools/profiler-stopwatch.svg (../shared/devtools/images/profiler-stopwatch.svg)
skin/classic/browser/devtools/profiler-stopwatch-checked.svg (../shared/devtools/images/profiler-stopwatch-checked.svg)
skin/classic/browser/devtools/tool-options.svg (../shared/devtools/images/tool-options.svg)
skin/classic/browser/devtools/tool-webconsole.svg (../shared/devtools/images/tool-webconsole.svg)
skin/classic/browser/devtools/tool-debugger.svg (../shared/devtools/images/tool-debugger.svg)
skin/classic/browser/devtools/tool-debugger-paused.svg (../shared/devtools/images/tool-debugger-paused.svg)
skin/classic/browser/devtools/tool-inspector.svg (../shared/devtools/images/tool-inspector.svg)
skin/classic/browser/devtools/tool-inspector.svg (../shared/devtools/images/tool-inspector.svg)
skin/classic/browser/devtools/tool-shadereditor.svg (../shared/devtools/images/tool-shadereditor.svg)
skin/classic/browser/devtools/tool-styleeditor.svg (../shared/devtools/images/tool-styleeditor.svg)
skin/classic/browser/devtools/tool-storage.svg (../shared/devtools/images/tool-storage.svg)
skin/classic/browser/devtools/tool-profiler.svg (../shared/devtools/images/tool-profiler.svg)
skin/classic/browser/devtools/tool-profiler-active.svg (../shared/devtools/images/tool-profiler-active.svg)
skin/classic/browser/devtools/tool-network.svg (../shared/devtools/images/tool-network.svg)
skin/classic/browser/devtools/tool-scratchpad.svg (../shared/devtools/images/tool-scratchpad.svg)
skin/classic/browser/devtools/tool-webaudio.svg (../shared/devtools/images/tool-webaudio.svg)
skin/classic/browser/devtools/close.png (../shared/devtools/images/close.png)
skin/classic/browser/devtools/close@2x.png (../shared/devtools/images/close@2x.png)
skin/classic/browser/devtools/vview-delete.png (../shared/devtools/images/vview-delete.png)
skin/classic/browser/devtools/vview-delete@2x.png (../shared/devtools/images/vview-delete@2x.png)
skin/classic/browser/devtools/vview-edit.png (../shared/devtools/images/vview-edit.png)
skin/classic/browser/devtools/vview-edit@2x.png (../shared/devtools/images/vview-edit@2x.png)
skin/classic/browser/devtools/vview-lock.png (../shared/devtools/images/vview-lock.png)
skin/classic/browser/devtools/vview-lock@2x.png (../shared/devtools/images/vview-lock@2x.png)
skin/classic/browser/devtools/vview-open-inspector.png (../shared/devtools/images/vview-open-inspector.png)
skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png)
skin/classic/browser/devtools/cubic-bezier-swatch.png (../shared/devtools/images/cubic-bezier-swatch.png)
skin/classic/browser/devtools/cubic-bezier-swatch@2x.png (../shared/devtools/images/cubic-bezier-swatch@2x.png)
skin/classic/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png)
skin/classic/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css)
skin/classic/browser/devtools/computedview.css (../shared/devtools/computedview.css)
skin/classic/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png)
skin/classic/browser/devtools/arrow-e@2x.png (../shared/devtools/images/arrow-e@2x.png)
skin/classic/browser/devtools/responsiveui-home.png (../shared/devtools/responsiveui-home.png)
skin/classic/browser/devtools/projecteditor/projecteditor.css (../shared/devtools/projecteditor/projecteditor.css)
skin/classic/browser/devtools/app-manager/connection-footer.css (../shared/devtools/app-manager/connection-footer.css)
skin/classic/browser/devtools/app-manager/index.css (../shared/devtools/app-manager/index.css)
skin/classic/browser/devtools/app-manager/device.css (../shared/devtools/app-manager/device.css)
skin/classic/browser/devtools/app-manager/projects.css (../shared/devtools/app-manager/projects.css)
skin/classic/browser/devtools/app-manager/help.css (../shared/devtools/app-manager/help.css)
skin/classic/browser/devtools/app-manager/warning.svg (../shared/devtools/app-manager/images/warning.svg)
skin/classic/browser/devtools/app-manager/error.svg (../shared/devtools/app-manager/images/error.svg)
skin/classic/browser/devtools/app-manager/plus.svg (../shared/devtools/app-manager/images/plus.svg)
skin/classic/browser/devtools/app-manager/remove.svg (../shared/devtools/app-manager/images/remove.svg)
skin/classic/browser/devtools/app-manager/add.svg (../shared/devtools/app-manager/images/add.svg)
skin/classic/browser/devtools/app-manager/index-icons.svg (../shared/devtools/app-manager/images/index-icons.svg)
skin/classic/browser/devtools/app-manager/rocket.svg (../shared/devtools/app-manager/images/rocket.svg)
skin/classic/browser/devtools/app-manager/noise.png (../shared/devtools/app-manager/images/noise.png)
skin/classic/browser/devtools/app-manager/default-app-icon.png (../shared/devtools/app-manager/images/default-app-icon.png)
skin/classic/browser/devtools/search-clear-failed.svg (../shared/devtools/images/search-clear-failed.svg)
skin/classic/browser/devtools/search-clear-light.svg (../shared/devtools/images/search-clear-light.svg)
skin/classic/browser/devtools/search-clear-dark.svg (../shared/devtools/images/search-clear-dark.svg)
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/sync-16.png
skin/classic/browser/sync-32.png
@ -487,17 +247,6 @@ browser.jar:
skin/classic/browser/syncProgress-horizontalbar.png
skin/classic/browser/syncProgress-horizontalbar@2x.png
#endif
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png)
skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png (../shared/devtools/tooltip/arrow-horizontal-dark.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark.png (../shared/devtools/tooltip/arrow-vertical-dark.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png (../shared/devtools/tooltip/arrow-horizontal-light.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light.png (../shared/devtools/tooltip/arrow-vertical-light.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
#ifdef E10S_TESTING_ONLY
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
#endif

257
browser/themes/osx/jar.mn
View File

@ -4,10 +4,8 @@
browser.jar:
% skin browser classic/1.0 %skin/classic/browser/
skin/classic/browser/sanitizeDialog.css (sanitizeDialog.css)
skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css)
skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg)
skin/classic/browser/aboutNetError_alert.svg (../shared/aboutNetError_alert.svg)
#include ../shared/jar.inc.mn
skin/classic/browser/sanitizeDialog.css
* skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css)
skin/classic/browser/aboutSessionRestore-window-icon.png
skin/classic/browser/aboutWelcomeBack.css (../shared/aboutWelcomeBack.css)
@ -15,23 +13,13 @@ browser.jar:
skin/classic/browser/aboutCertError_sectionCollapsed.png
skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
skin/classic/browser/aboutCertError_sectionExpanded.png
skin/classic/browser/aboutSocialError.css (../shared/aboutSocialError.css)
* skin/classic/browser/aboutProviderDirectory.css (../shared/aboutProviderDirectory.css)
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/aboutSyncTabs.css
#endif
skin/classic/browser/aboutTabCrashed.css (../shared/aboutTabCrashed.css)
skin/classic/browser/actionicon-tab.png
skin/classic/browser/actionicon-tab@2x.png
skin/classic/browser/addons/addon-install-blocked.svg (../shared/addons/addon-install-blocked.svg)
skin/classic/browser/addons/addon-install-confirm.svg (../shared/addons/addon-install-confirm.svg)
skin/classic/browser/addons/addon-install-downloading.svg (../shared/addons/addon-install-downloading.svg)
skin/classic/browser/addons/addon-install-error.svg (../shared/addons/addon-install-error.svg)
skin/classic/browser/addons/addon-install-installed.svg (../shared/addons/addon-install-installed.svg)
skin/classic/browser/addons/addon-install-restart.svg (../shared/addons/addon-install-restart.svg)
skin/classic/browser/addons/addon-install-warning.svg (../shared/addons/addon-install-warning.svg)
skin/classic/browser/addons/addon-install-anchor.svg (../shared/addons/addon-install-anchor.svg)
* skin/classic/browser/browser.css (browser.css)
* skin/classic/browser/browser.css
* skin/classic/browser/devedition.css
* skin/classic/browser/browser-lightweightTheme.css
skin/classic/browser/click-to-play-warning-stripes.png
@ -131,30 +119,6 @@ browser.jar:
skin/classic/browser/urlbar-arrow@2x.png (../shared/urlbar-arrow@2x.png)
skin/classic/browser/urlbar-popup-blocked.png
skin/classic/browser/urlbar-popup-blocked@2x.png
skin/classic/browser/session-restore.svg (../shared/incontent-icons/session-restore.svg)
skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg)
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png)
skin/classic/browser/reader-tour@2x.png (../shared/reader/reader-tour@2x.png)
skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg)
skin/classic/browser/webRTC-shareDevice-16.png (../shared/webrtc/webRTC-shareDevice-16.png)
skin/classic/browser/webRTC-shareDevice-16@2x.png (../shared/webrtc/webRTC-shareDevice-16@2x.png)
skin/classic/browser/webRTC-shareDevice-64.png (../shared/webrtc/webRTC-shareDevice-64.png)
skin/classic/browser/webRTC-shareDevice-64@2x.png (../shared/webrtc/webRTC-shareDevice-64@2x.png)
skin/classic/browser/webRTC-sharingDevice-16.png (../shared/webrtc/webRTC-sharingDevice-16.png)
skin/classic/browser/webRTC-sharingDevice-16@2x.png (../shared/webrtc/webRTC-sharingDevice-16@2x.png)
skin/classic/browser/webRTC-shareMicrophone-16.png (../shared/webrtc/webRTC-shareMicrophone-16.png)
skin/classic/browser/webRTC-shareMicrophone-16@2x.png (../shared/webrtc/webRTC-shareMicrophone-16@2x.png)
skin/classic/browser/webRTC-shareMicrophone-64.png (../shared/webrtc/webRTC-shareMicrophone-64.png)
skin/classic/browser/webRTC-shareMicrophone-64@2x.png (../shared/webrtc/webRTC-shareMicrophone-64@2x.png)
skin/classic/browser/webRTC-sharingMicrophone-16.png (../shared/webrtc/webRTC-sharingMicrophone-16.png)
skin/classic/browser/webRTC-sharingMicrophone-16@2x.png (../shared/webrtc/webRTC-sharingMicrophone-16@2x.png)
skin/classic/browser/webRTC-shareScreen-16.png (../shared/webrtc/webRTC-shareScreen-16.png)
skin/classic/browser/webRTC-shareScreen-16@2x.png (../shared/webrtc/webRTC-shareScreen-16@2x.png)
skin/classic/browser/webRTC-shareScreen-64.png (../shared/webrtc/webRTC-shareScreen-64.png)
skin/classic/browser/webRTC-shareScreen-64@2x.png (../shared/webrtc/webRTC-shareScreen-64@2x.png)
skin/classic/browser/webRTC-sharingScreen-16.png (../shared/webrtc/webRTC-sharingScreen-16.png)
skin/classic/browser/webRTC-sharingScreen-16@2x.png (../shared/webrtc/webRTC-sharingScreen-16@2x.png)
skin/classic/browser/webRTC-sharingDevice-menubar.png
skin/classic/browser/webRTC-sharingDevice-menubar@2x.png
skin/classic/browser/webRTC-sharingMicrophone-menubar.png
@ -238,12 +202,6 @@ browser.jar:
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
skin/classic/browser/panic-panel/header.png (../shared/panic-panel/header.png)
skin/classic/browser/panic-panel/header@2x.png (../shared/panic-panel/header@2x.png)
skin/classic/browser/panic-panel/header-small.png (../shared/panic-panel/header-small.png)
skin/classic/browser/panic-panel/header-small@2x.png (../shared/panic-panel/header-small@2x.png)
skin/classic/browser/panic-panel/icons.png (../shared/panic-panel/icons.png)
skin/classic/browser/panic-panel/icons@2x.png (../shared/panic-panel/icons@2x.png)
skin/classic/browser/places/allBookmarks.png (places/allBookmarks.png)
skin/classic/browser/places/autocomplete-star.png (places/autocomplete-star.png)
skin/classic/browser/places/autocomplete-star@2x.png (places/autocomplete-star@2x.png)
@ -304,13 +262,6 @@ browser.jar:
skin/classic/browser/preferences/search.css (preferences/search.css)
skin/classic/browser/preferences/checkbox.png (preferences/checkbox.png)
skin/classic/browser/preferences/checkbox@2x.png (preferences/checkbox@2x.png)
skin/classic/browser/privatebrowsing/attention.png (../shared/privatebrowsing/attention.png)
skin/classic/browser/privatebrowsing/attention@2x.png (../shared/privatebrowsing/attention@2x.png)
skin/classic/browser/privatebrowsing/check.png (../shared/privatebrowsing/check.png)
skin/classic/browser/privatebrowsing/check@2x.png (../shared/privatebrowsing/check@2x.png)
skin/classic/browser/privatebrowsing/mask.svg (../shared/privatebrowsing/mask.svg)
skin/classic/browser/privatebrowsing/shield-page.png (../shared/privatebrowsing/shield-page.png)
skin/classic/browser/privatebrowsing/shield-page@2x.png (../shared/privatebrowsing/shield-page@2x.png)
skin/classic/browser/yosemite/preferences/checkbox.png (preferences/checkbox-yosemite.png)
skin/classic/browser/yosemite/preferences/checkbox@2x.png (preferences/checkbox-yosemite@2x.png)
skin/classic/browser/social/services-16.png (social/services-16.png)
@ -375,194 +326,6 @@ browser.jar:
skin/classic/browser/translating-16@2x.png (../shared/translation/translating-16@2x.png)
skin/classic/browser/translation-16.png (../shared/translation/translation-16.png)
skin/classic/browser/translation-16@2x.png (../shared/translation/translation-16@2x.png)
skin/classic/browser/devedition/urlbar-history-dropmarker.svg (../shared/devedition/urlbar-history-dropmarker.svg)
skin/classic/browser/devedition/urlbar-arrow.png (../shared/devedition/urlbar-arrow.png)
skin/classic/browser/devedition/urlbar-arrow@2x.png (../shared/devedition/urlbar-arrow@2x.png)
* skin/classic/browser/devtools/common.css (../shared/devtools/common.css)
* skin/classic/browser/devtools/dark-theme.css (../shared/devtools/dark-theme.css)
* skin/classic/browser/devtools/light-theme.css (../shared/devtools/light-theme.css)
skin/classic/browser/devtools/add.svg (../shared/devtools/images/add.svg)
skin/classic/browser/devtools/filters.svg (../shared/devtools/filters.svg)
skin/classic/browser/devtools/filter-swatch.svg (../shared/devtools/images/filter-swatch.svg)
skin/classic/browser/devtools/pseudo-class.svg (../shared/devtools/images/pseudo-class.svg)
skin/classic/browser/devtools/controls.png (../shared/devtools/images/controls.png)
skin/classic/browser/devtools/controls@2x.png (../shared/devtools/images/controls@2x.png)
skin/classic/browser/devtools/animation-fast-track.svg (../shared/devtools/images/animation-fast-track.svg)
skin/classic/browser/devtools/performance-icons.svg (../shared/devtools/images/performance-icons.svg)
skin/classic/browser/devtools/newtab.png (../shared/devtools/images/newtab.png)
skin/classic/browser/devtools/newtab@2x.png (../shared/devtools/images/newtab@2x.png)
skin/classic/browser/devtools/newtab-inverted.png (../shared/devtools/images/newtab-inverted.png)
skin/classic/browser/devtools/newtab-inverted@2x.png (../shared/devtools/images/newtab-inverted@2x.png)
* skin/classic/browser/devtools/widgets.css (../shared/devtools/widgets.css)
skin/classic/browser/devtools/power.svg (../shared/devtools/images/power.svg)
skin/classic/browser/devtools/filetype-dir-close.svg (../shared/devtools/images/filetypes/dir-close.svg)
skin/classic/browser/devtools/filetype-dir-open.svg (../shared/devtools/images/filetypes/dir-open.svg)
skin/classic/browser/devtools/filetype-globe.svg (../shared/devtools/images/filetypes/globe.svg)
skin/classic/browser/devtools/filetype-store.svg (../shared/devtools/images/filetypes/store.svg)
skin/classic/browser/devtools/commandline-icon.png (../shared/devtools/images/commandline-icon.png)
skin/classic/browser/devtools/commandline-icon@2x.png (../shared/devtools/images/commandline-icon@2x.png)
skin/classic/browser/devtools/command-paintflashing.png (../shared/devtools/images/command-paintflashing.png)
skin/classic/browser/devtools/command-paintflashing@2x.png (../shared/devtools/images/command-paintflashing@2x.png)
skin/classic/browser/devtools/command-screenshot.png (../shared/devtools/images/command-screenshot.png)
skin/classic/browser/devtools/command-screenshot@2x.png (../shared/devtools/images/command-screenshot@2x.png)
skin/classic/browser/devtools/command-responsivemode.png (../shared/devtools/images/command-responsivemode.png)
skin/classic/browser/devtools/command-responsivemode@2x.png (../shared/devtools/images/command-responsivemode@2x.png)
skin/classic/browser/devtools/command-scratchpad.png (../shared/devtools/images/command-scratchpad.png)
skin/classic/browser/devtools/command-scratchpad@2x.png (../shared/devtools/images/command-scratchpad@2x.png)
skin/classic/browser/devtools/command-tilt.png (../shared/devtools/images/command-tilt.png)
skin/classic/browser/devtools/command-tilt@2x.png (../shared/devtools/images/command-tilt@2x.png)
skin/classic/browser/devtools/command-pick.png (../shared/devtools/images/command-pick.png)
skin/classic/browser/devtools/command-pick@2x.png (../shared/devtools/images/command-pick@2x.png)
skin/classic/browser/devtools/command-frames.png (../shared/devtools/images/command-frames.png)
skin/classic/browser/devtools/command-frames@2x.png (../shared/devtools/images/command-frames@2x.png)
skin/classic/browser/devtools/command-console.png (../shared/devtools/images/command-console.png)
skin/classic/browser/devtools/command-console@2x.png (../shared/devtools/images/command-console@2x.png)
skin/classic/browser/devtools/command-eyedropper.png (../shared/devtools/images/command-eyedropper.png)
skin/classic/browser/devtools/command-eyedropper@2x.png (../shared/devtools/images/command-eyedropper@2x.png)
skin/classic/browser/devtools/command-rulers.png (../shared/devtools/images/command-rulers.png)
skin/classic/browser/devtools/command-rulers@2x.png (../shared/devtools/images/command-rulers@2x.png)
skin/classic/browser/devtools/alerticon-warning.png (../shared/devtools/images/alerticon-warning.png)
skin/classic/browser/devtools/alerticon-warning@2x.png (../shared/devtools/images/alerticon-warning@2x.png)
* skin/classic/browser/devtools/ruleview.css (../shared/devtools/ruleview.css)
skin/classic/browser/devtools/commandline.css (../shared/devtools/commandline.css)
skin/classic/browser/devtools/markup-view.css (../shared/devtools/markup-view.css)
skin/classic/browser/devtools/editor-error.png (../shared/devtools/images/editor-error.png)
skin/classic/browser/devtools/editor-breakpoint.png (../shared/devtools/images/editor-breakpoint.png)
skin/classic/browser/devtools/editor-breakpoint@2x.png (../shared/devtools/images/editor-breakpoint@2x.png)
skin/classic/browser/devtools/editor-debug-location.png (../shared/devtools/images/editor-debug-location.png)
skin/classic/browser/devtools/editor-debug-location@2x.png (../shared/devtools/images/editor-debug-location@2x.png)
* skin/classic/browser/devtools/webconsole.css (../shared/devtools/webconsole.css)
skin/classic/browser/devtools/webconsole.svg (../shared/devtools/images/webconsole.svg)
skin/classic/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
skin/classic/browser/devtools/animationinspector.css (../shared/devtools/animationinspector.css)
* skin/classic/browser/devtools/canvasdebugger.css (../shared/devtools/canvasdebugger.css)
skin/classic/browser/devtools/debugger.css (../shared/devtools/debugger.css)
skin/classic/browser/devtools/eyedropper.css (../shared/devtools/eyedropper.css)
* skin/classic/browser/devtools/netmonitor.css (../shared/devtools/netmonitor.css)
skin/classic/browser/devtools/performance.css (../shared/devtools/performance.css)
skin/classic/browser/devtools/memory.css (../shared/devtools/memory.css)
skin/classic/browser/devtools/promisedebugger.css (../shared/devtools/promisedebugger.css)
skin/classic/browser/devtools/timeline-filter.svg (../shared/devtools/images/timeline-filter.svg)
* skin/classic/browser/devtools/scratchpad.css (../shared/devtools/scratchpad.css)
skin/classic/browser/devtools/shadereditor.css (../shared/devtools/shadereditor.css)
* skin/classic/browser/devtools/splitview.css (../shared/devtools/splitview.css)
skin/classic/browser/devtools/styleeditor.css (../shared/devtools/styleeditor.css)
skin/classic/browser/devtools/storage.css (../shared/devtools/storage.css)
skin/classic/browser/devtools/webaudioeditor.css (../shared/devtools/webaudioeditor.css)
skin/classic/browser/devtools/magnifying-glass.png (../shared/devtools/images/magnifying-glass.png)
skin/classic/browser/devtools/magnifying-glass@2x.png (../shared/devtools/images/magnifying-glass@2x.png)
skin/classic/browser/devtools/magnifying-glass-light.png (../shared/devtools/images/magnifying-glass-light.png)
skin/classic/browser/devtools/magnifying-glass-light@2x.png (../shared/devtools/images/magnifying-glass-light@2x.png)
skin/classic/browser/devtools/itemToggle.png (../shared/devtools/images/itemToggle.png)
skin/classic/browser/devtools/itemToggle@2x.png (../shared/devtools/images/itemToggle@2x.png)
skin/classic/browser/devtools/itemArrow-dark-rtl.svg (../shared/devtools/images/itemArrow-dark-rtl.svg)
skin/classic/browser/devtools/itemArrow-dark-ltr.svg (../shared/devtools/images/itemArrow-dark-ltr.svg)
skin/classic/browser/devtools/itemArrow-rtl.svg (../shared/devtools/images/itemArrow-rtl.svg)
skin/classic/browser/devtools/itemArrow-ltr.svg (../shared/devtools/images/itemArrow-ltr.svg)
skin/classic/browser/devtools/noise.png (../shared/devtools/images/noise.png)
skin/classic/browser/devtools/dropmarker.svg (../shared/devtools/images/dropmarker.svg)
skin/classic/browser/devtools/layoutview.css (../shared/devtools/layoutview.css)
skin/classic/browser/devtools/debugger-collapse.png (../shared/devtools/images/debugger-collapse.png)
skin/classic/browser/devtools/debugger-collapse@2x.png (../shared/devtools/images/debugger-collapse@2x.png)
skin/classic/browser/devtools/debugger-expand.png (../shared/devtools/images/debugger-expand.png)
skin/classic/browser/devtools/debugger-expand@2x.png (../shared/devtools/images/debugger-expand@2x.png)
skin/classic/browser/devtools/debugger-pause.png (../shared/devtools/images/debugger-pause.png)
skin/classic/browser/devtools/debugger-pause@2x.png (../shared/devtools/images/debugger-pause@2x.png)
skin/classic/browser/devtools/debugger-play.png (../shared/devtools/images/debugger-play.png)
skin/classic/browser/devtools/debugger-play@2x.png (../shared/devtools/images/debugger-play@2x.png)
skin/classic/browser/devtools/fast-forward.png (../shared/devtools/images/fast-forward.png)
skin/classic/browser/devtools/fast-forward@2x.png (../shared/devtools/images/fast-forward@2x.png)
skin/classic/browser/devtools/rewind.png (../shared/devtools/images/rewind.png)
skin/classic/browser/devtools/rewind@2x.png (../shared/devtools/images/rewind@2x.png)
skin/classic/browser/devtools/debugger-step-in.png (../shared/devtools/images/debugger-step-in.png)
skin/classic/browser/devtools/debugger-step-in@2x.png (../shared/devtools/images/debugger-step-in@2x.png)
skin/classic/browser/devtools/debugger-step-out.png (../shared/devtools/images/debugger-step-out.png)
skin/classic/browser/devtools/debugger-step-out@2x.png (../shared/devtools/images/debugger-step-out@2x.png)
skin/classic/browser/devtools/debugger-step-over.png (../shared/devtools/images/debugger-step-over.png)
skin/classic/browser/devtools/debugger-step-over@2x.png (../shared/devtools/images/debugger-step-over@2x.png)
skin/classic/browser/devtools/debugger-blackbox.png (../shared/devtools/images/debugger-blackbox.png)
skin/classic/browser/devtools/debugger-blackbox@2x.png (../shared/devtools/images/debugger-blackbox@2x.png)
skin/classic/browser/devtools/debugger-prettyprint.png (../shared/devtools/images/debugger-prettyprint.png)
skin/classic/browser/devtools/debugger-prettyprint@2x.png (../shared/devtools/images/debugger-prettyprint@2x.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
skin/classic/browser/devtools/tracer-icon.png (../shared/devtools/images/tracer-icon.png)
skin/classic/browser/devtools/tracer-icon@2x.png (../shared/devtools/images/tracer-icon@2x.png)
* skin/classic/browser/devtools/floating-scrollbars.css (../shared/devtools/floating-scrollbars.css)
skin/classic/browser/devtools/floating-scrollbars-light.css (../shared/devtools/floating-scrollbars-light.css)
skin/classic/browser/devtools/responsive-se-resizer.png (../shared/devtools/images/responsivemode/responsive-se-resizer.png)
skin/classic/browser/devtools/responsive-se-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-se-resizer@2x.png)
skin/classic/browser/devtools/responsive-vertical-resizer.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer.png)
skin/classic/browser/devtools/responsive-vertical-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer@2x.png)
skin/classic/browser/devtools/responsive-horizontal-resizer.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer.png)
skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer@2x.png)
skin/classic/browser/devtools/responsiveui-rotate.png (../shared/devtools/images/responsivemode/responsiveui-rotate.png)
skin/classic/browser/devtools/responsiveui-rotate@2x.png (../shared/devtools/images/responsivemode/responsiveui-rotate@2x.png)
skin/classic/browser/devtools/responsiveui-touch.png (../shared/devtools/images/responsivemode/responsiveui-touch.png)
skin/classic/browser/devtools/responsiveui-touch@2x.png (../shared/devtools/images/responsivemode/responsiveui-touch@2x.png)
skin/classic/browser/devtools/responsiveui-screenshot.png (../shared/devtools/images/responsivemode/responsiveui-screenshot.png)
skin/classic/browser/devtools/responsiveui-screenshot@2x.png (../shared/devtools/images/responsivemode/responsiveui-screenshot@2x.png)
skin/classic/browser/devtools/toggle-tools.png (../shared/devtools/images/toggle-tools.png)
skin/classic/browser/devtools/toggle-tools@2x.png (../shared/devtools/images/toggle-tools@2x.png)
skin/classic/browser/devtools/dock-bottom@2x.png (../shared/devtools/images/dock-bottom@2x.png)
skin/classic/browser/devtools/dock-bottom-minimize@2x.png (../shared/devtools/images/dock-bottom-minimize@2x.png)
skin/classic/browser/devtools/dock-bottom-maximize@2x.png (../shared/devtools/images/dock-bottom-maximize@2x.png)
skin/classic/browser/devtools/dock-side@2x.png (../shared/devtools/images/dock-side@2x.png)
* skin/classic/browser/devtools/inspector.css (../shared/devtools/inspector.css)
skin/classic/browser/devtools/profiler-stopwatch.svg (../shared/devtools/images/profiler-stopwatch.svg)
skin/classic/browser/devtools/profiler-stopwatch-checked.svg (../shared/devtools/images/profiler-stopwatch-checked.svg)
skin/classic/browser/devtools/tool-options.svg (../shared/devtools/images/tool-options.svg)
skin/classic/browser/devtools/tool-webconsole.svg (../shared/devtools/images/tool-webconsole.svg)
skin/classic/browser/devtools/tool-debugger.svg (../shared/devtools/images/tool-debugger.svg)
skin/classic/browser/devtools/tool-debugger-paused.svg (../shared/devtools/images/tool-debugger-paused.svg)
skin/classic/browser/devtools/tool-inspector.svg (../shared/devtools/images/tool-inspector.svg)
skin/classic/browser/devtools/tool-inspector.svg (../shared/devtools/images/tool-inspector.svg)
skin/classic/browser/devtools/tool-shadereditor.svg (../shared/devtools/images/tool-shadereditor.svg)
skin/classic/browser/devtools/tool-styleeditor.svg (../shared/devtools/images/tool-styleeditor.svg)
skin/classic/browser/devtools/tool-storage.svg (../shared/devtools/images/tool-storage.svg)
skin/classic/browser/devtools/tool-profiler.svg (../shared/devtools/images/tool-profiler.svg)
skin/classic/browser/devtools/tool-profiler-active.svg (../shared/devtools/images/tool-profiler-active.svg)
skin/classic/browser/devtools/tool-network.svg (../shared/devtools/images/tool-network.svg)
skin/classic/browser/devtools/tool-scratchpad.svg (../shared/devtools/images/tool-scratchpad.svg)
skin/classic/browser/devtools/tool-webaudio.svg (../shared/devtools/images/tool-webaudio.svg)
skin/classic/browser/devtools/close.png (../shared/devtools/images/close.png)
skin/classic/browser/devtools/close@2x.png (../shared/devtools/images/close@2x.png)
skin/classic/browser/devtools/vview-delete.png (../shared/devtools/images/vview-delete.png)
skin/classic/browser/devtools/vview-delete@2x.png (../shared/devtools/images/vview-delete@2x.png)
skin/classic/browser/devtools/vview-edit.png (../shared/devtools/images/vview-edit.png)
skin/classic/browser/devtools/vview-edit@2x.png (../shared/devtools/images/vview-edit@2x.png)
skin/classic/browser/devtools/vview-lock.png (../shared/devtools/images/vview-lock.png)
skin/classic/browser/devtools/vview-lock@2x.png (../shared/devtools/images/vview-lock@2x.png)
skin/classic/browser/devtools/vview-open-inspector.png (../shared/devtools/images/vview-open-inspector.png)
skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png)
skin/classic/browser/devtools/cubic-bezier-swatch.png (../shared/devtools/images/cubic-bezier-swatch.png)
skin/classic/browser/devtools/cubic-bezier-swatch@2x.png (../shared/devtools/images/cubic-bezier-swatch@2x.png)
skin/classic/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png)
skin/classic/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css)
skin/classic/browser/devtools/computedview.css (../shared/devtools/computedview.css)
skin/classic/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png)
skin/classic/browser/devtools/arrow-e@2x.png (../shared/devtools/images/arrow-e@2x.png)
skin/classic/browser/devtools/responsiveui-home.png (../shared/devtools/responsiveui-home.png)
skin/classic/browser/devtools/projecteditor/projecteditor.css (../shared/devtools/projecteditor/projecteditor.css)
skin/classic/browser/devtools/app-manager/connection-footer.css (../shared/devtools/app-manager/connection-footer.css)
skin/classic/browser/devtools/app-manager/index.css (../shared/devtools/app-manager/index.css)
skin/classic/browser/devtools/app-manager/device.css (../shared/devtools/app-manager/device.css)
skin/classic/browser/devtools/app-manager/projects.css (../shared/devtools/app-manager/projects.css)
skin/classic/browser/devtools/app-manager/help.css (../shared/devtools/app-manager/help.css)
skin/classic/browser/devtools/app-manager/warning.svg (../shared/devtools/app-manager/images/warning.svg)
skin/classic/browser/devtools/app-manager/error.svg (../shared/devtools/app-manager/images/error.svg)
skin/classic/browser/devtools/app-manager/plus.svg (../shared/devtools/app-manager/images/plus.svg)
skin/classic/browser/devtools/app-manager/remove.svg (../shared/devtools/app-manager/images/remove.svg)
skin/classic/browser/devtools/app-manager/add.svg (../shared/devtools/app-manager/images/add.svg)
skin/classic/browser/devtools/app-manager/index-icons.svg (../shared/devtools/app-manager/images/index-icons.svg)
skin/classic/browser/devtools/app-manager/rocket.svg (../shared/devtools/app-manager/images/rocket.svg)
skin/classic/browser/devtools/app-manager/noise.png (../shared/devtools/app-manager/images/noise.png)
skin/classic/browser/devtools/app-manager/default-app-icon.png (../shared/devtools/app-manager/images/default-app-icon.png)
skin/classic/browser/devtools/search-clear-failed.svg (../shared/devtools/images/search-clear-failed.svg)
skin/classic/browser/devtools/search-clear-light.svg (../shared/devtools/images/search-clear-light.svg)
skin/classic/browser/devtools/search-clear-dark.svg (../shared/devtools/images/search-clear-dark.svg)
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/sync-16.png
skin/classic/browser/sync-32.png
@ -610,20 +373,6 @@ browser.jar:
skin/classic/browser/yosemite/sync-horizontalbar@2x.png (sync-horizontalbar-yosemite@2x.png)
skin/classic/browser/yosemite/thumburger.png (customizableui/thumburger-yosemite.png)
skin/classic/browser/yosemite/thumburger@2x.png (customizableui/thumburger-yosemite@2x.png)
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png)
skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)
skin/classic/browser/notification-pluginNormal@2x.png (../shared/plugins/notification-pluginNormal@2x.png)
skin/classic/browser/notification-pluginAlert@2x.png (../shared/plugins/notification-pluginAlert@2x.png)
skin/classic/browser/notification-pluginBlocked@2x.png (../shared/plugins/notification-pluginBlocked@2x.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png (../shared/devtools/tooltip/arrow-horizontal-dark.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark.png (../shared/devtools/tooltip/arrow-vertical-dark.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png (../shared/devtools/tooltip/arrow-horizontal-light.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light.png (../shared/devtools/tooltip/arrow-vertical-light.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
#ifdef E10S_TESTING_ONLY
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
#endif

7
browser/themes/shared/controlcenter/panel.inc.css
View File

@ -159,6 +159,7 @@
#identity-popup-security-descriptions > description,
#identity-popup-securityView-header > description,
#identity-popup-securityView-body > description,
#identity-popup-permissions-content > description,
#tracking-protection-content > label {
white-space: pre-wrap;
font-size: 110%;
@ -288,10 +289,14 @@ description#identity-popup-content-verifier,
background-image: url(chrome://browser/skin/controlcenter/permissions.svg);
}
#identity-popup-permission-list {
#identity-popup-permission-list:not(:empty) {
margin-top: 5px;
}
#identity-popup-permission-list:not(:empty) + description {
display: none;
}
.identity-popup-permission-label {
-moz-margin-start: 0;
}

264
browser/themes/shared/jar.inc.mn Normal file
View File

@ -0,0 +1,264 @@
# 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/.
# This is not a complete / proper jar manifest. It is included by the
# actual theme-specific manifests, so that shared resources need only
# be specified once. As a result, the source file paths are relative
# to the location of the actual manifest.
skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css)
skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg)
skin/classic/browser/aboutNetError_alert.svg (../shared/aboutNetError_alert.svg)
* skin/classic/browser/aboutProviderDirectory.css (../shared/aboutProviderDirectory.css)
skin/classic/browser/aboutSocialError.css (../shared/aboutSocialError.css)
skin/classic/browser/addons/addon-install-blocked.svg (../shared/addons/addon-install-blocked.svg)
skin/classic/browser/addons/addon-install-confirm.svg (../shared/addons/addon-install-confirm.svg)
skin/classic/browser/addons/addon-install-downloading.svg (../shared/addons/addon-install-downloading.svg)
skin/classic/browser/addons/addon-install-error.svg (../shared/addons/addon-install-error.svg)
skin/classic/browser/addons/addon-install-installed.svg (../shared/addons/addon-install-installed.svg)
skin/classic/browser/addons/addon-install-restart.svg (../shared/addons/addon-install-restart.svg)
skin/classic/browser/addons/addon-install-warning.svg (../shared/addons/addon-install-warning.svg)
skin/classic/browser/addons/addon-install-anchor.svg (../shared/addons/addon-install-anchor.svg)
skin/classic/browser/session-restore.svg (../shared/incontent-icons/session-restore.svg)
skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg)
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png)
skin/classic/browser/reader-tour@2x.png (../shared/reader/reader-tour@2x.png)
skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg)
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
skin/classic/browser/notification-pluginNormal@2x.png (../shared/plugins/notification-pluginNormal@2x.png)
skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png)
skin/classic/browser/notification-pluginAlert@2x.png (../shared/plugins/notification-pluginAlert@2x.png)
skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)
skin/classic/browser/notification-pluginBlocked@2x.png (../shared/plugins/notification-pluginBlocked@2x.png)
skin/classic/browser/webRTC-shareDevice-16.png (../shared/webrtc/webRTC-shareDevice-16.png)
skin/classic/browser/webRTC-shareDevice-16@2x.png (../shared/webrtc/webRTC-shareDevice-16@2x.png)
skin/classic/browser/webRTC-shareDevice-64.png (../shared/webrtc/webRTC-shareDevice-64.png)
skin/classic/browser/webRTC-shareDevice-64@2x.png (../shared/webrtc/webRTC-shareDevice-64@2x.png)
skin/classic/browser/webRTC-sharingDevice-16.png (../shared/webrtc/webRTC-sharingDevice-16.png)
skin/classic/browser/webRTC-sharingDevice-16@2x.png (../shared/webrtc/webRTC-sharingDevice-16@2x.png)
skin/classic/browser/webRTC-shareMicrophone-16.png (../shared/webrtc/webRTC-shareMicrophone-16.png)
skin/classic/browser/webRTC-shareMicrophone-16@2x.png (../shared/webrtc/webRTC-shareMicrophone-16@2x.png)
skin/classic/browser/webRTC-shareMicrophone-64.png (../shared/webrtc/webRTC-shareMicrophone-64.png)
skin/classic/browser/webRTC-shareMicrophone-64@2x.png (../shared/webrtc/webRTC-shareMicrophone-64@2x.png)
skin/classic/browser/webRTC-sharingMicrophone-16.png (../shared/webrtc/webRTC-sharingMicrophone-16.png)
skin/classic/browser/webRTC-sharingMicrophone-16@2x.png (../shared/webrtc/webRTC-sharingMicrophone-16@2x.png)
skin/classic/browser/webRTC-shareScreen-16.png (../shared/webrtc/webRTC-shareScreen-16.png)
skin/classic/browser/webRTC-shareScreen-16@2x.png (../shared/webrtc/webRTC-shareScreen-16@2x.png)
skin/classic/browser/webRTC-shareScreen-64.png (../shared/webrtc/webRTC-shareScreen-64.png)
skin/classic/browser/webRTC-shareScreen-64@2x.png (../shared/webrtc/webRTC-shareScreen-64@2x.png)
skin/classic/browser/webRTC-sharingScreen-16.png (../shared/webrtc/webRTC-sharingScreen-16.png)
skin/classic/browser/webRTC-sharingScreen-16@2x.png (../shared/webrtc/webRTC-sharingScreen-16@2x.png)
skin/classic/browser/webRTC-indicator.css (../shared/webrtc/indicator.css)
skin/classic/browser/webRTC-camera-white-16.png (../shared/webrtc/camera-white-16.png)
skin/classic/browser/webRTC-microphone-white-16.png (../shared/webrtc/microphone-white-16.png)
skin/classic/browser/webRTC-screen-white-16.png (../shared/webrtc/screen-white-16.png)
skin/classic/browser/panic-panel/header.png (../shared/panic-panel/header.png)
skin/classic/browser/panic-panel/header@2x.png (../shared/panic-panel/header@2x.png)
skin/classic/browser/panic-panel/header-small.png (../shared/panic-panel/header-small.png)
skin/classic/browser/panic-panel/header-small@2x.png (../shared/panic-panel/header-small@2x.png)
skin/classic/browser/panic-panel/icons.png (../shared/panic-panel/icons.png)
skin/classic/browser/panic-panel/icons@2x.png (../shared/panic-panel/icons@2x.png)
skin/classic/browser/privatebrowsing/attention.png (../shared/privatebrowsing/attention.png)
skin/classic/browser/privatebrowsing/attention@2x.png (../shared/privatebrowsing/attention@2x.png)
skin/classic/browser/privatebrowsing/check.png (../shared/privatebrowsing/check.png)
skin/classic/browser/privatebrowsing/check@2x.png (../shared/privatebrowsing/check@2x.png)
skin/classic/browser/privatebrowsing/mask.svg (../shared/privatebrowsing/mask.svg)
skin/classic/browser/privatebrowsing/shield-page.png (../shared/privatebrowsing/shield-page.png)
skin/classic/browser/privatebrowsing/shield-page@2x.png (../shared/privatebrowsing/shield-page@2x.png)
skin/classic/browser/devedition/urlbar-history-dropmarker.svg (../shared/devedition/urlbar-history-dropmarker.svg)
skin/classic/browser/devedition/urlbar-arrow.png (../shared/devedition/urlbar-arrow.png)
skin/classic/browser/devedition/urlbar-arrow@2x.png (../shared/devedition/urlbar-arrow@2x.png)
* skin/classic/browser/devtools/common.css (../shared/devtools/common.css)
* skin/classic/browser/devtools/dark-theme.css (../shared/devtools/dark-theme.css)
* skin/classic/browser/devtools/light-theme.css (../shared/devtools/light-theme.css)
skin/classic/browser/devtools/add.svg (../shared/devtools/images/add.svg)
skin/classic/browser/devtools/filters.svg (../shared/devtools/filters.svg)
skin/classic/browser/devtools/filter-swatch.svg (../shared/devtools/images/filter-swatch.svg)
skin/classic/browser/devtools/pseudo-class.svg (../shared/devtools/images/pseudo-class.svg)
skin/classic/browser/devtools/controls.png (../shared/devtools/images/controls.png)
skin/classic/browser/devtools/controls@2x.png (../shared/devtools/images/controls@2x.png)
skin/classic/browser/devtools/animation-fast-track.svg (../shared/devtools/images/animation-fast-track.svg)
skin/classic/browser/devtools/performance-icons.svg (../shared/devtools/images/performance-icons.svg)
skin/classic/browser/devtools/newtab.png (../shared/devtools/images/newtab.png)
skin/classic/browser/devtools/newtab@2x.png (../shared/devtools/images/newtab@2x.png)
skin/classic/browser/devtools/newtab-inverted.png (../shared/devtools/images/newtab-inverted.png)
skin/classic/browser/devtools/newtab-inverted@2x.png (../shared/devtools/images/newtab-inverted@2x.png)
* skin/classic/browser/devtools/widgets.css (../shared/devtools/widgets.css)
skin/classic/browser/devtools/power.svg (../shared/devtools/images/power.svg)
skin/classic/browser/devtools/filetype-dir-close.svg (../shared/devtools/images/filetypes/dir-close.svg)
skin/classic/browser/devtools/filetype-dir-open.svg (../shared/devtools/images/filetypes/dir-open.svg)
skin/classic/browser/devtools/filetype-globe.svg (../shared/devtools/images/filetypes/globe.svg)
skin/classic/browser/devtools/filetype-store.svg (../shared/devtools/images/filetypes/store.svg)
skin/classic/browser/devtools/commandline-icon.png (../shared/devtools/images/commandline-icon.png)
skin/classic/browser/devtools/commandline-icon@2x.png (../shared/devtools/images/commandline-icon@2x.png)
skin/classic/browser/devtools/alerticon-warning.png (../shared/devtools/images/alerticon-warning.png)
skin/classic/browser/devtools/alerticon-warning@2x.png (../shared/devtools/images/alerticon-warning@2x.png)
* skin/classic/browser/devtools/ruleview.css (../shared/devtools/ruleview.css)
skin/classic/browser/devtools/commandline.css (../shared/devtools/commandline.css)
skin/classic/browser/devtools/command-paintflashing.png (../shared/devtools/images/command-paintflashing.png)
skin/classic/browser/devtools/command-paintflashing@2x.png (../shared/devtools/images/command-paintflashing@2x.png)
skin/classic/browser/devtools/command-screenshot.png (../shared/devtools/images/command-screenshot.png)
skin/classic/browser/devtools/command-screenshot@2x.png (../shared/devtools/images/command-screenshot@2x.png)
skin/classic/browser/devtools/command-responsivemode.png (../shared/devtools/images/command-responsivemode.png)
skin/classic/browser/devtools/command-responsivemode@2x.png (../shared/devtools/images/command-responsivemode@2x.png)
skin/classic/browser/devtools/command-scratchpad.png (../shared/devtools/images/command-scratchpad.png)
skin/classic/browser/devtools/command-scratchpad@2x.png (../shared/devtools/images/command-scratchpad@2x.png)
skin/classic/browser/devtools/command-tilt.png (../shared/devtools/images/command-tilt.png)
skin/classic/browser/devtools/command-tilt@2x.png (../shared/devtools/images/command-tilt@2x.png)
skin/classic/browser/devtools/command-pick.png (../shared/devtools/images/command-pick.png)
skin/classic/browser/devtools/command-pick@2x.png (../shared/devtools/images/command-pick@2x.png)
skin/classic/browser/devtools/command-frames.png (../shared/devtools/images/command-frames.png)
skin/classic/browser/devtools/command-frames@2x.png (../shared/devtools/images/command-frames@2x.png)
skin/classic/browser/devtools/command-console.png (../shared/devtools/images/command-console.png)
skin/classic/browser/devtools/command-console@2x.png (../shared/devtools/images/command-console@2x.png)
skin/classic/browser/devtools/command-eyedropper.png (../shared/devtools/images/command-eyedropper.png)
skin/classic/browser/devtools/command-eyedropper@2x.png (../shared/devtools/images/command-eyedropper@2x.png)
skin/classic/browser/devtools/command-rulers.png (../shared/devtools/images/command-rulers.png)
skin/classic/browser/devtools/command-rulers@2x.png (../shared/devtools/images/command-rulers@2x.png)
skin/classic/browser/devtools/markup-view.css (../shared/devtools/markup-view.css)
skin/classic/browser/devtools/editor-error.png (../shared/devtools/images/editor-error.png)
skin/classic/browser/devtools/editor-breakpoint.png (../shared/devtools/images/editor-breakpoint.png)
skin/classic/browser/devtools/editor-breakpoint@2x.png (../shared/devtools/images/editor-breakpoint@2x.png)
skin/classic/browser/devtools/editor-debug-location.png (../shared/devtools/images/editor-debug-location.png)
skin/classic/browser/devtools/editor-debug-location@2x.png (../shared/devtools/images/editor-debug-location@2x.png)
* skin/classic/browser/devtools/webconsole.css (../shared/devtools/webconsole.css)
skin/classic/browser/devtools/webconsole.svg (../shared/devtools/images/webconsole.svg)
skin/classic/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
skin/classic/browser/devtools/animationinspector.css (../shared/devtools/animationinspector.css)
skin/classic/browser/devtools/eyedropper.css (../shared/devtools/eyedropper.css)
* skin/classic/browser/devtools/canvasdebugger.css (../shared/devtools/canvasdebugger.css)
skin/classic/browser/devtools/debugger.css (../shared/devtools/debugger.css)
* skin/classic/browser/devtools/netmonitor.css (../shared/devtools/netmonitor.css)
skin/classic/browser/devtools/performance.css (../shared/devtools/performance.css)
skin/classic/browser/devtools/memory.css (../shared/devtools/memory.css)
skin/classic/browser/devtools/promisedebugger.css (../shared/devtools/promisedebugger.css)
skin/classic/browser/devtools/timeline-filter.svg (../shared/devtools/images/timeline-filter.svg)
* skin/classic/browser/devtools/scratchpad.css (../shared/devtools/scratchpad.css)
skin/classic/browser/devtools/shadereditor.css (../shared/devtools/shadereditor.css)
skin/classic/browser/devtools/storage.css (../shared/devtools/storage.css)
* skin/classic/browser/devtools/splitview.css (../shared/devtools/splitview.css)
skin/classic/browser/devtools/styleeditor.css (../shared/devtools/styleeditor.css)
skin/classic/browser/devtools/webaudioeditor.css (../shared/devtools/webaudioeditor.css)
skin/classic/browser/devtools/magnifying-glass.png (../shared/devtools/images/magnifying-glass.png)
skin/classic/browser/devtools/magnifying-glass@2x.png (../shared/devtools/images/magnifying-glass@2x.png)
skin/classic/browser/devtools/magnifying-glass-light.png (../shared/devtools/images/magnifying-glass-light.png)
skin/classic/browser/devtools/magnifying-glass-light@2x.png (../shared/devtools/images/magnifying-glass-light@2x.png)
skin/classic/browser/devtools/itemToggle.png (../shared/devtools/images/itemToggle.png)
skin/classic/browser/devtools/itemToggle@2x.png (../shared/devtools/images/itemToggle@2x.png)
skin/classic/browser/devtools/itemArrow-dark-rtl.svg (../shared/devtools/images/itemArrow-dark-rtl.svg)
skin/classic/browser/devtools/itemArrow-dark-ltr.svg (../shared/devtools/images/itemArrow-dark-ltr.svg)
skin/classic/browser/devtools/itemArrow-rtl.svg (../shared/devtools/images/itemArrow-rtl.svg)
skin/classic/browser/devtools/itemArrow-ltr.svg (../shared/devtools/images/itemArrow-ltr.svg)
skin/classic/browser/devtools/noise.png (../shared/devtools/images/noise.png)
skin/classic/browser/devtools/dropmarker.svg (../shared/devtools/images/dropmarker.svg)
skin/classic/browser/devtools/layoutview.css (../shared/devtools/layoutview.css)
skin/classic/browser/devtools/debugger-collapse.png (../shared/devtools/images/debugger-collapse.png)
skin/classic/browser/devtools/debugger-collapse@2x.png (../shared/devtools/images/debugger-collapse@2x.png)
skin/classic/browser/devtools/debugger-expand.png (../shared/devtools/images/debugger-expand.png)
skin/classic/browser/devtools/debugger-expand@2x.png (../shared/devtools/images/debugger-expand@2x.png)
skin/classic/browser/devtools/debugger-pause.png (../shared/devtools/images/debugger-pause.png)
skin/classic/browser/devtools/debugger-pause@2x.png (../shared/devtools/images/debugger-pause@2x.png)
skin/classic/browser/devtools/debugger-play.png (../shared/devtools/images/debugger-play.png)
skin/classic/browser/devtools/debugger-play@2x.png (../shared/devtools/images/debugger-play@2x.png)
skin/classic/browser/devtools/fast-forward.png (../shared/devtools/images/fast-forward.png)
skin/classic/browser/devtools/fast-forward@2x.png (../shared/devtools/images/fast-forward@2x.png)
skin/classic/browser/devtools/rewind.png (../shared/devtools/images/rewind.png)
skin/classic/browser/devtools/rewind@2x.png (../shared/devtools/images/rewind@2x.png)
skin/classic/browser/devtools/debugger-step-in.png (../shared/devtools/images/debugger-step-in.png)
skin/classic/browser/devtools/debugger-step-in@2x.png (../shared/devtools/images/debugger-step-in@2x.png)
skin/classic/browser/devtools/debugger-step-out.png (../shared/devtools/images/debugger-step-out.png)
skin/classic/browser/devtools/debugger-step-out@2x.png (../shared/devtools/images/debugger-step-out@2x.png)
skin/classic/browser/devtools/debugger-step-over.png (../shared/devtools/images/debugger-step-over.png)
skin/classic/browser/devtools/debugger-step-over@2x.png (../shared/devtools/images/debugger-step-over@2x.png)
skin/classic/browser/devtools/debugger-blackbox.png (../shared/devtools/images/debugger-blackbox.png)
skin/classic/browser/devtools/debugger-blackbox@2x.png (../shared/devtools/images/debugger-blackbox@2x.png)
skin/classic/browser/devtools/debugger-prettyprint.png (../shared/devtools/images/debugger-prettyprint.png)
skin/classic/browser/devtools/debugger-prettyprint@2x.png (../shared/devtools/images/debugger-prettyprint@2x.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
skin/classic/browser/devtools/tracer-icon.png (../shared/devtools/images/tracer-icon.png)
skin/classic/browser/devtools/tracer-icon@2x.png (../shared/devtools/images/tracer-icon@2x.png)
skin/classic/browser/devtools/responsive-se-resizer.png (../shared/devtools/images/responsivemode/responsive-se-resizer.png)
skin/classic/browser/devtools/responsive-se-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-se-resizer@2x.png)
skin/classic/browser/devtools/responsive-vertical-resizer.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer.png)
skin/classic/browser/devtools/responsive-vertical-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer@2x.png)
skin/classic/browser/devtools/responsive-horizontal-resizer.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer.png)
skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer@2x.png)
skin/classic/browser/devtools/responsiveui-rotate.png (../shared/devtools/images/responsivemode/responsiveui-rotate.png)
skin/classic/browser/devtools/responsiveui-rotate@2x.png (../shared/devtools/images/responsivemode/responsiveui-rotate@2x.png)
skin/classic/browser/devtools/responsiveui-touch.png (../shared/devtools/images/responsivemode/responsiveui-touch.png)
skin/classic/browser/devtools/responsiveui-touch@2x.png (../shared/devtools/images/responsivemode/responsiveui-touch@2x.png)
skin/classic/browser/devtools/responsiveui-screenshot.png (../shared/devtools/images/responsivemode/responsiveui-screenshot.png)
skin/classic/browser/devtools/responsiveui-screenshot@2x.png (../shared/devtools/images/responsivemode/responsiveui-screenshot@2x.png)
skin/classic/browser/devtools/toggle-tools.png (../shared/devtools/images/toggle-tools.png)
skin/classic/browser/devtools/toggle-tools@2x.png (../shared/devtools/images/toggle-tools@2x.png)
skin/classic/browser/devtools/dock-bottom@2x.png (../shared/devtools/images/dock-bottom@2x.png)
skin/classic/browser/devtools/dock-bottom-minimize@2x.png (../shared/devtools/images/dock-bottom-minimize@2x.png)
skin/classic/browser/devtools/dock-bottom-maximize@2x.png (../shared/devtools/images/dock-bottom-maximize@2x.png)
skin/classic/browser/devtools/dock-side@2x.png (../shared/devtools/images/dock-side@2x.png)
* skin/classic/browser/devtools/floating-scrollbars.css (../shared/devtools/floating-scrollbars.css)
skin/classic/browser/devtools/floating-scrollbars-light.css (../shared/devtools/floating-scrollbars-light.css)
* skin/classic/browser/devtools/inspector.css (../shared/devtools/inspector.css)
skin/classic/browser/devtools/profiler-stopwatch.svg (../shared/devtools/images/profiler-stopwatch.svg)
skin/classic/browser/devtools/profiler-stopwatch-checked.svg (../shared/devtools/images/profiler-stopwatch-checked.svg)
skin/classic/browser/devtools/tool-options.svg (../shared/devtools/images/tool-options.svg)
skin/classic/browser/devtools/tool-webconsole.svg (../shared/devtools/images/tool-webconsole.svg)
skin/classic/browser/devtools/tool-debugger.svg (../shared/devtools/images/tool-debugger.svg)
skin/classic/browser/devtools/tool-debugger-paused.svg (../shared/devtools/images/tool-debugger-paused.svg)
skin/classic/browser/devtools/tool-inspector.svg (../shared/devtools/images/tool-inspector.svg)
skin/classic/browser/devtools/tool-shadereditor.svg (../shared/devtools/images/tool-shadereditor.svg)
skin/classic/browser/devtools/tool-styleeditor.svg (../shared/devtools/images/tool-styleeditor.svg)
skin/classic/browser/devtools/tool-storage.svg (../shared/devtools/images/tool-storage.svg)
skin/classic/browser/devtools/tool-profiler.svg (../shared/devtools/images/tool-profiler.svg)
skin/classic/browser/devtools/tool-profiler-active.svg (../shared/devtools/images/tool-profiler-active.svg)
skin/classic/browser/devtools/tool-network.svg (../shared/devtools/images/tool-network.svg)
skin/classic/browser/devtools/tool-scratchpad.svg (../shared/devtools/images/tool-scratchpad.svg)
skin/classic/browser/devtools/tool-webaudio.svg (../shared/devtools/images/tool-webaudio.svg)
skin/classic/browser/devtools/close.png (../shared/devtools/images/close.png)
skin/classic/browser/devtools/close@2x.png (../shared/devtools/images/close@2x.png)
skin/classic/browser/devtools/vview-delete.png (../shared/devtools/images/vview-delete.png)
skin/classic/browser/devtools/vview-delete@2x.png (../shared/devtools/images/vview-delete@2x.png)
skin/classic/browser/devtools/vview-edit.png (../shared/devtools/images/vview-edit.png)
skin/classic/browser/devtools/vview-edit@2x.png (../shared/devtools/images/vview-edit@2x.png)
skin/classic/browser/devtools/vview-lock.png (../shared/devtools/images/vview-lock.png)
skin/classic/browser/devtools/vview-lock@2x.png (../shared/devtools/images/vview-lock@2x.png)
skin/classic/browser/devtools/vview-open-inspector.png (../shared/devtools/images/vview-open-inspector.png)
skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png)
skin/classic/browser/devtools/cubic-bezier-swatch.png (../shared/devtools/images/cubic-bezier-swatch.png)
skin/classic/browser/devtools/cubic-bezier-swatch@2x.png (../shared/devtools/images/cubic-bezier-swatch@2x.png)
skin/classic/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png)
skin/classic/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css)
skin/classic/browser/devtools/computedview.css (../shared/devtools/computedview.css)
skin/classic/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png)
skin/classic/browser/devtools/arrow-e@2x.png (../shared/devtools/images/arrow-e@2x.png)
skin/classic/browser/devtools/responsiveui-home.png (../shared/devtools/responsiveui-home.png)
skin/classic/browser/devtools/projecteditor/projecteditor.css (../shared/devtools/projecteditor/projecteditor.css)
skin/classic/browser/devtools/app-manager/connection-footer.css (../shared/devtools/app-manager/connection-footer.css)
skin/classic/browser/devtools/app-manager/index.css (../shared/devtools/app-manager/index.css)
skin/classic/browser/devtools/app-manager/device.css (../shared/devtools/app-manager/device.css)
skin/classic/browser/devtools/app-manager/projects.css (../shared/devtools/app-manager/projects.css)
skin/classic/browser/devtools/app-manager/help.css (../shared/devtools/app-manager/help.css)
skin/classic/browser/devtools/app-manager/warning.svg (../shared/devtools/app-manager/images/warning.svg)
skin/classic/browser/devtools/app-manager/error.svg (../shared/devtools/app-manager/images/error.svg)
skin/classic/browser/devtools/app-manager/plus.svg (../shared/devtools/app-manager/images/plus.svg)
skin/classic/browser/devtools/app-manager/remove.svg (../shared/devtools/app-manager/images/remove.svg)
skin/classic/browser/devtools/app-manager/add.svg (../shared/devtools/app-manager/images/add.svg)
skin/classic/browser/devtools/app-manager/index-icons.svg (../shared/devtools/app-manager/images/index-icons.svg)
skin/classic/browser/devtools/app-manager/rocket.svg (../shared/devtools/app-manager/images/rocket.svg)
skin/classic/browser/devtools/app-manager/noise.png (../shared/devtools/app-manager/images/noise.png)
skin/classic/browser/devtools/app-manager/default-app-icon.png (../shared/devtools/app-manager/images/default-app-icon.png)
skin/classic/browser/devtools/search-clear-failed.svg (../shared/devtools/images/search-clear-failed.svg)
skin/classic/browser/devtools/search-clear-light.svg (../shared/devtools/images/search-clear-light.svg)
skin/classic/browser/devtools/search-clear-dark.svg (../shared/devtools/images/search-clear-dark.svg)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png (../shared/devtools/tooltip/arrow-horizontal-dark.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark.png (../shared/devtools/tooltip/arrow-vertical-dark.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png (../shared/devtools/tooltip/arrow-horizontal-light.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light.png (../shared/devtools/tooltip/arrow-vertical-light.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png (../shared/devtools/tooltip/arrow-vertical-light@2x.png)

253
browser/themes/windows/jar.mn
View File

@ -4,6 +4,7 @@
browser.jar:
% skin browser classic/1.0 %skin/classic/browser/
#include ../shared/jar.inc.mn
skin/classic/browser/sanitizeDialog.css
* skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css)
skin/classic/browser/aboutSessionRestore-window-icon.png
@ -12,11 +13,6 @@ browser.jar:
skin/classic/browser/aboutCertError_sectionCollapsed.png
skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
skin/classic/browser/aboutCertError_sectionExpanded.png
skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css)
skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg)
skin/classic/browser/aboutNetError_alert.svg (../shared/aboutNetError_alert.svg)
skin/classic/browser/aboutSocialError.css (../shared/aboutSocialError.css)
* skin/classic/browser/aboutProviderDirectory.css (../shared/aboutProviderDirectory.css)
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/aboutSyncTabs.css
#endif
@ -24,14 +20,6 @@ browser.jar:
skin/classic/browser/actionicon-tab.png
skin/classic/browser/actionicon-tab@2x.png
skin/classic/browser/actionicon-tab-XPVista7.png
skin/classic/browser/addons/addon-install-blocked.svg (../shared/addons/addon-install-blocked.svg)
skin/classic/browser/addons/addon-install-confirm.svg (../shared/addons/addon-install-confirm.svg)
skin/classic/browser/addons/addon-install-downloading.svg (../shared/addons/addon-install-downloading.svg)
skin/classic/browser/addons/addon-install-error.svg (../shared/addons/addon-install-error.svg)
skin/classic/browser/addons/addon-install-installed.svg (../shared/addons/addon-install-installed.svg)
skin/classic/browser/addons/addon-install-restart.svg (../shared/addons/addon-install-restart.svg)
skin/classic/browser/addons/addon-install-warning.svg (../shared/addons/addon-install-warning.svg)
skin/classic/browser/addons/addon-install-anchor.svg (../shared/addons/addon-install-anchor.svg)
* skin/classic/browser/browser.css
* skin/classic/browser/devedition.css
* skin/classic/browser/browser-lightweightTheme.css
@ -142,37 +130,6 @@ browser.jar:
skin/classic/browser/urlbar-history-dropmarker@2x.png
skin/classic/browser/urlbar-history-dropmarker-preWin10.png
skin/classic/browser/urlbar-history-dropmarker-preWin10@2x.png
skin/classic/browser/session-restore.svg (../shared/incontent-icons/session-restore.svg)
skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg)
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png)
skin/classic/browser/reader-tour@2x.png (../shared/reader/reader-tour@2x.png)
skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg)
skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)
skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png)
skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)
skin/classic/browser/webRTC-shareDevice-16.png (../shared/webrtc/webRTC-shareDevice-16.png)
skin/classic/browser/webRTC-shareDevice-16@2x.png (../shared/webrtc/webRTC-shareDevice-16@2x.png)
skin/classic/browser/webRTC-shareDevice-64.png (../shared/webrtc/webRTC-shareDevice-64.png)
skin/classic/browser/webRTC-shareDevice-64@2x.png (../shared/webrtc/webRTC-shareDevice-64@2x.png)
skin/classic/browser/webRTC-sharingDevice-16.png (../shared/webrtc/webRTC-sharingDevice-16.png)
skin/classic/browser/webRTC-sharingDevice-16@2x.png (../shared/webrtc/webRTC-sharingDevice-16@2x.png)
skin/classic/browser/webRTC-shareMicrophone-16.png (../shared/webrtc/webRTC-shareMicrophone-16.png)
skin/classic/browser/webRTC-shareMicrophone-16@2x.png (../shared/webrtc/webRTC-shareMicrophone-16@2x.png)
skin/classic/browser/webRTC-shareMicrophone-64.png (../shared/webrtc/webRTC-shareMicrophone-64.png)
skin/classic/browser/webRTC-shareMicrophone-64@2x.png (../shared/webrtc/webRTC-shareMicrophone-64@2x.png)
skin/classic/browser/webRTC-sharingMicrophone-16.png (../shared/webrtc/webRTC-sharingMicrophone-16.png)
skin/classic/browser/webRTC-sharingMicrophone-16@2x.png (../shared/webrtc/webRTC-sharingMicrophone-16@2x.png)
skin/classic/browser/webRTC-shareScreen-16.png (../shared/webrtc/webRTC-shareScreen-16.png)
skin/classic/browser/webRTC-shareScreen-16@2x.png (../shared/webrtc/webRTC-shareScreen-16@2x.png)
skin/classic/browser/webRTC-shareScreen-64.png (../shared/webrtc/webRTC-shareScreen-64.png)
skin/classic/browser/webRTC-shareScreen-64@2x.png (../shared/webrtc/webRTC-shareScreen-64@2x.png)
skin/classic/browser/webRTC-sharingScreen-16.png (../shared/webrtc/webRTC-sharingScreen-16.png)
skin/classic/browser/webRTC-sharingScreen-16@2x.png (../shared/webrtc/webRTC-sharingScreen-16@2x.png)
skin/classic/browser/webRTC-indicator.css (../shared/webrtc/indicator.css)
skin/classic/browser/webRTC-camera-white-16.png (../shared/webrtc/camera-white-16.png)
skin/classic/browser/webRTC-microphone-white-16.png (../shared/webrtc/microphone-white-16.png)
skin/classic/browser/webRTC-screen-white-16.png (../shared/webrtc/screen-white-16.png)
skin/classic/browser/loop/menuPanel.png (loop/menuPanel.png)
skin/classic/browser/loop/menuPanel@2x.png (loop/menuPanel@2x.png)
skin/classic/browser/loop/menuPanel-aero.png (loop/menuPanel-aero.png)
@ -254,12 +211,6 @@ browser.jar:
skin/classic/browser/newtab/close.png (../shared/newtab/close.png)
skin/classic/browser/newtab/controls.svg (../shared/newtab/controls.svg)
skin/classic/browser/newtab/whimsycorn.png (../shared/newtab/whimsycorn.png)
skin/classic/browser/panic-panel/header.png (../shared/panic-panel/header.png)
skin/classic/browser/panic-panel/header@2x.png (../shared/panic-panel/header@2x.png)
skin/classic/browser/panic-panel/header-small.png (../shared/panic-panel/header-small.png)
skin/classic/browser/panic-panel/header-small@2x.png (../shared/panic-panel/header-small@2x.png)
skin/classic/browser/panic-panel/icons.png (../shared/panic-panel/icons.png)
skin/classic/browser/panic-panel/icons@2x.png (../shared/panic-panel/icons@2x.png)
skin/classic/browser/places/autocomplete-star.png (places/autocomplete-star.png)
skin/classic/browser/places/autocomplete-star@2x.png (places/autocomplete-star@2x.png)
skin/classic/browser/places/autocomplete-star-XPVista7.png (places/autocomplete-star-XPVista7.png)
@ -328,13 +279,6 @@ browser.jar:
skin/classic/browser/preferences/checkbox-aero.png (preferences/checkbox-aero.png)
skin/classic/browser/preferences/checkbox-classic.png (preferences/checkbox-classic.png)
skin/classic/browser/preferences/checkbox-xp.png (preferences/checkbox-xp.png)
skin/classic/browser/privatebrowsing/attention.png (../shared/privatebrowsing/attention.png)
skin/classic/browser/privatebrowsing/attention@2x.png (../shared/privatebrowsing/attention@2x.png)
skin/classic/browser/privatebrowsing/check.png (../shared/privatebrowsing/check.png)
skin/classic/browser/privatebrowsing/check@2x.png (../shared/privatebrowsing/check@2x.png)
skin/classic/browser/privatebrowsing/mask.svg (../shared/privatebrowsing/mask.svg)
skin/classic/browser/privatebrowsing/shield-page.png (../shared/privatebrowsing/shield-page.png)
skin/classic/browser/privatebrowsing/shield-page@2x.png (../shared/privatebrowsing/shield-page@2x.png)
skin/classic/browser/social/services-16.png (social/services-16.png)
skin/classic/browser/social/services-64.png (social/services-64.png)
skin/classic/browser/social/chat-icons.svg (../shared/social/chat-icons.svg)
@ -400,193 +344,6 @@ browser.jar:
skin/classic/browser/translating-16@2x.png (../shared/translation/translating-16@2x.png)
skin/classic/browser/translation-16.png (../shared/translation/translation-16.png)
skin/classic/browser/translation-16@2x.png (../shared/translation/translation-16@2x.png)
skin/classic/browser/devedition/urlbar-history-dropmarker.svg (../shared/devedition/urlbar-history-dropmarker.svg)
skin/classic/browser/devedition/urlbar-arrow.png (../shared/devedition/urlbar-arrow.png)
skin/classic/browser/devedition/urlbar-arrow@2x.png (../shared/devedition/urlbar-arrow@2x.png)
* skin/classic/browser/devtools/common.css (../shared/devtools/common.css)
* skin/classic/browser/devtools/dark-theme.css (../shared/devtools/dark-theme.css)
* skin/classic/browser/devtools/light-theme.css (../shared/devtools/light-theme.css)
skin/classic/browser/devtools/add.svg (../shared/devtools/images/add.svg)
skin/classic/browser/devtools/filters.svg (../shared/devtools/filters.svg)
skin/classic/browser/devtools/filter-swatch.svg (../shared/devtools/images/filter-swatch.svg)
skin/classic/browser/devtools/pseudo-class.svg (../shared/devtools/images/pseudo-class.svg)
skin/classic/browser/devtools/controls.png (../shared/devtools/images/controls.png)
skin/classic/browser/devtools/controls@2x.png (../shared/devtools/images/controls@2x.png)
skin/classic/browser/devtools/animation-fast-track.svg (../shared/devtools/images/animation-fast-track.svg)
skin/classic/browser/devtools/performance-icons.svg (../shared/devtools/images/performance-icons.svg)
skin/classic/browser/devtools/newtab.png (../shared/devtools/images/newtab.png)
skin/classic/browser/devtools/newtab@2x.png (../shared/devtools/images/newtab@2x.png)
skin/classic/browser/devtools/newtab-inverted.png (../shared/devtools/images/newtab-inverted.png)
skin/classic/browser/devtools/newtab-inverted@2x.png (../shared/devtools/images/newtab-inverted@2x.png)
* skin/classic/browser/devtools/widgets.css (../shared/devtools/widgets.css)
skin/classic/browser/devtools/power.svg (../shared/devtools/images/power.svg)
skin/classic/browser/devtools/filetype-dir-close.svg (../shared/devtools/images/filetypes/dir-close.svg)
skin/classic/browser/devtools/filetype-dir-open.svg (../shared/devtools/images/filetypes/dir-open.svg)
skin/classic/browser/devtools/filetype-globe.svg (../shared/devtools/images/filetypes/globe.svg)
skin/classic/browser/devtools/filetype-store.svg (../shared/devtools/images/filetypes/store.svg)
skin/classic/browser/devtools/commandline-icon.png (../shared/devtools/images/commandline-icon.png)
skin/classic/browser/devtools/commandline-icon@2x.png (../shared/devtools/images/commandline-icon@2x.png)
skin/classic/browser/devtools/alerticon-warning.png (../shared/devtools/images/alerticon-warning.png)
skin/classic/browser/devtools/alerticon-warning@2x.png (../shared/devtools/images/alerticon-warning@2x.png)
* skin/classic/browser/devtools/ruleview.css (../shared/devtools/ruleview.css)
skin/classic/browser/devtools/commandline.css (../shared/devtools/commandline.css)
skin/classic/browser/devtools/command-paintflashing.png (../shared/devtools/images/command-paintflashing.png)
skin/classic/browser/devtools/command-paintflashing@2x.png (../shared/devtools/images/command-paintflashing@2x.png)
skin/classic/browser/devtools/command-screenshot.png (../shared/devtools/images/command-screenshot.png)
skin/classic/browser/devtools/command-screenshot@2x.png (../shared/devtools/images/command-screenshot@2x.png)
skin/classic/browser/devtools/command-responsivemode.png (../shared/devtools/images/command-responsivemode.png)
skin/classic/browser/devtools/command-responsivemode@2x.png (../shared/devtools/images/command-responsivemode@2x.png)
skin/classic/browser/devtools/command-scratchpad.png (../shared/devtools/images/command-scratchpad.png)
skin/classic/browser/devtools/command-scratchpad@2x.png (../shared/devtools/images/command-scratchpad@2x.png)
skin/classic/browser/devtools/command-tilt.png (../shared/devtools/images/command-tilt.png)
skin/classic/browser/devtools/command-tilt@2x.png (../shared/devtools/images/command-tilt@2x.png)
skin/classic/browser/devtools/command-pick.png (../shared/devtools/images/command-pick.png)
skin/classic/browser/devtools/command-pick@2x.png (../shared/devtools/images/command-pick@2x.png)
skin/classic/browser/devtools/command-frames.png (../shared/devtools/images/command-frames.png)
skin/classic/browser/devtools/command-frames@2x.png (../shared/devtools/images/command-frames@2x.png)
skin/classic/browser/devtools/command-console.png (../shared/devtools/images/command-console.png)
skin/classic/browser/devtools/command-console@2x.png (../shared/devtools/images/command-console@2x.png)
skin/classic/browser/devtools/command-eyedropper.png (../shared/devtools/images/command-eyedropper.png)
skin/classic/browser/devtools/command-eyedropper@2x.png (../shared/devtools/images/command-eyedropper@2x.png)
skin/classic/browser/devtools/command-rulers.png (../shared/devtools/images/command-rulers.png)
skin/classic/browser/devtools/command-rulers@2x.png (../shared/devtools/images/command-rulers@2x.png)
skin/classic/browser/devtools/markup-view.css (../shared/devtools/markup-view.css)
skin/classic/browser/devtools/editor-error.png (../shared/devtools/images/editor-error.png)
skin/classic/browser/devtools/editor-breakpoint.png (../shared/devtools/images/editor-breakpoint.png)
skin/classic/browser/devtools/editor-breakpoint@2x.png (../shared/devtools/images/editor-breakpoint@2x.png)
skin/classic/browser/devtools/editor-debug-location.png (../shared/devtools/images/editor-debug-location.png)
skin/classic/browser/devtools/editor-debug-location@2x.png (../shared/devtools/images/editor-debug-location@2x.png)
* skin/classic/browser/devtools/webconsole.css (../shared/devtools/webconsole.css)
skin/classic/browser/devtools/webconsole.svg (../shared/devtools/images/webconsole.svg)
skin/classic/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
skin/classic/browser/devtools/animationinspector.css (../shared/devtools/animationinspector.css)
skin/classic/browser/devtools/eyedropper.css (../shared/devtools/eyedropper.css)
* skin/classic/browser/devtools/canvasdebugger.css (../shared/devtools/canvasdebugger.css)
skin/classic/browser/devtools/debugger.css (../shared/devtools/debugger.css)
* skin/classic/browser/devtools/netmonitor.css (../shared/devtools/netmonitor.css)
skin/classic/browser/devtools/performance.css (../shared/devtools/performance.css)
skin/classic/browser/devtools/memory.css (../shared/devtools/memory.css)
skin/classic/browser/devtools/promisedebugger.css (../shared/devtools/promisedebugger.css)
skin/classic/browser/devtools/timeline-filter.svg (../shared/devtools/images/timeline-filter.svg)
* skin/classic/browser/devtools/scratchpad.css (../shared/devtools/scratchpad.css)
skin/classic/browser/devtools/shadereditor.css (../shared/devtools/shadereditor.css)
skin/classic/browser/devtools/storage.css (../shared/devtools/storage.css)
* skin/classic/browser/devtools/splitview.css (../shared/devtools/splitview.css)
skin/classic/browser/devtools/styleeditor.css (../shared/devtools/styleeditor.css)
skin/classic/browser/devtools/webaudioeditor.css (../shared/devtools/webaudioeditor.css)
skin/classic/browser/devtools/magnifying-glass.png (../shared/devtools/images/magnifying-glass.png)
skin/classic/browser/devtools/magnifying-glass@2x.png (../shared/devtools/images/magnifying-glass@2x.png)
skin/classic/browser/devtools/magnifying-glass-light.png (../shared/devtools/images/magnifying-glass-light.png)
skin/classic/browser/devtools/magnifying-glass-light@2x.png (../shared/devtools/images/magnifying-glass-light@2x.png)
skin/classic/browser/devtools/itemToggle.png (../shared/devtools/images/itemToggle.png)
skin/classic/browser/devtools/itemToggle@2x.png (../shared/devtools/images/itemToggle@2x.png)
skin/classic/browser/devtools/itemArrow-dark-rtl.svg (../shared/devtools/images/itemArrow-dark-rtl.svg)
skin/classic/browser/devtools/itemArrow-dark-ltr.svg (../shared/devtools/images/itemArrow-dark-ltr.svg)
skin/classic/browser/devtools/itemArrow-rtl.svg (../shared/devtools/images/itemArrow-rtl.svg)
skin/classic/browser/devtools/itemArrow-ltr.svg (../shared/devtools/images/itemArrow-ltr.svg)
skin/classic/browser/devtools/noise.png (../shared/devtools/images/noise.png)
skin/classic/browser/devtools/dropmarker.svg (../shared/devtools/images/dropmarker.svg)
skin/classic/browser/devtools/layoutview.css (../shared/devtools/layoutview.css)
skin/classic/browser/devtools/debugger-collapse.png (../shared/devtools/images/debugger-collapse.png)
skin/classic/browser/devtools/debugger-collapse@2x.png (../shared/devtools/images/debugger-collapse@2x.png)
skin/classic/browser/devtools/debugger-expand.png (../shared/devtools/images/debugger-expand.png)
skin/classic/browser/devtools/debugger-expand@2x.png (../shared/devtools/images/debugger-expand@2x.png)
skin/classic/browser/devtools/debugger-pause.png (../shared/devtools/images/debugger-pause.png)
skin/classic/browser/devtools/debugger-pause@2x.png (../shared/devtools/images/debugger-pause@2x.png)
skin/classic/browser/devtools/debugger-play.png (../shared/devtools/images/debugger-play.png)
skin/classic/browser/devtools/debugger-play@2x.png (../shared/devtools/images/debugger-play@2x.png)
skin/classic/browser/devtools/fast-forward.png (../shared/devtools/images/fast-forward.png)
skin/classic/browser/devtools/fast-forward@2x.png (../shared/devtools/images/fast-forward@2x.png)
skin/classic/browser/devtools/rewind.png (../shared/devtools/images/rewind.png)
skin/classic/browser/devtools/rewind@2x.png (../shared/devtools/images/rewind@2x.png)
skin/classic/browser/devtools/debugger-step-in.png (../shared/devtools/images/debugger-step-in.png)
skin/classic/browser/devtools/debugger-step-in@2x.png (../shared/devtools/images/debugger-step-in@2x.png)
skin/classic/browser/devtools/debugger-step-out.png (../shared/devtools/images/debugger-step-out.png)
skin/classic/browser/devtools/debugger-step-out@2x.png (../shared/devtools/images/debugger-step-out@2x.png)
skin/classic/browser/devtools/debugger-step-over.png (../shared/devtools/images/debugger-step-over.png)
skin/classic/browser/devtools/debugger-step-over@2x.png (../shared/devtools/images/debugger-step-over@2x.png)
skin/classic/browser/devtools/debugger-blackbox.png (../shared/devtools/images/debugger-blackbox.png)
skin/classic/browser/devtools/debugger-blackbox@2x.png (../shared/devtools/images/debugger-blackbox@2x.png)
skin/classic/browser/devtools/debugger-prettyprint.png (../shared/devtools/images/debugger-prettyprint.png)
skin/classic/browser/devtools/debugger-prettyprint@2x.png (../shared/devtools/images/debugger-prettyprint@2x.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
skin/classic/browser/devtools/tracer-icon.png (../shared/devtools/images/tracer-icon.png)
skin/classic/browser/devtools/tracer-icon@2x.png (../shared/devtools/images/tracer-icon@2x.png)
skin/classic/browser/devtools/responsive-se-resizer.png (../shared/devtools/images/responsivemode/responsive-se-resizer.png)
skin/classic/browser/devtools/responsive-se-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-se-resizer@2x.png)
skin/classic/browser/devtools/responsive-vertical-resizer.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer.png)
skin/classic/browser/devtools/responsive-vertical-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer@2x.png)
skin/classic/browser/devtools/responsive-horizontal-resizer.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer.png)
skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer@2x.png)
skin/classic/browser/devtools/responsiveui-rotate.png (../shared/devtools/images/responsivemode/responsiveui-rotate.png)
skin/classic/browser/devtools/responsiveui-rotate@2x.png (../shared/devtools/images/responsivemode/responsiveui-rotate@2x.png)
skin/classic/browser/devtools/responsiveui-touch.png (../shared/devtools/images/responsivemode/responsiveui-touch.png)
skin/classic/browser/devtools/responsiveui-touch@2x.png (../shared/devtools/images/responsivemode/responsiveui-touch@2x.png)
skin/classic/browser/devtools/responsiveui-screenshot.png (../shared/devtools/images/responsivemode/responsiveui-screenshot.png)
skin/classic/browser/devtools/responsiveui-screenshot@2x.png (../shared/devtools/images/responsivemode/responsiveui-screenshot@2x.png)
skin/classic/browser/devtools/toggle-tools.png (../shared/devtools/images/toggle-tools.png)
skin/classic/browser/devtools/toggle-tools@2x.png (../shared/devtools/images/toggle-tools@2x.png)
skin/classic/browser/devtools/dock-bottom@2x.png (../shared/devtools/images/dock-bottom@2x.png)
skin/classic/browser/devtools/dock-bottom-minimize@2x.png (../shared/devtools/images/dock-bottom-minimize@2x.png)
skin/classic/browser/devtools/dock-bottom-maximize@2x.png (../shared/devtools/images/dock-bottom-maximize@2x.png)
skin/classic/browser/devtools/dock-side@2x.png (../shared/devtools/images/dock-side@2x.png)
* skin/classic/browser/devtools/floating-scrollbars.css (../shared/devtools/floating-scrollbars.css)
skin/classic/browser/devtools/floating-scrollbars-light.css (../shared/devtools/floating-scrollbars-light.css)
* skin/classic/browser/devtools/inspector.css (../shared/devtools/inspector.css)
skin/classic/browser/devtools/profiler-stopwatch.svg (../shared/devtools/images/profiler-stopwatch.svg)
skin/classic/browser/devtools/profiler-stopwatch-checked.svg (../shared/devtools/images/profiler-stopwatch-checked.svg)
skin/classic/browser/devtools/tool-options.svg (../shared/devtools/images/tool-options.svg)
skin/classic/browser/devtools/tool-webconsole.svg (../shared/devtools/images/tool-webconsole.svg)
skin/classic/browser/devtools/tool-debugger.svg (../shared/devtools/images/tool-debugger.svg)
skin/classic/browser/devtools/tool-debugger-paused.svg (../shared/devtools/images/tool-debugger-paused.svg)
skin/classic/browser/devtools/tool-inspector.svg (../shared/devtools/images/tool-inspector.svg)
skin/classic/browser/devtools/tool-shadereditor.svg (../shared/devtools/images/tool-shadereditor.svg)
skin/classic/browser/devtools/tool-styleeditor.svg (../shared/devtools/images/tool-styleeditor.svg)
skin/classic/browser/devtools/tool-storage.svg (../shared/devtools/images/tool-storage.svg)
skin/classic/browser/devtools/tool-profiler.svg (../shared/devtools/images/tool-profiler.svg)
skin/classic/browser/devtools/tool-profiler-active.svg (../shared/devtools/images/tool-profiler-active.svg)
skin/classic/browser/devtools/tool-network.svg (../shared/devtools/images/tool-network.svg)
skin/classic/browser/devtools/tool-scratchpad.svg (../shared/devtools/images/tool-scratchpad.svg)
skin/classic/browser/devtools/tool-webaudio.svg (../shared/devtools/images/tool-webaudio.svg)
skin/classic/browser/devtools/close.png (../shared/devtools/images/close.png)
skin/classic/browser/devtools/close@2x.png (../shared/devtools/images/close@2x.png)
skin/classic/browser/devtools/vview-delete.png (../shared/devtools/images/vview-delete.png)
skin/classic/browser/devtools/vview-delete@2x.png (../shared/devtools/images/vview-delete@2x.png)
skin/classic/browser/devtools/vview-edit.png (../shared/devtools/images/vview-edit.png)
skin/classic/browser/devtools/vview-edit@2x.png (../shared/devtools/images/vview-edit@2x.png)
skin/classic/browser/devtools/vview-lock.png (../shared/devtools/images/vview-lock.png)
skin/classic/browser/devtools/vview-lock@2x.png (../shared/devtools/images/vview-lock@2x.png)
skin/classic/browser/devtools/vview-open-inspector.png (../shared/devtools/images/vview-open-inspector.png)
skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png)
skin/classic/browser/devtools/cubic-bezier-swatch.png (../shared/devtools/images/cubic-bezier-swatch.png)
skin/classic/browser/devtools/cubic-bezier-swatch@2x.png (../shared/devtools/images/cubic-bezier-swatch@2x.png)
skin/classic/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png)
skin/classic/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css)
skin/classic/browser/devtools/computedview.css (../shared/devtools/computedview.css)
skin/classic/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png)
skin/classic/browser/devtools/arrow-e@2x.png (../shared/devtools/images/arrow-e@2x.png)
skin/classic/browser/devtools/responsiveui-home.png (../shared/devtools/responsiveui-home.png)
skin/classic/browser/devtools/projecteditor/projecteditor.css (../shared/devtools/projecteditor/projecteditor.css)
skin/classic/browser/devtools/app-manager/connection-footer.css (../shared/devtools/app-manager/connection-footer.css)
skin/classic/browser/devtools/app-manager/index.css (../shared/devtools/app-manager/index.css)
skin/classic/browser/devtools/app-manager/device.css (../shared/devtools/app-manager/device.css)
skin/classic/browser/devtools/app-manager/projects.css (../shared/devtools/app-manager/projects.css)
skin/classic/browser/devtools/app-manager/help.css (../shared/devtools/app-manager/help.css)
skin/classic/browser/devtools/app-manager/warning.svg (../shared/devtools/app-manager/images/warning.svg)
skin/classic/browser/devtools/app-manager/error.svg (../shared/devtools/app-manager/images/error.svg)
skin/classic/browser/devtools/app-manager/plus.svg (../shared/devtools/app-manager/images/plus.svg)
skin/classic/browser/devtools/app-manager/remove.svg (../shared/devtools/app-manager/images/remove.svg)
skin/classic/browser/devtools/app-manager/add.svg (../shared/devtools/app-manager/images/add.svg)
skin/classic/browser/devtools/app-manager/index-icons.svg (../shared/devtools/app-manager/images/index-icons.svg)
skin/classic/browser/devtools/app-manager/rocket.svg (../shared/devtools/app-manager/images/rocket.svg)
skin/classic/browser/devtools/app-manager/noise.png (../shared/devtools/app-manager/images/noise.png)
skin/classic/browser/devtools/app-manager/default-app-icon.png (../shared/devtools/app-manager/images/default-app-icon.png)
skin/classic/browser/devtools/search-clear-failed.svg (../shared/devtools/images/search-clear-failed.svg)
skin/classic/browser/devtools/search-clear-light.svg (../shared/devtools/images/search-clear-light.svg)
skin/classic/browser/devtools/search-clear-dark.svg (../shared/devtools/images/search-clear-dark.svg)
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/sync-16.png
skin/classic/browser/sync-32.png
@ -615,14 +372,6 @@ browser.jar:
skin/classic/browser/syncProgress-toolbar-XPVista7.png
skin/classic/browser/syncProgress-toolbar-XPVista7@2x.png
#endif
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png (../shared/devtools/tooltip/arrow-horizontal-dark.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark.png (../shared/devtools/tooltip/arrow-vertical-dark.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png (../shared/devtools/tooltip/arrow-horizontal-light.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light.png (../shared/devtools/tooltip/arrow-vertical-light.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
#ifdef E10S_TESTING_ONLY
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
#endif

7
build/docs/jar-manifests.rst
View File

@ -31,6 +31,13 @@ To ship chrome files in a JAR, an indented line indicates a file to be packaged:
<jarfile>.jar:
path/in/jar/file_name.xul (source/tree/location/file_name.xul)
If the JAR manifest and packaged file live in the same directory, the path and
parenthesis can be omitted. In other words, the following two lines are
equivalent::
path/in/jar/same_place.xhtml (same_place.xhtml)
path/in/jar/same_place.xhtml
The source tree location may also be an *absolute* path (taken from the
top of the source tree::

19
docshell/base/nsDocShell.cpp
View File

@ -3366,6 +3366,25 @@ nsDocShell::GetSameTypeRootTreeItem(nsIDocShellTreeItem** aRootTreeItem)
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetSameTypeRootTreeItemIgnoreBrowserAndAppBoundaries(nsIDocShell ** aRootTreeItem)
{
NS_ENSURE_ARG_POINTER(aRootTreeItem);
*aRootTreeItem = static_cast<nsIDocShell *>(this);
nsCOMPtr<nsIDocShell> parent;
NS_ENSURE_SUCCESS(GetSameTypeParentIgnoreBrowserAndAppBoundaries(getter_AddRefs(parent)),
NS_ERROR_FAILURE);
while (parent) {
*aRootTreeItem = parent;
NS_ENSURE_SUCCESS((*aRootTreeItem)->
GetSameTypeParentIgnoreBrowserAndAppBoundaries(getter_AddRefs(parent)),
NS_ERROR_FAILURE);
}
NS_ADDREF(*aRootTreeItem);
return NS_OK;
}
/* static */
bool
nsDocShell::CanAccessItem(nsIDocShellTreeItem* aTargetItem,

44
docshell/base/nsIDocShell.idl
View File

@ -43,10 +43,10 @@ interface nsIPrivacyTransitionObserver;
interface nsIReflowObserver;
interface nsIScrollObserver;
interface nsITabParent;
typedef unsigned long nsLoadFlags;
[scriptable, builtinclass, uuid(35a26f70-dbb9-450d-b634-cd0bbb9b8e13)]
[scriptable, builtinclass, uuid(e534b6ee-c35d-4ee2-acce-1bcd08a91230)]
interface nsIDocShell : nsIDocShellTreeItem
{
/**
@ -57,7 +57,7 @@ interface nsIDocShell : nsIDocShellTreeItem
*
* @param uri - The URI to load.
* @param loadInfo - This is the extended load info for this load. This
* most often will be null, but if you need to do
* most often will be null, but if you need to do
* additional setup for this load you can get a loadInfo
* object by calling createLoadInfo. Once you have this
* object you can set the needed properties on it and
@ -86,10 +86,10 @@ interface nsIDocShell : nsIDocShellTreeItem
* @param aContentType - The type (MIME) of data being loaded (empty if unknown).
* @param aContentCharset - The charset of the data being loaded (empty if unknown).
* @param aLoadInfo - This is the extended load info for this load. This
* most often will be null, but if you need to do
* most often will be null, but if you need to do
* additional setup for this load you can get a
* loadInfo object by calling createLoadInfo. Once
* you have this object you can set the needed
* you have this object you can set the needed
* properties on it and then pass it to loadStream.
*/
[noscript]void loadStream(in nsIInputStream aStream,
@ -125,7 +125,7 @@ interface nsIDocShell : nsIDocShellTreeItem
* @param aURI - The URI to load.
* @param aReferrer - Referring URI
* @param aReferrerPolicy - Referrer policy
* @param aOwner - Owner (security principal)
* @param aOwner - Owner (security principal)
* @param aInheritOwner - Flag indicating whether the owner of the current
* document should be inherited if aOwner is null.
* @param aStopActiveDoc - Flag indicating whether loading the current
@ -191,7 +191,7 @@ interface nsIDocShell : nsIDocShellTreeItem
* For editors and suchlike who wish to change the URI associated with the
* document. Note if you want to get the current URI, use the read-only
* property on nsIWebNavigation.
*/
*/
void setCurrentURI(in nsIURI aURI);
/**
@ -324,7 +324,7 @@ interface nsIDocShell : nsIDocShellTreeItem
* not supporting zoom. Implementations not supporting zoom should return
* 1.0 all the time for the Get operation. 1.0 by the way is the default
* of zoom. This means 100% of normal scaling or in other words normal size
* no zoom.
* no zoom.
*/
attribute float zoom;
@ -363,7 +363,7 @@ interface nsIDocShell : nsIDocShellTreeItem
const unsigned long BUSY_FLAGS_PAGE_LOADING = 4;
/**
* Load commands for the document
* Load commands for the document
*/
const unsigned long LOAD_CMD_NORMAL = 0x1; // Normal load
const unsigned long LOAD_CMD_RELOAD = 0x2; // Reload
@ -372,7 +372,7 @@ interface nsIDocShell : nsIDocShellTreeItem
readonly attribute unsigned long busyFlags;
/*
/*
* attribute to access the loadtype for the document
*/
attribute unsigned long loadType;
@ -509,7 +509,7 @@ interface nsIDocShell : nsIDocShellTreeItem
void addSessionStorage(in nsIPrincipal principal, in nsIDOMStorage storage);
/**
* Gets the channel for the currently loaded document, if any.
* Gets the channel for the currently loaded document, if any.
* For a new document load, this will be the channel of the previous document
* until after OnLocationChange fires.
*/
@ -597,7 +597,7 @@ interface nsIDocShell : nsIDocShellTreeItem
* is actively being rendered to the screen (ex. painted on a canvas)
* and should be treated accordingly.
**/
attribute boolean isOffScreenBrowser;
attribute boolean isOffScreenBrowser;
/**
* If the current content viewer isn't initialized for print preview,
@ -841,6 +841,12 @@ interface nsIDocShell : nsIDocShellTreeItem
*/
nsIDocShell getSameTypeParentIgnoreBrowserAndAppBoundaries();
/**
* Like nsIDocShellTreeItem::GetSameTypeRootTreeItem, except this ignores
* <iframe mozbrowser> and <iframe mozapp> boundaries.
*/
nsIDocShell getSameTypeRootTreeItemIgnoreBrowserAndAppBoundaries();
/**
* True iff asynchronous panning and zooming is enabled for this
* docshell.
@ -896,9 +902,9 @@ interface nsIDocShell : nsIDocShellTreeItem
/**
* Checks whether the channel associated with the root docShell is equal to
* mMixedContentChannel. If they are the same, allowMixedContent is set to true.
* Checks if the root document has a secure connection. If it is, sets
* rootHasSecureConnection to true. If the docShell is the root doc shell,
* isRootDocShell is set to true.
* Checks if the root document has a secure connection. If it is, sets
* rootHasSecureConnection to true. If the docShell is the root doc shell,
* isRootDocShell is set to true.
*/
void GetAllowMixedContentAndConnectionData(out boolean rootHasSecureConnection, out boolean allowMixedContent, out boolean isRootDocShell);
@ -910,7 +916,7 @@ interface nsIDocShell : nsIDocShellTreeItem
* not be allowed.
*/
[noscript, notxpcom] bool pluginsAllowedInCurrentDoc();
/**
* Attribute that determines whether fullscreen is allowed to be entered for
@ -923,7 +929,7 @@ interface nsIDocShell : nsIDocShellTreeItem
* exception.
*/
[infallible] readonly attribute boolean fullscreenAllowed;
void setFullscreenAllowed(in boolean allowed);
[notxpcom] uint32_t orientationLock();
@ -940,14 +946,14 @@ interface nsIDocShell : nsIDocShellTreeItem
attribute nsIEditor editor;
readonly attribute boolean editable; /* this docShell is editable */
readonly attribute boolean hasEditingSession; /* this docShell has an editing session */
/**
* Make this docShell editable, setting a flag that causes
* an editor to get created, either immediately, or after
* a url has been loaded.
* @param inWaitForUriLoad true to wait for a URI before
* creating the editor.
*/
*/
void makeEditable(in boolean inWaitForUriLoad);
/**

11
mobile/android/base/Tab.java
View File

@ -424,6 +424,11 @@ public class Tab {
}
public void loadFavicon() {
// Static Favicons never change
if (AboutPages.isBuiltinIconPage(mUrl) && mFavicon != null) {
return;
}
// If we have a Favicon explicitly set, load it.
if (!mAvailableFavicons.isEmpty()) {
RemoteFavicon newFavicon = mAvailableFavicons.first();
@ -667,6 +672,12 @@ public class Tab {
// spurious location change, so we're definitely loading a new
// page.
clearFavicon();
// Load local static Favicons immediately
if (AboutPages.isBuiltinIconPage(uri)) {
loadFavicon();
}
updateTitle(null);
}
}

4
mobile/android/base/Tabs.java
View File

@ -924,10 +924,8 @@ public class Tabs implements GeckoEventListener {
selectTab(tabToSelect.getId());
}
// TODO: surely we could just fetch *any* cached icon?
// Load favicon instantly for about:home page because it's already cached
if (AboutPages.isBuiltinIconPage(url)) {
Log.d(LOGTAG, "Setting about: tab favicon inline.");
tabToSelect.addFavicon(url, Favicons.browserToolbarFaviconSize, "");
tabToSelect.loadFavicon();
}

83
mobile/android/base/home/SearchEngineRow.java
View File

@ -14,6 +14,7 @@ import org.mozilla.gecko.home.BrowserSearch.OnEditSuggestionListener;
import org.mozilla.gecko.home.BrowserSearch.OnSearchListener;
import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
import org.mozilla.gecko.util.StringUtils;
import org.mozilla.gecko.util.HardwareUtils;
import org.mozilla.gecko.widget.AnimatedHeightLayout;
import org.mozilla.gecko.widget.FaviconView;
import org.mozilla.gecko.widget.FlowLayout;
@ -64,6 +65,10 @@ class SearchEngineRow extends AnimatedHeightLayout {
// Selected suggestion view
private int mSelectedView;
// Maximums for suggestions based on form factor
private static final int TABLET_MAX = 4;
private static final int PHONE_MAX = 2;
public SearchEngineRow(Context context) {
this(context, null);
}
@ -93,8 +98,7 @@ class SearchEngineRow extends AnimatedHeightLayout {
if (v == mUserEnteredView) {
Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.SUGGESTION, "user");
} else {
final String extras = "engine." + (String) v.getTag();
Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.SUGGESTION, extras);
Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.SUGGESTION, (String) v.getTag());
}
mSearchListener.onSearch(mSearchEngine, suggestion);
}
@ -139,7 +143,7 @@ class SearchEngineRow extends AnimatedHeightLayout {
private void setSuggestionOnView(View v, String suggestion, boolean isUserSavedSearch) {
final ImageView historyIcon = (ImageView) v.findViewById(R.id.suggestion_item_icon);
historyIcon.setVisibility(isUserSavedSearch ? View.VISIBLE: View.GONE);
historyIcon.setVisibility(isUserSavedSearch ? View.VISIBLE : View.GONE);
final TextView suggestionText = (TextView) v.findViewById(R.id.suggestion_text);
suggestionText.setText(suggestion);
@ -179,7 +183,7 @@ class SearchEngineRow extends AnimatedHeightLayout {
mEditSuggestionListener = listener;
}
private void bindSuggestionView(String suggestion, boolean animate, int recycledSuggestionCount, Integer previousSuggestionChildIndex, boolean isUserSavedSearch){
private void bindSuggestionView(String suggestion, boolean animate, int recycledSuggestionCount, Integer previousSuggestionChildIndex, boolean isUserSavedSearch, String telemetryTag){
final View suggestionItem;
// Reuse suggestion views from recycled view, if possible.
@ -192,8 +196,7 @@ class SearchEngineRow extends AnimatedHeightLayout {
suggestionItem.setOnClickListener(mClickListener);
suggestionItem.setOnLongClickListener(mLongClickListener);
// Store the position of the suggestion for telemetry.
suggestionItem.setTag(String.valueOf(previousSuggestionChildIndex));
suggestionItem.setTag(telemetryTag);
mSuggestionView.addView(suggestionItem);
}
@ -215,25 +218,20 @@ class SearchEngineRow extends AnimatedHeightLayout {
}
}
private void updateFromSavedSearches(String searchTerm, boolean animate, int suggestionCounter, int recycledSuggestionCount) {
final ContentResolver cr = getContext().getContentResolver();
String[] columns = new String[] { SearchHistory.QUERY };
String actualQuery = SearchHistory.QUERY + " LIKE ?";
String[] queryArgs = new String[] { '%' + searchTerm + '%' };
String sortOrderAndLimit = SearchHistory.DATE + " DESC LIMIT 4";
final Cursor c = cr.query(SearchHistory.CONTENT_URI, columns, actualQuery, queryArgs, sortOrderAndLimit);
private void updateFromSavedSearches(Cursor c, boolean animate, int suggestionCounter, int recycledSuggestionCount) {
if (c == null) {
return;
}
try {
if (c.moveToFirst()) {
final int searchColumn = c.getColumnIndexOrThrow(SearchHistory.QUERY);
final int historyStartIndex = suggestionCounter;
do {
final String savedSearch = c.getString(searchColumn);
bindSuggestionView(savedSearch, animate, recycledSuggestionCount, suggestionCounter, true);
// suggestionCounter counts all suggestions (from history and the search engine)
// but we want the relative position of the history item in telemetry
String telemetryTag = "history." + (suggestionCounter - historyStartIndex);
bindSuggestionView(savedSearch, animate, recycledSuggestionCount, suggestionCounter, true, telemetryTag);
++suggestionCounter;
} while (c.moveToNext());
}
@ -243,11 +241,40 @@ class SearchEngineRow extends AnimatedHeightLayout {
hideRecycledSuggestions(suggestionCounter, recycledSuggestionCount);
}
private int updateFromSearchEngine(boolean animate, int recycledSuggestionCount) {
private Cursor getSavedSearches(String searchTerm, boolean isTablet) {
if (!AppConstants.NIGHTLY_BUILD) {
return null;
}
final ContentResolver cr = getContext().getContentResolver();
String[] columns = new String[] { SearchHistory.QUERY };
String actualQuery = SearchHistory.QUERY + " LIKE ?";
String[] queryArgs = new String[] { '%' + searchTerm + '%' };
final int limit = isTablet ? TABLET_MAX : PHONE_MAX;
String sortOrderAndLimit = SearchHistory.DATE +" DESC LIMIT "+limit;
return cr.query(SearchHistory.CONTENT_URI, columns, actualQuery, queryArgs, sortOrderAndLimit);
}
private int updateFromSearchEngine(boolean animate, int recycledSuggestionCount, boolean isTablet, int savedCount) {
// Remove this default limit value in Bug 1201325
int limit = TABLET_MAX;
if (AppConstants.NIGHTLY_BUILD) {
limit = isTablet ? TABLET_MAX : PHONE_MAX;
// If there are less than max saved searches on phones, fill the space with more search engine suggestions
if (!isTablet && savedCount < PHONE_MAX) {
limit += PHONE_MAX - savedCount;
}
}
int suggestionCounter = 0;
// Apply Search Engine's suggestions
for (String suggestion : mSearchEngine.getSuggestions()) {
bindSuggestionView(suggestion, animate, recycledSuggestionCount, suggestionCounter, false);
if (suggestionCounter == limit) {
break;
}
// Since the search engine suggestions are listed first, we can use suggestionCounter to get their relative positions for telemetry
String telemetryTag = "engine." + suggestionCounter;
bindSuggestionView(suggestion, animate, recycledSuggestionCount, suggestionCounter, false, telemetryTag);
++suggestionCounter;
}
@ -271,9 +298,21 @@ class SearchEngineRow extends AnimatedHeightLayout {
// This can be called before the opt-in permission prompt is shown or set. Check first.
if (suggestionsEnabled) {
final int recycledSuggestionCount = mSuggestionView.getChildCount();
final int suggestionViewCount = updateFromSearchEngine(animate, recycledSuggestionCount);
if (AppConstants.NIGHTLY_BUILD) {
updateFromSavedSearches(searchTerm, animate, suggestionViewCount, recycledSuggestionCount);
final boolean isTablet = HardwareUtils.isTablet();
final Cursor c = getSavedSearches(searchTerm, isTablet);
try {
final int savedSearchCount = (c != null) ? c.getCount(): 0;
final int suggestionViewCount = updateFromSearchEngine(animate, recycledSuggestionCount, isTablet, savedSearchCount);
updateFromSavedSearches(c, animate, suggestionViewCount, recycledSuggestionCount);
} finally {
if (c != null) {
c.close();
}
}
} else {
updateFromSearchEngine(animate, recycledSuggestionCount, true, 0);
}
}
}

22
toolkit/components/extensions/jar.mn
View File

@ -4,14 +4,14 @@
toolkit.jar:
% content extensions %content/extensions/
content/extensions/ext-alarms.js (ext-alarms.js)
content/extensions/ext-backgroundPage.js (ext-backgroundPage.js)
content/extensions/ext-notifications.js (ext-notifications.js)
content/extensions/ext-i18n.js (ext-i18n.js)
content/extensions/ext-idle.js (ext-idle.js)
content/extensions/ext-webRequest.js (ext-webRequest.js)
content/extensions/ext-webNavigation.js (ext-webNavigation.js)
content/extensions/ext-runtime.js (ext-runtime.js)
content/extensions/ext-extension.js (ext-extension.js)
content/extensions/ext-storage.js (ext-storage.js)
content/extensions/ext-test.js (ext-test.js)
content/extensions/ext-alarms.js
content/extensions/ext-backgroundPage.js
content/extensions/ext-notifications.js
content/extensions/ext-i18n.js
content/extensions/ext-idle.js
content/extensions/ext-webRequest.js
content/extensions/ext-webNavigation.js
content/extensions/ext-runtime.js
content/extensions/ext-extension.js
content/extensions/ext-storage.js
content/extensions/ext-test.js

Some files were not shown because too many files have changed in this diff Show More