- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it. r=mattwoodrow, a=1.2.x+
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 91ef4ab9fd3794de7e18c9c9470511a26776da3b Author: Benoit Jacob <bjacob(a)mozilla.com> Date: Thu Feb 20 11:41:39 2014 -0500 Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it. r=mattwoodrow, a=1.2.x+ --- gfx/layers/ipc/CompositorParent.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp index be6dbf7..4b61ec4 100644 --- a/gfx/layers/ipc/CompositorParent.cpp +++ b/gfx/layers/ipc/CompositorParent.cpp @@ -256,6 +256,7 @@ CompositorParent::RecvFlushRendering() // and do it immediately instead. if (mCurrentCompositeTask) { mCurrentCompositeTask->Cancel(); + mCurrentCompositeTask = nullptr; ComposeToTarget(nullptr); } return true;

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-centos6-hp-009 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 8ebd92cdd60c09b0226a5887150fe449db7aa668 Author: ffxbld <none@none> Date: Sat Feb 22 03:14:29 2014 -0800 No bug, Automated HSTS preload list update from host bld-centos6-hp-009 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 2 -- security/manager/boot/src/nsSTSPreloadList.inc | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 2bd6d28..f745fc5 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -37,7 +37,6 @@ factor.cc: could not connect to host fatzebra.com.au: did not receive HSTS header fj.simple.com: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header -getcloak.com: max-age too low: 2678400 glass.google.com: did not receive HSTS header gmail.com: did not receive HSTS header googlemail.com: did not receive HSTS header @@ -107,7 +106,6 @@ www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host www.dropcam.com: max-age too low: 2592000 www.elanex.biz: did not receive HSTS header -www.getcloak.com: max-age too low: 2678400 www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header www.greplin.com: could not connect to host diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index e65dda8..47b2c63 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1403348772104000); +const PRTime gPreloadListExpirationTime = INT64_C(1403953602724000); class nsSTSPreload { @@ -19,6 +19,7 @@ class nsSTSPreload static const nsSTSPreload kSTSPreloadList[] = { { "accounts.google.com", true }, + { "aclu.org", false }, { "aladdinschools.appspot.com", false }, { "alpha.irccloud.com", false }, { "api.intercom.io", false }, @@ -72,6 +73,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "forum.linode.com", false }, { "forum.quantifiedself.com", true }, { "gernert-server.de", true }, + { "getcloak.com", false }, { "getlantern.org", false }, { "go.xero.com", false }, { "gocardless.com", true }, @@ -157,12 +159,14 @@ static const nsSTSPreload kSTSPreloadList[] = { { "wiki.python.org", true }, { "wiz.biz", true }, { "writeapp.me", false }, + { "www.aclu.org", false }, { "www.apollo-auto.com", true }, { "www.braintreepayments.com", false }, { "www.calyxinstitute.org", false }, { "www.cyveillance.com", true }, { "www.entropia.de", false }, { "www.evernote.com", false }, + { "www.getcloak.com", false }, { "www.gov.uk", false }, { "www.grc.com", false }, { "www.heliosnet.com", true },

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-ix-033 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit fbb856d85c9ab0b86bd32e34922cc8d37f40d3c3 Author: ffxbld <none@none> Date: Sat Feb 22 03:15:54 2014 -0800 No bug, Automated blocklist update from host bld-linux64-ix-033 - a=blocklist-update --- browser/app/blocklist.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 1b828e9..6854686 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1392162665000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1392852504000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -538,6 +538,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i554" id="lightningnewtab(a)gmail.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i550" id="colmer(a)yopmail.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -634,6 +640,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i552" id="jid0-O6MIff3eO5dIGf5Tcv8RsJDKxrs@jetpack"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i256" id="/^[0-9a-f]+(a)[0-9a-f]+\.info/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange>

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-407 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 3c5af436b5262a2d10684d18260da71841a7b3f5 Author: ffxbld <none@none> Date: Sat Mar 1 03:14:58 2014 -0800 No bug, Automated HSTS preload list update from host bld-linux64-spot-407 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 2 ++ security/manager/boot/src/nsSTSPreloadList.inc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index f745fc5..a700899 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -21,6 +21,7 @@ chrome.google.com: did not receive HSTS header cloud.google.com: did not receive HSTS header code.google.com: did not receive HSTS header codereview.chromium.org: did not receive HSTS header +conformal.com: could not connect to host crate.io: did not receive HSTS header crowdcurity.com: did not receive HSTS header crypto.is: did not receive HSTS header @@ -77,6 +78,7 @@ platform.lookout.com: could not connect to host play.google.com: did not receive HSTS header plus.google.com: did not receive HSTS header plus.sandbox.google.com: did not receive HSTS header +prodpad.com: did not receive HSTS header profiles.google.com: did not receive HSTS header rapidresearch.me: did not receive HSTS header sah3.net: could not connect to host diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 47b2c63..42b58d1 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1403953602724000); +const PRTime gPreloadListExpirationTime = INT64_C(1404558339048000); class nsSTSPreload { @@ -103,6 +103,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "lumi.do", false }, { "luneta.nearbuysystems.com", false }, { "mail.de", true }, + { "mailbox.org", false }, { "makeyourlaws.org", false }, { "manage.zenpayroll.com", false }, { "manager.linode.com", false },

1 0

[tor-browser/esr24] Bug 971285 - Fix intermittent failure in smil/anim-path-d-01.svg. r=dholbert, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 7914f72bb54471c69ee62495732900af8c466c3a Author: Robert Longson <longsonr(a)gmail.com> Date: Sat Feb 15 14:08:54 2014 +0000 Bug 971285 - Fix intermittent failure in smil/anim-path-d-01.svg. r=dholbert, a=test-only --- layout/reftests/svg/smil/anim-path-d-01-ref.svg | 3 ++- layout/reftests/svg/smil/anim-path-d-01.svg | 3 ++- layout/reftests/svg/smil/reftest.list | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/layout/reftests/svg/smil/anim-path-d-01-ref.svg b/layout/reftests/svg/smil/anim-path-d-01-ref.svg index 3095da6..b32fd77 100644 --- a/layout/reftests/svg/smil/anim-path-d-01-ref.svg +++ b/layout/reftests/svg/smil/anim-path-d-01-ref.svg @@ -1,6 +1,7 @@ <svg xmlns="http://www.w3.org/2000/svg"> <style type="text/css"> - path { fill: none; stroke: blue; stroke-width: 1px; } + path { fill: none; stroke: blue; stroke-width: 1px; + shape-rendering: crispEdges; } </style> <path d="M10,10 diff --git a/layout/reftests/svg/smil/anim-path-d-01.svg b/layout/reftests/svg/smil/anim-path-d-01.svg index 53e6b69..180cfe5 100644 --- a/layout/reftests/svg/smil/anim-path-d-01.svg +++ b/layout/reftests/svg/smil/anim-path-d-01.svg @@ -8,7 +8,8 @@ <title>Test animation of the 'd' attribute on the 'path' element</title> <script xlink:href="smil-util.js" type="text/javascript"/> <style type="text/css"> - path { fill: none; stroke: blue; stroke-width: 1px; } + path { fill: none; stroke: blue; stroke-width: 1px; + shape-rendering: crispEdges; } </style> diff --git a/layout/reftests/svg/smil/reftest.list b/layout/reftests/svg/smil/reftest.list index 38d1fa2..7f78133 100644 --- a/layout/reftests/svg/smil/reftest.list +++ b/layout/reftests/svg/smil/reftest.list @@ -127,7 +127,7 @@ skip-if(B2G) == anim-polygon-points-01.svg anim-polygon-points-01-ref.svg == anim-polyline-points-01.svg anim-polyline-points-01-ref.svg # animate path data: -skip-if(B2G) fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),2,1) fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,13) == anim-path-d-01.svg anim-path-d-01-ref.svg # Bug 726400 # bug 773482 +== anim-path-d-01.svg anim-path-d-01-ref.svg # animate some enumeration attributes: skip-if(B2G) == anim-feComposite-operator-01.svg lime.svg

1 0

[tor-browser/esr24] Bug 963198 - Don't mix up byte-size and array-length. r=tn, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 37f96f3d265b9ecb54e86014e57a48f07f202e40 Author: Benoit Jacob <bjacob(a)mozilla.com> Date: Thu Jan 23 17:34:04 2014 -0500 Bug 963198 - Don't mix up byte-size and array-length. r=tn, a=sledru --- layout/mathml/nsMathMLmencloseFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp index 8897585..bb7899e 100644 --- a/layout/mathml/nsMathMLmencloseFrame.cpp +++ b/layout/mathml/nsMathMLmencloseFrame.cpp @@ -804,7 +804,7 @@ void nsDisplayNotation::Paint(nsDisplayListBuilder* aBuilder, rect.TopRight() + gfxPoint(std::min(e / 2.0, -w + .4*h), h + .4*w), rect.TopRight() }; - gfxCtx->Polygon(p, sizeof(p)); + gfxCtx->Polygon(p, MOZ_ARRAY_LENGTH(p)); gfxCtx->Fill(); } break;

