mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge m-c to mozilla-inbound

This commit is contained in:
Carsten "Tomcat" Book 2013-09-29 11:40:41 +02:00
Родитель a1e8e82753 985c05b97b
Коммит 257cdc4810
23 изменённых файлов: 112 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
b2g/config/gaia.json
Просмотреть файл

@ -1,4 +1,4 @@
{
"revision": "e836e146aa9bdc2b4141dfa86662eed46d735fb2",
"revision": "a313d5e13d4f91edc28229ad850cb579f50cb2f2",
"repo_path": "/integration/gaia-central"
}

6
browser/app/blocklist.xml
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1379696114000">
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1380130116000">
<emItems>
<emItem blockID="i454" id="sqlmoz@facebook.com">
<versionRange minVersion="0" maxVersion="*" severity="3">
@ -738,6 +738,10 @@
<versionRange minVersion="0" maxVersion="*" severity="3">
</versionRange>
</emItem>
<emItem blockID="i455" id="7d51fb17-b199-4d8f-894e-decaff4fc36a@a298838b-7f50-4c7c-9277-df6abbd42a0c.com">
<versionRange minVersion="0" maxVersion="*" severity="3">
</versionRange>
</emItem>
<emItem blockID="i21" id="support@update-firefox.com">
</emItem>
<emItem blockID="i322" id="jid0-Y6TVIzs0r7r4xkOogmJPNAGFGBw@jetpack">

4
browser/base/content/abouthome/aboutHome.css
Просмотреть файл

