From b88e218874674d1d7d86b77a6bec02deb9f33c2e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 27 Sep 2013 16:55:23 -0700 Subject: [PATCH 01/13] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/aabda3c6c82f Author: James Burke Desc: Merge pull request #12523 from jrburke/bug917465-email-notify-spin Bug 917465 - [Email] launching a mail notification will cause Email app to spin and load forever r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/da41eb15fb40 Author: jrburke Desc: Bug 917465 - [Email] launching a mail notification will cause Email app to spin and load forever --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 5097267c9145..9990fe1c1ad8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "e836e146aa9bdc2b4141dfa86662eed46d735fb2", + "revision": "aabda3c6c82f1468b572c85f33c533d9ab38b7b8", "repo_path": "/integration/gaia-central" } From 9f48b1de4dc350c78796a805dbed98735dd01f0e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 27 Sep 2013 18:55:23 -0700 Subject: [PATCH 02/13] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6a734adb5550 Author: Greg Weng Desc: Merge pull request #12496 from snowmantw/issue921360 Bug 921360 - [LockScreen] Make the glitches on lockscreen invisible ======== https://hg.mozilla.org/integration/gaia-central/rev/d687f3ffd87a Author: Greg Weng (snowmantw) Desc: Bug 921360 - [LockScreen] Make the glitches on lockscreen invisible --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 9990fe1c1ad8..c276a459374e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "aabda3c6c82f1468b572c85f33c533d9ab38b7b8", + "revision": "6a734adb5550ccb4e069f1e39d61f342e96861ae", "repo_path": "/integration/gaia-central" } From d6c73995bb465490b6c33b9ca1fdbc3d91fc7353 Mon Sep 17 00:00:00 2001 From: Yuan Xulei Date: Thu, 26 Sep 2013 15:10:56 +0800 Subject: [PATCH 03/13] Bug 920831 - MozInputMethod's init should only return undefined. r=bz --- dom/base/Navigator.cpp | 11 ++++++++++ dom/base/Navigator.h | 4 ++++ dom/inputmethod/MozKeyboard.js | 20 ------------------- .../mochitest/general/test_interfaces.html | 1 - dom/webidl/InputMethod.webidl | 2 +- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index d5a968e5a9aa..4c9f615f216d 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1786,6 +1786,17 @@ bool Navigator::HasPushNotificationsSupport(JSContext* /* unused */, return win && Preferences::GetBool("services.push.enabled", false) && CheckPermission(win, "push"); } +#ifdef MOZ_B2G +/* static */ +bool Navigator::HasInputMethodSupport(JSContext* /* unused */, + JSObject* aGlobal) +{ + nsCOMPtr win = GetWindowFromGlobal(aGlobal); + return Preferences::GetBool("dom.mozInputMethod.testing", false) || + (win && CheckPermission(win, "keyboard")); +} +#endif + /* static */ already_AddRefed Navigator::GetWindowFromGlobal(JSObject* aGlobal) diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h index d92cd52a009a..1ec9b3de7789 100644 --- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -300,6 +300,10 @@ public: static bool HasPushNotificationsSupport(JSContext* /* unused */, JSObject* aGlobal); +#ifdef MOZ_B2G + static bool HasInputMethodSupport(JSContext* /* unused */, JSObject* aGlobal); +#endif + nsPIDOMWindow* GetParentObject() const { return GetWindow(); diff --git a/dom/inputmethod/MozKeyboard.js b/dom/inputmethod/MozKeyboard.js index 0462944a5356..c46fbf93b688 100644 --- a/dom/inputmethod/MozKeyboard.js +++ b/dom/inputmethod/MozKeyboard.js @@ -199,8 +199,6 @@ MozKeyboard.prototype = { } }; -const TESTING_ENABLED_PREF = "dom.mozInputMethod.testing"; - /* * A WeakMap to map input method iframe window to its active status. */ @@ -317,24 +315,6 @@ MozInputMethod.prototype = { }), init: function mozInputMethodInit(win) { - // Check if we're in testing mode. - let isTesting = false; - try { - isTesting = Services.prefs.getBoolPref(TESTING_ENABLED_PREF); - } catch (e) {} - - // Don't bypass the permission check if not in testing mode. - if (!isTesting) { - let principal = win.document.nodePrincipal; - let perm = Services.perms - .testExactPermissionFromPrincipal(principal, "keyboard"); - if (perm != Ci.nsIPermissionManager.ALLOW_ACTION) { - dump("No permission to use the keyboard API for " + - principal.origin + "\n"); - return; - } - } - this._window = win; this._mgmt = new MozInputMethodManager(win); this.innerWindowID = win.QueryInterface(Ci.nsIInterfaceRequestor) diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index f418a4b058a6..1b1ad04c5d47 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -324,7 +324,6 @@ var interfaceNamesInGlobalScope = {name: "MozEmergencyCbModeEvent", b2g: true}, {name: "MozIccManager", b2g: true}, {name: "MozInputContext", b2g: true}, - {name: "MozInputMethod", b2g: true}, {name: "MozInputMethodManager", b2g: true}, "MozMmsEvent", "MozMmsMessage", diff --git a/dom/webidl/InputMethod.webidl b/dom/webidl/InputMethod.webidl index c28b3d5e0304..0f3befa1d946 100644 --- a/dom/webidl/InputMethod.webidl +++ b/dom/webidl/InputMethod.webidl @@ -6,7 +6,7 @@ [JSImplementation="@mozilla.org/b2g-inputmethod;1", NavigatorProperty="mozInputMethod", - Pref="dom.mozInputMethod.enabled"] + Func="Navigator::HasInputMethodSupport"] interface MozInputMethod : EventTarget { // Input Method Manager contain a few global methods expose to apps readonly attribute MozInputMethodManager mgmt; From def31255cffa8a57ddb650bddd09671baf0960a9 Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Thu, 26 Sep 2013 16:46:42 -0700 Subject: [PATCH 04/13] Bug 920840 - Crash when JS-implemented WebIDL's init method returns a value other than undefined. r=bz --- dom/bindings/BindingUtils.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp index 043332062bdf..cd9b2622cd3a 100644 --- a/dom/bindings/BindingUtils.cpp +++ b/dom/bindings/BindingUtils.cpp @@ -2040,8 +2040,13 @@ ConstructJSImplementation(JSContext* aCx, const char* aContractId, aRv.Throw(rv); return nullptr; } - MOZ_ASSERT(initReturn.isUndefined(), - "nsIDOMGlobalPropertyInitializer should return undefined"); + // With JS-implemented WebIDL, the return value of init() is not used to determine + // if init() failed, so init() should only return undefined. Any kind of permission + // or pref checking must happen by adding an attribute to the WebIDL interface. + if (!initReturn.isUndefined()) { + MOZ_ASSERT(false, "The init() method for JS-implemented WebIDL should not return anything"); + MOZ_CRASH(); + } } // Extract the JS implementation from the XPCOM object. nsCOMPtr implWrapped = From 1d4927cb265a550bf397a5ae566622387e1e43b2 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Fri, 27 Sep 2013 23:14:26 -0400 Subject: [PATCH 05/13] Backed out 2 changesets (bug 920840, bug 920831) for bustage. DONTBUILD Backed out changeset dac111df7fdf (bug 920840) Backed out changeset bfde80bc6826 (bug 920831) --- dom/base/Navigator.cpp | 11 ---------- dom/base/Navigator.h | 4 ---- dom/bindings/BindingUtils.cpp | 9 ++------- dom/inputmethod/MozKeyboard.js | 20 +++++++++++++++++++ .../mochitest/general/test_interfaces.html | 1 + dom/webidl/InputMethod.webidl | 2 +- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 4c9f615f216d..d5a968e5a9aa 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1786,17 +1786,6 @@ bool Navigator::HasPushNotificationsSupport(JSContext* /* unused */, return win && Preferences::GetBool("services.push.enabled", false) && CheckPermission(win, "push"); } -#ifdef MOZ_B2G -/* static */ -bool Navigator::HasInputMethodSupport(JSContext* /* unused */, - JSObject* aGlobal) -{ - nsCOMPtr win = GetWindowFromGlobal(aGlobal); - return Preferences::GetBool("dom.mozInputMethod.testing", false) || - (win && CheckPermission(win, "keyboard")); -} -#endif - /* static */ already_AddRefed Navigator::GetWindowFromGlobal(JSObject* aGlobal) diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h index 1ec9b3de7789..d92cd52a009a 100644 --- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -300,10 +300,6 @@ public: static bool HasPushNotificationsSupport(JSContext* /* unused */, JSObject* aGlobal); -#ifdef MOZ_B2G - static bool HasInputMethodSupport(JSContext* /* unused */, JSObject* aGlobal); -#endif - nsPIDOMWindow* GetParentObject() const { return GetWindow(); diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp index cd9b2622cd3a..043332062bdf 100644 --- a/dom/bindings/BindingUtils.cpp +++ b/dom/bindings/BindingUtils.cpp @@ -2040,13 +2040,8 @@ ConstructJSImplementation(JSContext* aCx, const char* aContractId, aRv.Throw(rv); return nullptr; } - // With JS-implemented WebIDL, the return value of init() is not used to determine - // if init() failed, so init() should only return undefined. Any kind of permission - // or pref checking must happen by adding an attribute to the WebIDL interface. - if (!initReturn.isUndefined()) { - MOZ_ASSERT(false, "The init() method for JS-implemented WebIDL should not return anything"); - MOZ_CRASH(); - } + MOZ_ASSERT(initReturn.isUndefined(), + "nsIDOMGlobalPropertyInitializer should return undefined"); } // Extract the JS implementation from the XPCOM object. nsCOMPtr implWrapped = diff --git a/dom/inputmethod/MozKeyboard.js b/dom/inputmethod/MozKeyboard.js index c46fbf93b688..0462944a5356 100644 --- a/dom/inputmethod/MozKeyboard.js +++ b/dom/inputmethod/MozKeyboard.js @@ -199,6 +199,8 @@ MozKeyboard.prototype = { } }; +const TESTING_ENABLED_PREF = "dom.mozInputMethod.testing"; + /* * A WeakMap to map input method iframe window to its active status. */ @@ -315,6 +317,24 @@ MozInputMethod.prototype = { }), init: function mozInputMethodInit(win) { + // Check if we're in testing mode. + let isTesting = false; + try { + isTesting = Services.prefs.getBoolPref(TESTING_ENABLED_PREF); + } catch (e) {} + + // Don't bypass the permission check if not in testing mode. + if (!isTesting) { + let principal = win.document.nodePrincipal; + let perm = Services.perms + .testExactPermissionFromPrincipal(principal, "keyboard"); + if (perm != Ci.nsIPermissionManager.ALLOW_ACTION) { + dump("No permission to use the keyboard API for " + + principal.origin + "\n"); + return; + } + } + this._window = win; this._mgmt = new MozInputMethodManager(win); this.innerWindowID = win.QueryInterface(Ci.nsIInterfaceRequestor) diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index 1b1ad04c5d47..f418a4b058a6 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -324,6 +324,7 @@ var interfaceNamesInGlobalScope = {name: "MozEmergencyCbModeEvent", b2g: true}, {name: "MozIccManager", b2g: true}, {name: "MozInputContext", b2g: true}, + {name: "MozInputMethod", b2g: true}, {name: "MozInputMethodManager", b2g: true}, "MozMmsEvent", "MozMmsMessage", diff --git a/dom/webidl/InputMethod.webidl b/dom/webidl/InputMethod.webidl index 0f3befa1d946..c28b3d5e0304 100644 --- a/dom/webidl/InputMethod.webidl +++ b/dom/webidl/InputMethod.webidl @@ -6,7 +6,7 @@ [JSImplementation="@mozilla.org/b2g-inputmethod;1", NavigatorProperty="mozInputMethod", - Func="Navigator::HasInputMethodSupport"] + Pref="dom.mozInputMethod.enabled"] interface MozInputMethod : EventTarget { // Input Method Manager contain a few global methods expose to apps readonly attribute MozInputMethodManager mgmt; From 5dfcbce8d35ab709ea4e2d5783ef078c4e0c3da5 Mon Sep 17 00:00:00 2001 From: Drew Willcoxon Date: Fri, 27 Sep 2013 23:47:18 -0700 Subject: [PATCH 06/13] Bug 874847 - Fix intermittent failure in browser_lastAccessedTab.js by including some fudge in the Date.now comparison. r=ttaubert --- browser/base/content/test/general/browser_lastAccessedTab.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/base/content/test/general/browser_lastAccessedTab.js b/browser/base/content/test/general/browser_lastAccessedTab.js index 4d788092a897..d0ad8b4cd323 100644 --- a/browser/base/content/test/general/browser_lastAccessedTab.js +++ b/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); From 25d72a0e3cb23992ecb8541c3e70ebc6c8aa9bf1 Mon Sep 17 00:00:00 2001 From: Victor Porof Date: Sat, 28 Sep 2013 10:41:20 +0300 Subject: [PATCH 07/13] Bug 907755 - Followups, r=fitzgen --- browser/devtools/debugger/debugger-view.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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); From c58a40cd97cf6874504e75e91a1d8efdec396a68 Mon Sep 17 00:00:00 2001 From: ffxbld Date: Sat, 28 Sep 2013 03:30:01 -0700 Subject: [PATCH 08/13] No bug, Automated HSTS preload list update from host bld-linux64-ec2-318 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 6 +++--- security/manager/boot/src/nsSTSPreloadList.inc | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) 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 }, From b43adacd75a18f52e76ff89169ee5b155a55c609 Mon Sep 17 00:00:00 2001 From: ffxbld Date: Sat, 28 Sep 2013 03:31:27 -0700 Subject: [PATCH 09/13] No bug, Automated blocklist update from host bld-linux64-ec2-007 - a=blocklist-update --- browser/app/blocklist.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 @@ + + + + From deb8c2568ca32106ef9bd39e15fc38833f72325c Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sat, 28 Sep 2013 06:20:26 -0700 Subject: [PATCH 10/13] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a313d5e13d4f Author: Alive.Kuo Desc: Merge pull request #12479 from alivedise/bugzilla/920944/two-homescreen-instance-in-b2gperf Bug 920944 - Fix b2gperf, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/fc8a0445f77b Author: Alive Kuo Desc: Bug 920944 - Fix b2gperf --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c276a459374e..f4d1de53d62e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "6a734adb5550ccb4e069f1e39d61f342e96861ae", + "revision": "a313d5e13d4f91edc28229ad850cb579f50cb2f2", "repo_path": "/integration/gaia-central" } From 72ae67f5827e2b6c23b581996093c3b49cc58ab9 Mon Sep 17 00:00:00 2001 From: Tim Taubert Date: Sat, 28 Sep 2013 18:38:47 +0200 Subject: [PATCH 11/13] Bug 906462 - Remove noise backgrounds for about:newtab and about:home; r=dao --HG-- rename : browser/themes/linux/newtab/noise.png => browser/themes/linux/devtools/noise.png rename : browser/themes/osx/newtab/noise.png => browser/themes/osx/devtools/noise.png rename : browser/themes/windows/newtab/noise.png => browser/themes/windows/devtools/noise.png --- browser/base/content/abouthome/aboutHome.css | 4 +--- browser/base/content/abouthome/noise.png | Bin 4025 -> 0 bytes browser/base/jar.mn | 1 - browser/devtools/framework/connect/connect.css | 2 +- .../themes/linux/{newtab => devtools}/noise.png | Bin browser/themes/linux/jar.mn | 2 +- browser/themes/linux/newtab/newTab.css | 6 ++---- .../themes/osx/{newtab => devtools}/noise.png | Bin browser/themes/osx/jar.mn | 2 +- browser/themes/osx/newtab/newTab.css | 6 ++---- .../windows/{newtab => devtools}/noise.png | Bin browser/themes/windows/jar.mn | 4 ++-- browser/themes/windows/newtab/newTab.css | 6 ++---- 13 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 browser/base/content/abouthome/noise.png rename browser/themes/linux/{newtab => devtools}/noise.png (100%) rename browser/themes/osx/{newtab => devtools}/noise.png (100%) rename browser/themes/windows/{newtab => devtools}/noise.png (100%) 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 3467cf4d4701c6623125a8ecf80a833c6a0afca3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4025 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 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/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 */ From 1211ef6f06ca89501dd9edd0bedaa13a6e6161ac Mon Sep 17 00:00:00 2001 From: Tim Taubert Date: Sat, 28 Sep 2013 20:07:07 +0200 Subject: [PATCH 12/13] Bug 586153 - Avoid tab panel ID collisions by using a monotonic counter; r=dolske --- browser/base/content/tabbrowser.xml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) 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 @@ ]]> + + + + Date: Sun, 29 Sep 2013 10:43:49 +0200 Subject: [PATCH 13/13] NO BUG - Document common build system targets, add requirements.txt DONTBUILD (NPOTB) --- build/docs/build-targets.rst | 56 ++++++++++++++++++++++++++++++++++++ build/docs/index.rst | 1 + build/docs/requirements.txt | 6 ++++ 3 files changed, 63 insertions(+) create mode 100644 build/docs/build-targets.rst create mode 100644 build/docs/requirements.txt 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