1 0

[tor-browser/esr24] Bug 850721 - Fix social blocklist oranges by not enabling the default update server. r=mixedpuppy, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4fd7f4e3c1226049e4815d1cc01a5a99a473c121 Author: Mark Hammond <mhammond(a)skippinet.com.au> Date: Fri Feb 7 12:07:04 2014 +1100 Bug 850721 - Fix social blocklist oranges by not enabling the default update server. r=mixedpuppy, a=test-only --- browser/base/content/test/social/head.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/browser/base/content/test/social/head.js b/browser/base/content/test/social/head.js index 1e5d841..5b77729 100644 --- a/browser/base/content/test/social/head.js +++ b/browser/base/content/test/social/head.js @@ -252,14 +252,24 @@ function updateBlocklist(aCallback) { blocklistNotifier.notify(null); } +var _originalTestBlocklistURL = null; function setAndUpdateBlocklist(aURL, aCallback) { + if (!_originalTestBlocklistURL) + _originalTestBlocklistURL = Services.prefs.getCharPref("extensions.blocklist.url"); Services.prefs.setCharPref("extensions.blocklist.url", aURL); updateBlocklist(aCallback); } function resetBlocklist(aCallback) { - Services.prefs.clearUserPref("extensions.blocklist.url"); - updateBlocklist(aCallback); + // XXX - this has "forked" from the head.js helpers in our parent directory :( + // But let's reuse their blockNoPlugins.xml. Later, we should arrange to + // use their head.js helpers directly + let noBlockedURL = "http://example.com/browser/browser/base/content/test/general/blockNoPlugins…"; + setAndUpdateBlocklist(noBlockedURL, function() { + Services.prefs.setCharPref("extensions.blocklist.url", _originalTestBlocklistURL); + if (aCallback) + aCallback(); + }); } function setManifestPref(name, manifest) {

1 0

[tor-browser/esr24] Bug 968461 - Fix imgStatusTracker.h to build with gcc 4.4. r=jdm, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit db4963336805dbc8609691d3fe4e77960b8cb4e3 Author: Mike Hommey <mh(a)glandium.org> Date: Thu Feb 6 07:07:18 2014 +0900 Bug 968461 - Fix imgStatusTracker.h to build with gcc 4.4. r=jdm, a=sledru --- image/src/imgStatusTracker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/imgStatusTracker.h b/image/src/imgStatusTracker.h index d3f36b3..b19b239 100644 --- a/image/src/imgStatusTracker.h +++ b/image/src/imgStatusTracker.h @@ -212,7 +212,7 @@ public: nsIntRect GetInvalidRect() const { return mInvalidRect; } - typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy>> ProxyArray; + typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy> > ProxyArray; private: friend class imgStatusNotifyRunnable; friend class imgRequestNotifyRunnable;

1 0

[tor-browser/esr24] Backed out changeset 1f9a3ddde18f (bug 850721) for mochitest-bc timeouts. a=backout
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 56be3872ccf1e66f0bc77ab21c343ede3ea8bf59 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Sun Feb 9 19:22:58 2014 -0500 Backed out changeset 1f9a3ddde18f (bug 850721) for mochitest-bc timeouts. a=backout DONTBUILD --- browser/base/content/test/social/head.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/browser/base/content/test/social/head.js b/browser/base/content/test/social/head.js index 5b77729..1e5d841 100644 --- a/browser/base/content/test/social/head.js +++ b/browser/base/content/test/social/head.js @@ -252,24 +252,14 @@ function updateBlocklist(aCallback) { blocklistNotifier.notify(null); } -var _originalTestBlocklistURL = null; function setAndUpdateBlocklist(aURL, aCallback) { - if (!_originalTestBlocklistURL) - _originalTestBlocklistURL = Services.prefs.getCharPref("extensions.blocklist.url"); Services.prefs.setCharPref("extensions.blocklist.url", aURL); updateBlocklist(aCallback); } function resetBlocklist(aCallback) { - // XXX - this has "forked" from the head.js helpers in our parent directory :( - // But let's reuse their blockNoPlugins.xml. Later, we should arrange to - // use their head.js helpers directly - let noBlockedURL = "http://example.com/browser/browser/base/content/test/general/blockNoPlugins…"; - setAndUpdateBlocklist(noBlockedURL, function() { - Services.prefs.setCharPref("extensions.blocklist.url", _originalTestBlocklistURL); - if (aCallback) - aCallback(); - }); + Services.prefs.clearUserPref("extensions.blocklist.url"); + updateBlocklist(aCallback); } function setManifestPref(name, manifest) {

1 0

[tor-browser/esr24] Bug 966311 - Calculate frame size for stereo wave. r=doublec, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 0109abd08387a67efbda9a4d02c44f1c177efb8c Author: Ralph Giles <giles(a)mozilla.com> Date: Fri Jan 31 13:50:45 2014 -0800 Bug 966311 - Calculate frame size for stereo wave. r=doublec, a=sledru We were assuming 8-bit WAVE files were mono-only, but this is not necessarily the case. --- content/media/wave/WaveReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/media/wave/WaveReader.cpp b/content/media/wave/WaveReader.cpp index 28aec46..ce71ea6 100644 --- a/content/media/wave/WaveReader.cpp +++ b/content/media/wave/WaveReader.cpp @@ -424,7 +424,7 @@ WaveReader::LoadFormatChunk(uint32_t aChunkSize) // Make sure metadata is fairly sane. The rate check is fairly arbitrary, // but the channels check is intentionally limited to mono or stereo // because that's what the audio backend currently supports. - unsigned int actualFrameSize = sampleFormat == 8 ? 1 : 2 * channels; + unsigned int actualFrameSize = (sampleFormat == 8 ? 1 : 2) * channels; if (rate < 100 || rate > 96000 || channels < 1 || channels > MAX_CHANNELS || (frameSize != 1 && frameSize != 2 && frameSize != 4) ||

1 0