diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 5097267c9145..f4d1de53d62e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "e836e146aa9bdc2b4141dfa86662eed46d735fb2", + "revision": "a313d5e13d4f91edc28229ad850cb579f50cb2f2", "repo_path": "/integration/gaia-central" } diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index e2fcf334e2c9..f2a0a3e9bec2 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ - + @@ -738,6 +738,10 @@ + + + + diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css index ce8db3cce987..c2703180fc10 100644 --- a/browser/base/content/abouthome/aboutHome.css +++ b/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, diff --git a/browser/base/content/abouthome/noise.png b/browser/base/content/abouthome/noise.png deleted file mode 100644 index 3467cf4d4701..000000000000 Binary files a/browser/base/content/abouthome/noise.png and /dev/null differ diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 6f2391a3c07e..644f5b851948 100644 --- a/browser/base/content/tabbrowser.xml +++ b/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 @@ ]]> + + + + 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); diff --git a/browser/base/jar.mn b/browser/base/jar.mn index f9d34c873c87..f2a820c69c03 100644 --- a/browser/base/jar.mn +++ b/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) diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js index cf2c10df9f8f..8940863fa451 100644 --- a/browser/devtools/debugger/debugger-view.js +++ b/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); diff --git a/browser/devtools/framework/connect/connect.css b/browser/devtools/framework/connect/connect.css index 93dfbd8cdcec..76abce9fd874 100644 --- a/browser/devtools/framework/connect/connect.css +++ b/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 { diff --git a/browser/themes/linux/newtab/noise.png b/browser/themes/linux/devtools/noise.png similarity index 100% rename from browser/themes/linux/newtab/noise.png rename to browser/themes/linux/devtools/noise.png diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 70618992a8ce..9f7e9c5ee2f3 100644 --- a/browser/themes/linux/jar.mn +++ b/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) diff --git a/browser/themes/linux/newtab/newTab.css b/browser/themes/linux/newtab/newTab.css index 4ab23279734c..5082741a2d6f 100644 --- a/browser/themes/linux/newtab/newTab.css +++ b/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 */ diff --git a/browser/themes/osx/newtab/noise.png b/browser/themes/osx/devtools/noise.png similarity index 100% rename from browser/themes/osx/newtab/noise.png rename to browser/themes/osx/devtools/noise.png diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index e06f3a56c8bd..0a83e4531858 100644 --- a/browser/themes/osx/jar.mn +++ b/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) diff --git a/browser/themes/osx/newtab/newTab.css b/browser/themes/osx/newtab/newTab.css index 61e229fccc39..cefab8a42fc3 100644 --- a/browser/themes/osx/newtab/newTab.css +++ b/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 */ diff --git a/browser/themes/windows/newtab/noise.png b/browser/themes/windows/devtools/noise.png similarity index 100% rename from browser/themes/windows/newtab/noise.png rename to browser/themes/windows/devtools/noise.png diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 7aa1916fcbbe..7a50dc5ea7e1 100644 --- a/browser/themes/windows/jar.mn +++ b/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) diff --git a/browser/themes/windows/newtab/newTab.css b/browser/themes/windows/newtab/newTab.css index 5605a983d27b..024bccfd9d2d 100644 --- a/browser/themes/windows/newtab/newTab.css +++ b/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 */ diff --git a/build/docs/build-targets.rst b/build/docs/build-targets.rst new file mode 100644 index 000000000000..7b24dc52eb49 --- /dev/null +++ b/build/docs/build-targets.rst @@ -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. diff --git a/build/docs/index.rst b/build/docs/index.rst index 510aa4c27511..bf435b09a49c 100644 --- a/build/docs/index.rst +++ b/build/docs/index.rst @@ -20,6 +20,7 @@ Important Concepts Profile Guided Optimization slow environment-variables + build-targets test_manifests mozbuild diff --git a/build/docs/requirements.txt b/build/docs/requirements.txt new file mode 100644 index 000000000000..448e4f1ab03b --- /dev/null +++ b/build/docs/requirements.txt @@ -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 diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 66ef1b455a81..2f94f2cf0fc0 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/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 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index a32a94a5ee41..8f5a0b42f05a 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include -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 },