@ -7,7 +7,7 @@
html {
font: message-box;
font-size: 100%;
background-color: hsl(0,0%,90%);
background-color: hsl(0,0%,95%);
color: #000;
height: 100%;
}
@ -18,8 +18,6 @@ body {
-moz-box-orient: vertical;
width: 100%;
height: 100%;
background-image: url(chrome://browser/content/abouthome/noise.png),
linear-gradient(hsla(0,0%,100%,.7), hsla(0,0%,100%,.4));
}
input,

Двоичные данные
browser/base/content/abouthome/noise.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 3.9 KiB

21
browser/base/content/tabbrowser.xml
Просмотреть файл

@ -1529,7 +1529,7 @@
notificationbox.appendChild(browserSidebarContainer);
var position = this.tabs.length - 1;
var uniqueId = "panel" + Date.now() + position;
var uniqueId = this._generateUniquePanelID();
notificationbox.id = uniqueId;
t.linkedPanel = uniqueId;
t.linkedBrowser = b;
@ -2955,7 +2955,7 @@
document.addEventListener("keypress", this, false);
window.addEventListener("sizemodechange", this, false);
var uniqueId = "panel" + Date.now();
var uniqueId = this._generateUniquePanelID();
this.mPanelContainer.childNodes[0].id = uniqueId;
this.mCurrentTab.linkedPanel = uniqueId;
this.mCurrentTab._tPos = 0;
@ -3002,6 +3002,23 @@
]]>
</constructor>
<method name="_generateUniquePanelID">
<body><![CDATA[
if (!this._uniquePanelIDCounter) {
this._uniquePanelIDCounter = 0;
}
let outerID = window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils)
.outerWindowID;
// We want panel IDs to be globally unique, that's why we include the
// window ID. We switched to a monotonic counter as Date.now() lead
// to random failures because of colliding IDs.
return "panel-" + outerID + "-" + (++this._uniquePanelIDCounter);
]]></body>
</method>
<method name="_addProgressListenerForInitialTab">
<body><![CDATA[
this.webProgress.addProgressListener(this.mTabFilters[0], Ci.nsIWebProgress.NOTIFY_ALL);

4
browser/base/content/test/general/browser_lastAccessedTab.js
Просмотреть файл

@ -17,7 +17,9 @@ function test() {
gBrowser.selectedTab = newTab;
let newTabAccessedDate = newTab.lastAccessed;
ok(newTabAccessedDate > 0, "Timestamp on the selected tab is more than 0.");
ok(newTabAccessedDate <= Date.now(), "Timestamp less than or equal current Date.");
// Date.now is not guaranteed to be monotonic, so include one second of fudge.
let now = Date.now() + 1000;
ok(newTabAccessedDate <= now, "Timestamp less than or equal current Date: " + newTabAccessedDate + " <= " + now);
gBrowser.selectedTab = originalTab;
is(newTab.lastAccessed, newTabAccessedDate, "New tab's timestamp remains the same.");
gBrowser.removeTab(newTab);

1
browser/base/jar.mn
Просмотреть файл

@ -22,7 +22,6 @@ browser.jar:
content/browser/abouthome/aboutHome.xhtml (content/abouthome/aboutHome.xhtml)
content/browser/abouthome/aboutHome.js (content/abouthome/aboutHome.js)
* content/browser/abouthome/aboutHome.css (content/abouthome/aboutHome.css)
content/browser/abouthome/noise.png (content/abouthome/noise.png)
content/browser/abouthome/snippet1.png (content/abouthome/snippet1.png)
content/browser/abouthome/snippet2.png (content/abouthome/snippet2.png)
content/browser/abouthome/downloads.png (content/abouthome/downloads.png)

12
browser/devtools/debugger/debugger-view.js
Просмотреть файл

@ -36,9 +36,6 @@ const DEFAULT_EDITOR_CONFIG = {
showOverviewRuler: true
};
//For telemetry
Cu.import("resource://gre/modules/Services.jsm")
/**
* Object defining the debugger view components.
*/
@ -279,13 +276,10 @@ let DebuggerView = {
if (this._editorSource.url == aSource.url && !aFlags.force) {
return this._editorSource.promise;
}
let transportType = DebuggerController.client.localTransport
? "_LOCAL"
: "_REMOTE";
//Telemetry probe
let transportType = gClient.localTransport ? "_LOCAL" : "_REMOTE";
let histogramId = "DEVTOOLS_DEBUGGER_DISPLAY_SOURCE" + transportType + "_MS";
let histogram = Services.telemetry.getHistogramById(histogramId);
let startTime = +new Date();
let startTime = Date.now();
let deferred = promise.defer();
@ -306,7 +300,7 @@ let DebuggerView = {
DebuggerView.Sources.selectedValue = aSource.url;
DebuggerController.Breakpoints.updateEditorBreakpoints();
histogram.add(+new Date() - startTime);
histogram.add(Date.now() - startTime);
// Resolve and notify that a source file was shown.
window.emit(EVENTS.SOURCE_SHOWN, aSource);

2
browser/devtools/framework/connect/connect.css
Просмотреть файл

@ -4,7 +4,7 @@
html {
background-color: #111;
background-image: url("chrome://browser/skin/newtab/noise.png");
background-image: url("chrome://browser/skin/devtools/noise.png");
}
body {

0
browser/themes/linux/newtab/noise.png → browser/themes/linux/devtools/noise.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 2.1 KiB

После

Ширина:  |  Высота:  |  Размер: 2.1 KiB

2
browser/themes/linux/jar.mn
Просмотреть файл

@ -81,7 +81,6 @@ browser.jar:
skin/classic/browser/feeds/subscribe-ui.css (feeds/subscribe-ui.css)
skin/classic/browser/newtab/newTab.css (newtab/newTab.css)
skin/classic/browser/newtab/controls.png (newtab/controls.png)
skin/classic/browser/newtab/noise.png (newtab/noise.png)
skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png)
skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png)
skin/classic/browser/places/calendar.png (places/calendar.png)
@ -185,6 +184,7 @@ browser.jar:
skin/classic/browser/devtools/itemArrow-rtl.png (devtools/itemArrow-rtl.png)
skin/classic/browser/devtools/itemArrow-ltr.png (devtools/itemArrow-ltr.png)
skin/classic/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
skin/classic/browser/devtools/noise.png (devtools/noise.png)
skin/classic/browser/devtools/inspect-button.png (devtools/inspect-button.png)
skin/classic/browser/devtools/dropmarker.png (devtools/dropmarker.png)
skin/classic/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)

6
browser/themes/linux/newtab/newTab.css
Просмотреть файл

@ -10,10 +10,8 @@
/* SCROLLBOX */
#newtab-scrollbox:not([page-disabled]) {
background-color: rgb(229,229,229);
background-image: url(chrome://browser/skin/newtab/noise.png),
linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.2));
background-attachment: fixed;
color: rgb(0,0,0);
background-color: hsl(0,0%,95%);
}
/* UNDO */

0
browser/themes/osx/newtab/noise.png → browser/themes/osx/devtools/noise.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 2.1 KiB

После

Ширина:  |  Высота:  |  Размер: 2.1 KiB

2
browser/themes/osx/jar.mn
Просмотреть файл

@ -124,7 +124,6 @@ browser.jar:
skin/classic/browser/newtab/newTab.css (newtab/newTab.css)
skin/classic/browser/newtab/controls.png (newtab/controls.png)
skin/classic/browser/newtab/controls@2x.png (newtab/controls@2x.png)
skin/classic/browser/newtab/noise.png (newtab/noise.png)
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
@ -277,6 +276,7 @@ browser.jar:
skin/classic/browser/devtools/itemArrow-rtl.png (devtools/itemArrow-rtl.png)
skin/classic/browser/devtools/itemArrow-ltr.png (devtools/itemArrow-ltr.png)
skin/classic/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
skin/classic/browser/devtools/noise.png (devtools/noise.png)
skin/classic/browser/devtools/inspect-button.png (devtools/inspect-button.png)
skin/classic/browser/devtools/dropmarker.png (devtools/dropmarker.png)
skin/classic/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)

6
browser/themes/osx/newtab/newTab.css
Просмотреть файл

@ -10,10 +10,8 @@
/* SCROLLBOX */
#newtab-scrollbox:not([page-disabled]) {
background-color: rgb(229,229,229);
background-image: url(chrome://browser/skin/newtab/noise.png),
linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.2));
background-attachment: fixed;
color: rgb(0,0,0);
background-color: hsl(0,0%,95%);
}
/* UNDO */

0
browser/themes/windows/newtab/noise.png → browser/themes/windows/devtools/noise.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 2.1 KiB

После

Ширина:  |  Высота:  |  Размер: 2.1 KiB

4
browser/themes/windows/jar.mn
Просмотреть файл

@ -98,7 +98,6 @@ browser.jar:
skin/classic/browser/feeds/subscribe-ui.css (feeds/subscribe-ui.css)
skin/classic/browser/newtab/newTab.css (newtab/newTab.css)
skin/classic/browser/newtab/controls.png (newtab/controls.png)
skin/classic/browser/newtab/noise.png (newtab/noise.png)
skin/classic/browser/places/places.css (places/places.css)
* skin/classic/browser/places/organizer.css (places/organizer.css)
skin/classic/browser/places/editBookmark.png (places/editBookmark.png)
@ -212,6 +211,7 @@ browser.jar:
skin/classic/browser/devtools/itemArrow-rtl.png (devtools/itemArrow-rtl.png)
skin/classic/browser/devtools/itemArrow-ltr.png (devtools/itemArrow-ltr.png)
skin/classic/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
skin/classic/browser/devtools/noise.png (devtools/noise.png)
skin/classic/browser/devtools/inspect-button.png (devtools/inspect-button.png)
skin/classic/browser/devtools/dropmarker.png (devtools/dropmarker.png)
skin/classic/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
@ -373,7 +373,6 @@ browser.jar:
skin/classic/aero/browser/feeds/subscribe-ui.css (feeds/subscribe-ui.css)
skin/classic/aero/browser/newtab/newTab.css (newtab/newTab.css)
skin/classic/aero/browser/newtab/controls.png (newtab/controls.png)
skin/classic/aero/browser/newtab/noise.png (newtab/noise.png)
* skin/classic/aero/browser/places/places.css (places/places-aero.css)
* skin/classic/aero/browser/places/organizer.css (places/organizer-aero.css)
skin/classic/aero/browser/places/bookmark.png (places/bookmark.png)
@ -486,6 +485,7 @@ browser.jar:
skin/classic/aero/browser/devtools/blackBoxMessageEye.png (devtools/blackBoxMessageEye.png)
skin/classic/aero/browser/devtools/itemArrow-rtl.png (devtools/itemArrow-rtl.png)
skin/classic/aero/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
skin/classic/aero/browser/devtools/noise.png (devtools/noise.png)
skin/classic/aero/browser/devtools/itemArrow-ltr.png (devtools/itemArrow-ltr.png)
skin/classic/aero/browser/devtools/inspect-button.png (devtools/inspect-button.png)
skin/classic/aero/browser/devtools/dropmarker.png (devtools/dropmarker.png)

6
browser/themes/windows/newtab/newTab.css
Просмотреть файл

@ -10,10 +10,8 @@
/* SCROLLBOX */
#newtab-scrollbox:not([page-disabled]) {
background-color: rgb(229,229,229);
background-image: url(chrome://browser/skin/newtab/noise.png),
linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.2));
background-attachment: fixed;
color: rgb(0,0,0);
background-color: hsl(0,0%,95%);
}
/* UNDO */

56
build/docs/build-targets.rst Normal file
Просмотреть файл

@ -0,0 +1,56 @@
.. _build_targets:
=============
Build Targets
=============
When you build with ``mach build``, there are some special targets that can be
built. This page attempts to document them.
Partial Tree Targets
====================
The targets in this section only build part of the tree. Please note that
partial tree builds can be unreliable. Use at your own risk.
export
Build the *export* tier. The *export* tier builds everything that is
required for C/C++ compilation. It stages all header files, processes
IDLs, etc.
compile
Build the *compile* tier. The *compile* tier compiles all C/C++ files.
libs
Build the *libs* tier. The *libs* tier performs linking and performs
most build steps which aren't related to compilation.
tools
Build the *tools* tier. The *tools* tier mostly deals with supplementary
tools and compiled tests. It will link tools against libXUL, including
compiled test binaries.
install-manifests
Process install manifests. Install manifests handle the installation of
files into the object directory.
Unless ``NO_REMOVE=1`` is defined in the environment, files not accounted
in the install manifests will be deleted from the object directory.
install-tests
Processes the tests install manifest.
Common Actions
==============
The targets in this section correspond to common build-related actions. Many
of the actions in this section are effectively frontends to shell scripts.
These actions will likely all be replaced by mach commands someday.
buildsymbols
Create a symbols archive for the current build.
This must be performed after a successful build.
check
Run build system tests.

1
build/docs/index.rst
Просмотреть файл

@ -20,6 +20,7 @@ Important Concepts
Profile Guided Optimization <pgo>
slow
environment-variables
build-targets
test_manifests
mozbuild

6
build/docs/requirements.txt Normal file
Просмотреть файл

@ -0,0 +1,6 @@
Jinja2==2.7.1
MarkupSafe==0.18
Pygments==1.6
Sphinx==1.1.3
docutils==0.11
mdn-sphinx-theme==0.3

6
security/manager/boot/src/nsSTSPreloadList.errors
Просмотреть файл

@ -29,13 +29,14 @@ dropcam.com: did not receive HSTS header
emailprivacytester.com: did not receive HSTS header
encrypted.google.com: did not receive HSTS header
epoxate.com: max-age too low: 259200
factor.cc: could not connect to host
fatzebra.com.au: did not receive HSTS header
fj.simple.com: did not receive HSTS header
gmail.com: did not receive HSTS header
gocardless.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-hsts-000000000000000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no]
googlemail.com: did not receive HSTS header
googleplex.com: could not connect to host
greplin.com: could not connect to host
greplin.com: did not receive HSTS header
grepular.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-hsts-000000000000000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no]
groups.google.com: did not receive HSTS header
history.google.com: did not receive HSTS header
@ -92,8 +93,7 @@ www.dropcam.com: max-age too low: 2592000
www.elanex.biz: did not receive HSTS header
www.gmail.com: did not receive HSTS header
www.googlemail.com: did not receive HSTS header
www.gov.uk: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-hsts-000000000000000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no]
www.greplin.com: could not connect to host
www.greplin.com: did not receive HSTS header
www.jitsi.org: did not receive HSTS header
www.lastpass.com: did not receive HSTS header
www.ledgerscope.net: max-age too low: 86400

4
security/manager/boot/src/nsSTSPreloadList.inc
Просмотреть файл

@ -8,7 +8,7 @@
/*****************************************************************************/
#include <stdint.h>
const PRTime gPreloadListExpirationTime = INT64_C(1390645107959000);
const PRTime gPreloadListExpirationTime = INT64_C(1391250031831000);
class nsSTSPreload
{
@ -108,6 +108,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "squareup.com", false },
{ "stocktrade.de", false },
{ "stripe.com", true },
{ "strongest-privacy.com", true },
{ "support.mayfirst.org", false },
{ "surkatty.org", true },
{ "therapynotes.com", false },
@ -124,6 +125,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
{ "www.cueup.com", false },
{ "www.cyveillance.com", true },
{ "www.entropia.de", false },
{ "www.gov.uk", false },
{ "www.grc.com", false },
{ "www.intercom.io", false },
{ "www.irccloud.com", false },