- tbb-commits - lists.torproject.org

[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 873661 - Wait both browserloadend and process-created event. r=fabrice, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 65ae9093262518864695bc8936cab4a77342f7ff Author: Kan-Ru Chen (é™³ä¾ƒå¦‚) <kanru(a)kanru.info> Date: Wed Feb 19 10:55:25 2014 +0800 Bug 873661 - Wait both browserloadend and process-created event. r=fabrice, a=test-only --- .../mochitest/priority/test_NestedFrames.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dom/browser-element/mochitest/priority/test_NestedFrames.html b/dom/browser-element/mochitest/priority/test_NestedFrames.html index 21184a4..7d9899b 100644 --- a/dom/browser-element/mochitest/priority/test_NestedFrames.html +++ b/dom/browser-element/mochitest/priority/test_NestedFrames.html @@ -49,13 +49,13 @@ function runTest() { // Note that this is the process corresponding to the /inner/ iframe. The // outer iframe runs in-process (because it has remote=false). var childID = null; - expectOnlyOneProcessCreated().then(function(chid) { - childID = chid; - return Promise.all( - [expectPriorityChange(childID, 'FOREGROUND'), - expectMozbrowserEvent(iframe, 'loadend')] - ); - }).then(function() { + Promise.all( + [expectOnlyOneProcessCreated().then(function(child) { + childID = child; + return expectPriorityChange(childID, 'FOREGROUND'); + }), + expectMozbrowserEvent(iframe, 'loadend')] + ).then(function() { // Send the outer iframe into the background. This should change the // priority of the inner frame's process to BACKGROUND. var p = expectPriorityChange(childID, 'BACKGROUND');

1 0

[tor-browser/esr24] Bug 541855 - Add in the error tolerance before calling the timing function, so that we allow more error for steeper functions, and less error for most. r=dholbert, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 82fe694f1304ccbcb83c8ec478e05045426b39a1 Author: L. David Baron <dbaron(a)dbaron.org> Date: Fri Feb 14 21:29:12 2014 -0800 Bug 541855 - Add in the error tolerance before calling the timing function, so that we allow more error for steeper functions, and less error for most. r=dholbert, a=test-only --- layout/style/test/test_transitions.html | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/layout/style/test/test_transitions.html b/layout/style/test/test_transitions.html index 75b90a2..d00c28d 100644 --- a/layout/style/test/test_transitions.html +++ b/layout/style/test/test_transitions.html @@ -430,6 +430,19 @@ function check_transition_value(func, start_time, end_time, start_value, end_value, cval, desc, xfail) { + /** + * Compute the value at a given time |elapsed|, by normalizing the + * input to the timing function using start_time and end_time and + * then turning the output into a value using start_value and + * end_value. + * + * The |error_direction| argument should be either -1, 0, or 1, + * suggesting adding on a little bit of error, to allow for the + * cubic-bezier calculation being an approximation. The amount of + * error is proportional to the slope of the timing function, since + * the error is added to the *input* of the timing function (after + * normalization to 0-1 based on start_time and end_time). + */ function value_at(elapsed, error_direction) { var time_portion = (elapsed - start_time) / (end_time - start_time); if (time_portion < 0) @@ -438,7 +451,7 @@ function check_transition_value(func, start_time, end_time, time_portion = 1; // Assume a small error since bezier computation can be off slightly. // (This test's computation is probably more accurate than Mozilla's.) - var value_portion = func(time_portion) + error_direction * 0.0015; + var value_portion = func(time_portion + error_direction * 0.0005); if (value_portion < 0) value_portion = 0; else if (value_portion > 1)

1 0

[tor-browser/esr24] Bug 960145 - IonMonkey: Don't ignore OSR-like values when computing phi ranges. r=mrosenberg, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 913b71b9573081942cca8231ade597f94022398f Author: Dan Gohman <sunfish(a)mozilla.com> Date: Thu Feb 13 14:25:20 2014 -0500 Bug 960145 - IonMonkey: Don't ignore OSR-like values when computing phi ranges. r=mrosenberg, a=sledru --- js/src/jit/MIR.h | 13 ------------- js/src/jit/RangeAnalysis.cpp | 4 ---- 2 files changed, 17 deletions(-) diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index 9633d0a..e9bc029 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -77,8 +77,6 @@ class MUse; class MIRGraph; class MResumePoint; -static inline bool isOSRLikeValue (MDefinition *def); - // Represents a use of a node. class MUse : public TempObject, public InlineListNode<MUse> { @@ -8267,17 +8265,6 @@ MInstruction *MDefinition::toInstruction() return (MInstruction *)this; } -static inline bool isOSRLikeValue (MDefinition *def) { - if (def->isOsrValue()) - return true; - - if (def->isUnbox()) - if (def->getOperand(0)->isOsrValue()) - return true; - - return false; -} - typedef Vector<MDefinition *, 8, IonAllocPolicy> MDefinitionVector; // Helper functions used to decide how to build MIR. diff --git a/js/src/jit/RangeAnalysis.cpp b/js/src/jit/RangeAnalysis.cpp index c8cbc20..4381d84 100644 --- a/js/src/jit/RangeAnalysis.cpp +++ b/js/src/jit/RangeAnalysis.cpp @@ -536,16 +536,12 @@ MPhi::computeRange() return; Range *range = NULL; - JS_ASSERT(getOperand(0)->op() != MDefinition::Op_OsrValue); for (size_t i = 0; i < numOperands(); i++) { if (getOperand(i)->block()->earlyAbort()) { IonSpew(IonSpew_Range, "Ignoring unreachable input %d", getOperand(i)->id()); continue; } - if (isOSRLikeValue(getOperand(i))) - continue; - Range *input = getOperand(i)->range(); if (!input) {

1 0

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

29 Aug '14

commit 07f9d11f800f1ba8039bfe9e7d176a6faeae9977 Author: ffxbld <none@none> Date: Sat Feb 15 03:17:24 2014 -0800 No bug, Automated HSTS preload list update from host bld-linux64-spot-073 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 82fc0af..e65dda8 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(1402743927341000); +const PRTime gPreloadListExpirationTime = INT64_C(1403348772104000); class nsSTSPreload {

1 0

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

29 Aug '14

commit 8dd64308980896e81d2271c8af65ee0b221d280e Author: ffxbld <none@none> Date: Sat Feb 15 03:14:33 2014 -0800 No bug, Automated blocklist update from host bld-linux64-spot-021 - a=blocklist-update --- browser/app/blocklist.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 361ea15..1b828e9 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="1391730565000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1392162665000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -761,7 +761,7 @@ </prefs> </emItem> <emItem blockID="i507" id="4zffxtbr-bs(a)VideoDownloadConverter_4z.com"> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <versionRange minVersion="0" maxVersion="5.75.3.25126" severity="1"> </versionRange> <prefs> </prefs>

1 0

[tor-browser/esr24] Bug 965982. r=bent, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit efbbb3a73c0f4325f2a41a6b42d6ddc4e1f670fc Author: Jan Varga <jan.varga(a)gmail.com> Date: Fri Jan 31 09:50:15 2014 -0800 Bug 965982. r=bent, a=lsblakk --- dom/quota/QuotaManager.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dom/quota/QuotaManager.cpp b/dom/quota/QuotaManager.cpp index ca62e79..fd2e6bc 100644 --- a/dom/quota/QuotaManager.cpp +++ b/dom/quota/QuotaManager.cpp @@ -1233,22 +1233,6 @@ QuotaManager::Observe(nsISupports* aSubject, } } - // Give clients a chance to cleanup IO thread only objects. - nsCOMPtr<nsIRunnable> runnable = - NS_NewRunnableMethod(this, &QuotaManager::ReleaseIOThreadObjects); - if (!runnable) { - NS_WARNING("Failed to create runnable!"); - } - - if (NS_FAILED(mIOThread->Dispatch(runnable, NS_DISPATCH_NORMAL))) { - NS_WARNING("Failed to dispatch runnable!"); - } - - // Make sure to join with our IO thread. - if (NS_FAILED(mIOThread->Shutdown())) { - NS_WARNING("Failed to shutdown IO thread!"); - } - // Kick off the shutdown timer. if (NS_FAILED(mShutdownTimer->Init(this, DEFAULT_SHUTDOWN_TIMER_MS, nsITimer::TYPE_ONE_SHOT))) { @@ -1265,6 +1249,22 @@ QuotaManager::Observe(nsISupports* aSubject, if (NS_FAILED(mShutdownTimer->Cancel())) { NS_WARNING("Failed to cancel shutdown timer!"); } + + // Give clients a chance to cleanup IO thread only objects. + nsCOMPtr<nsIRunnable> runnable = + NS_NewRunnableMethod(this, &QuotaManager::ReleaseIOThreadObjects); + if (!runnable) { + NS_WARNING("Failed to create runnable!"); + } + + if (NS_FAILED(mIOThread->Dispatch(runnable, NS_DISPATCH_NORMAL))) { + NS_WARNING("Failed to dispatch runnable!"); + } + + // Make sure to join with our IO thread. + if (NS_FAILED(mIOThread->Shutdown())) { + NS_WARNING("Failed to shutdown IO thread!"); + } } return NS_OK;

1 0

[tor-browser/esr24] Bug 963324 - Import mismatch menclose reftests from the MathJax testsuite. r=karlt, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 9b52b442bb8e348a86f51e8e8d524a108ca57159 Author: FrÃ©dÃ©ric Wang <fred.wang(a)free.fr> Date: Fri Feb 7 10:48:42 2014 -0500 Bug 963324 - Import mismatch menclose reftests from the MathJax testsuite. r=karlt, a=test-only --- layout/reftests/mathml/menclose-1-ref.html | 18 +++++++++++++++--- layout/reftests/mathml/menclose-1.html | 9 --------- layout/reftests/mathml/menclose-1a.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1b.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1c.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1d.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1e.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1f.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1g.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1h.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1i.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1j.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1k.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1l.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1m.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1n.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1o.html | 21 +++++++++++++++++++++ layout/reftests/mathml/menclose-1p.html | 21 +++++++++++++++++++++ layout/reftests/mathml/reftest.list | 17 ++++++++++++++++- 19 files changed, 367 insertions(+), 13 deletions(-) diff --git a/layout/reftests/mathml/menclose-1-ref.html b/layout/reftests/mathml/menclose-1-ref.html index 77ad587..2302a2b 100644 --- a/layout/reftests/mathml/menclose-1-ref.html +++ b/layout/reftests/mathml/menclose-1-ref.html @@ -1,9 +1,21 @@ + + <!DOCTYPE html> <html> - <head><title>Updiagonalarrow</title></head> - <body> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> - <p><math><menclose notation="updiagonalstrike"><mspace width="50px" height="50px"/></menclose></math></p> + <body> +  + <math> + <menclose notation=""> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> </body> </html> diff --git a/layout/reftests/mathml/menclose-1.html b/layout/reftests/mathml/menclose-1.html deleted file mode 100644 index f2ac877..0000000 --- a/layout/reftests/mathml/menclose-1.html +++ /dev/null @@ -1,9 +0,0 @@ -<!DOCTYPE html> -<html> - <head><title>Updiagonalarrow</title></head> - <body> - - <p><math><menclose><mspace width="50px" height="50px"/></menclose></math></p> - - </body> -</html> diff --git a/layout/reftests/mathml/menclose-1a.html b/layout/reftests/mathml/menclose-1a.html new file mode 100644 index 0000000..649ea0e --- /dev/null +++ b/layout/reftests/mathml/menclose-1a.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="longdiv"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1b.html b/layout/reftests/mathml/menclose-1b.html new file mode 100644 index 0000000..d46e43d4 --- /dev/null +++ b/layout/reftests/mathml/menclose-1b.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="actuarial"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1c.html b/layout/reftests/mathml/menclose-1c.html new file mode 100644 index 0000000..cca82fb --- /dev/null +++ b/layout/reftests/mathml/menclose-1c.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="radical"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1d.html b/layout/reftests/mathml/menclose-1d.html new file mode 100644 index 0000000..6c98cdb --- /dev/null +++ b/layout/reftests/mathml/menclose-1d.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="box"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1e.html b/layout/reftests/mathml/menclose-1e.html new file mode 100644 index 0000000..6c1d4bc --- /dev/null +++ b/layout/reftests/mathml/menclose-1e.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="roundedbox"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1f.html b/layout/reftests/mathml/menclose-1f.html new file mode 100644 index 0000000..f4409e2 --- /dev/null +++ b/layout/reftests/mathml/menclose-1f.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="circle"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1g.html b/layout/reftests/mathml/menclose-1g.html new file mode 100644 index 0000000..97a88eb --- /dev/null +++ b/layout/reftests/mathml/menclose-1g.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="left"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1h.html b/layout/reftests/mathml/menclose-1h.html new file mode 100644 index 0000000..fa17c07 --- /dev/null +++ b/layout/reftests/mathml/menclose-1h.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="right"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1i.html b/layout/reftests/mathml/menclose-1i.html new file mode 100644 index 0000000..062ef17 --- /dev/null +++ b/layout/reftests/mathml/menclose-1i.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="top"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1j.html b/layout/reftests/mathml/menclose-1j.html new file mode 100644 index 0000000..175f65a --- /dev/null +++ b/layout/reftests/mathml/menclose-1j.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="bottom"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1k.html b/layout/reftests/mathml/menclose-1k.html new file mode 100644 index 0000000..03f9d15 --- /dev/null +++ b/layout/reftests/mathml/menclose-1k.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="updiagonalstrike"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1l.html b/layout/reftests/mathml/menclose-1l.html new file mode 100644 index 0000000..dce9636 --- /dev/null +++ b/layout/reftests/mathml/menclose-1l.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="downdiagonalstrike"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1m.html b/layout/reftests/mathml/menclose-1m.html new file mode 100644 index 0000000..4acdaf9 --- /dev/null +++ b/layout/reftests/mathml/menclose-1m.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="verticalstrike"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1n.html b/layout/reftests/mathml/menclose-1n.html new file mode 100644 index 0000000..3557fc3 --- /dev/null +++ b/layout/reftests/mathml/menclose-1n.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="horizontalstrike"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1o.html b/layout/reftests/mathml/menclose-1o.html new file mode 100644 index 0000000..231aeaa --- /dev/null +++ b/layout/reftests/mathml/menclose-1o.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="madruwb"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/menclose-1p.html b/layout/reftests/mathml/menclose-1p.html new file mode 100644 index 0000000..5bff5e0 --- /dev/null +++ b/layout/reftests/mathml/menclose-1p.html @@ -0,0 +1,21 @@ + + +<!DOCTYPE html> +<html> + <head> + <title>Test menclose</title> +  + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + </head> + + <body> +  + <math> + <menclose notation="updiagonalarrow"> + <mspace width="100px" height="50px"></mspace> + </menclose> + </math> + + </body> +</html> diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list index e32580f..1cbf8f0 100644 --- a/layout/reftests/mathml/reftest.list +++ b/layout/reftests/mathml/reftest.list @@ -124,4 +124,19 @@ fails == whitespace-trim-4.html whitespace-trim-4-ref.html # Bug 787215 == number-size-1.xhtml number-size-1-ref.xhtml == mathml-mmultiscript-base.html mathml-mmultiscript-base-ref.html == mathml-mmultiscript-mprescript.html mathml-mmultiscript-mprescript-ref.html -!= menclose-1.html menclose-1-ref.html +!= menclose-1a.html menclose-1-ref.html +!= menclose-1b.html menclose-1-ref.html +!= menclose-1c.html menclose-1-ref.html +!= menclose-1d.html menclose-1-ref.html +!= menclose-1e.html menclose-1-ref.html +!= menclose-1f.html menclose-1-ref.html +!= menclose-1g.html menclose-1-ref.html +!= menclose-1h.html menclose-1-ref.html +!= menclose-1i.html menclose-1-ref.html +!= menclose-1j.html menclose-1-ref.html +!= menclose-1k.html menclose-1-ref.html +!= menclose-1l.html menclose-1-ref.html +!= menclose-1m.html menclose-1-ref.html +!= menclose-1n.html menclose-1-ref.html +!= menclose-1o.html menclose-1-ref.html +!= menclose-1p.html menclose-1-ref.html

1 0

[tor-browser/esr24] Bug 942152. r=dkeeler, r=honzab, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit a8e688f3946d1a68857c3a594b415ac1c978f918 Author: Brian Smith <brian(a)briansmith.org> Date: Thu Dec 5 20:33:49 2013 -0800 Bug 942152. r=dkeeler, r=honzab, a=sledru --- security/manager/ssl/src/nsNSSIOLayer.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp index 3d88596..d4bc6f1 100644 --- a/security/manager/ssl/src/nsNSSIOLayer.cpp +++ b/security/manager/ssl/src/nsNSSIOLayer.cpp @@ -923,6 +923,9 @@ int32_t checkHandshake(int32_t bytesTransfered, bool wasReading, PRFileDesc* ssl_layer_fd, nsNSSSocketInfo *socketInfo) { + const PRErrorCode originalError = PR_GetError(); + PRErrorCode err = originalError; + // This is where we work around all of those SSL servers that don't // conform to the SSL spec and shutdown a connection when we request // SSL v3.1 (aka TLS). The spec says the client says what version @@ -960,11 +963,11 @@ int32_t checkHandshake(int32_t bytesTransfered, bool wasReading, bool wantRetry = false; if (0 > bytesTransfered) { - int32_t err = PR_GetError(); if (handleHandshakeResultNow) { if (PR_WOULD_BLOCK_ERROR == err) { socketInfo->SetHandshakeInProgress(true); + PR_SetError(err, 0); return bytesTransfered; } @@ -1008,7 +1011,7 @@ int32_t checkHandshake(int32_t bytesTransfered, bool wasReading, if (wantRetry) { // We want to cause the network layer to retry the connection. - PR_SetError(PR_CONNECT_RESET_ERROR, 0); + err = PR_CONNECT_RESET_ERROR; if (wasReading) bytesTransfered = -1; } @@ -1020,7 +1023,19 @@ int32_t checkHandshake(int32_t bytesTransfered, bool wasReading, socketInfo->SetHandshakePending(false); socketInfo->SetHandshakeInProgress(false); } - + + if (bytesTransfered < 0) { + // Remember that we encountered an error so that getSocketInfoIfRunning + // will correctly cause us to fail if another part of Gecko + // (erroneously) calls an I/O function (PR_Send/PR_Recv/etc.) again on + // this socket. Note that we use the original error because if we use + // PR_CONNECT_RESET_ERROR, we'll repeated try to reconnect. + if (originalError != PR_WOULD_BLOCK_ERROR && !socketInfo->GetErrorCode()) { + socketInfo->SetCanceled(originalError, PlainErrorMessage); + } + PR_SetError(err, 0); + } + return bytesTransfered; }

1 0

[tor-browser/esr24] Bug 970031 - Re-apply bug 761077 to unbreak xptcall build on FreeBSD sparc64. r=froydnj, a=NPOTB
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1bf8bdab12367d044439edd5c4bb5c5e53420445 Author: Jan Beich <jbeich(a)tormail.org> Date: Tue Feb 11 17:03:40 2014 -0500 Bug 970031 - Re-apply bug 761077 to unbreak xptcall build on FreeBSD sparc64. r=froydnj, a=NPOTB --- xpcom/reflect/xptcall/src/md/unix/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build index f18de2e..0081168 100644 --- a/xpcom/reflect/xptcall/src/md/unix/moz.build +++ b/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -235,7 +235,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'sparc': 'xptcstubs_sparc_openbsd.cpp', ] -if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'sparc64': +if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD') and CONFIG['OS_TEST'] == 'sparc64': CPP_SOURCES += [ 'xptcinvoke_sparc64_openbsd.cpp', 'xptcstubs_sparc64_openbsd.cpp',

1 0

[tor-browser/esr24] Bug 912322 - Stop making XBL methods available to the web. r=bz a=sylvestre
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b0f60cb668c5a37f2be4dfc4aa87e5bb0d707dac Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Mon Feb 10 14:07:27 2014 -0800 Bug 912322 - Stop making XBL methods available to the web. r=bz a=sylvestre --- dom/webidl/Document.webidl | 5 +++- js/xpconnect/tests/mochitest/Makefile.in | 1 + js/xpconnect/tests/mochitest/test_bug912322.html | 35 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dom/webidl/Document.webidl b/dom/webidl/Document.webidl index 2233af8..4805a74 100644 --- a/dom/webidl/Document.webidl +++ b/dom/webidl/Document.webidl @@ -277,11 +277,14 @@ partial interface Document { partial interface Document { // nsIDOMDocumentXBL. Wish we could make these [ChromeOnly], but // that would likely break bindings running with the page principal. + [Func="IsChromeOrXBL"] NodeList? getAnonymousNodes(Element elt); + [Func="IsChromeOrXBL"] Element? getAnonymousElementByAttribute(Element elt, DOMString attrName, DOMString attrValue); + [Func="IsChromeOrXBL"] Element? getBindingParent(Node node); - [Throws] + [Throws, Func="IsChromeOrXBL"] void loadBindingDocument(DOMString documentURL); // nsIDOMDocumentTouch diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in index 4c947e9..e3e1b63 100644 --- a/js/xpconnect/tests/mochitest/Makefile.in +++ b/js/xpconnect/tests/mochitest/Makefile.in @@ -96,6 +96,7 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \ test_bug865260.html \ test_bug870423.html \ test_bug871887.html \ + test_bug912322.html \ file_crosscompartment_weakmap.html \ test_crosscompartment_weakmap.html \ test_asmjs.html \ diff --git a/js/xpconnect/tests/mochitest/test_bug912322.html b/js/xpconnect/tests/mochitest/test_bug912322.html new file mode 100644 index 0000000..22fcc9f --- /dev/null +++ b/js/xpconnect/tests/mochitest/test_bug912322.html @@ -0,0 +1,35 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="utf-8"> + <title>Test for Bug 912322</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> + <script type="application/javascript"> + + /** Test that XBL functions aren't exposed to the web. **/ + funs = ['getAnonymousNodes', 'getAnonymousElementByAttribute', + 'getBindingParent', 'loadBindingDocument']; + for (var f of funs) { + ok(!(f in document), f + " should not be available to content"); + ok(f in SpecialPowers.wrap(document), f + " should be available to chrome via Xray"); + } + + + + + </script> +</head> +<body> +<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=912322">Mozilla Bug 912322</a> +<p id="display"></p> +<div id="content" style="display: none"> + +</div> +<pre id="test"> +</pre> +</body> +</html>

1 0

[tor-browser/esr24] Bug 912322 - Update semantics of IsChromeOrXBL to return true for remote XUL. r=bz
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit c13c8f0e40eaeed7a7f31f1f7fdbe48001ce3671 Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Mon Feb 10 14:07:27 2014 -0800 Bug 912322 - Update semantics of IsChromeOrXBL to return true for remote XUL. r=bz This brings us into alignment with nsContentUtils::IsCallerXBL(). We also take the opportunity to clean up some comments and invariants that changed with the removal of the XBL bit. --- js/xpconnect/src/XPCWrappedNativeScope.cpp | 9 +++++++++ js/xpconnect/src/nsXPConnect.cpp | 13 ++++++++++--- js/xpconnect/src/xpcprivate.h | 17 +++++++---------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp index c3a0780..223fcc4 100644 --- a/js/xpconnect/src/XPCWrappedNativeScope.cpp +++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp @@ -266,6 +266,15 @@ XPCWrappedNativeScope::EnsureXBLScope(JSContext *cx) return mXBLScope; } +bool +XPCWrappedNativeScope::AllowXBLScope() +{ + // We only disallow XBL scopes in remote XUL situations. + MOZ_ASSERT_IF(!mAllowXBLScope, + nsContentUtils::AllowXULXBLForPrincipal(GetPrincipal())); + return mAllowXBLScope; +} + namespace xpc { JSObject *GetXBLScope(JSContext *cx, JSObject *contentScopeArg) { diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp index 12a8fd0..67d4fb1 100644 --- a/js/xpconnect/src/nsXPConnect.cpp +++ b/js/xpconnect/src/nsXPConnect.cpp @@ -1713,9 +1713,16 @@ namespace dom { bool IsChromeOrXBL(JSContext* cx, JSObject* /* unused */) { - JSCompartment* compartment = js::GetContextCompartment(cx); - return AccessCheck::isChrome(compartment) || - IsXBLScope(compartment); + MOZ_ASSERT(NS_IsMainThread()); + JSCompartment* c = js::GetContextCompartment(cx); + + // For remote XUL, we run XBL in the XUL scope. Given that we care about + // compat and not security for remote XUL, we just always claim to be XBL. + // + // Note that, for performance, we don't check AllowXULXBLForPrincipal here, + // and instead rely on the fact that AllowXBLScope() only returns false in + // remote XUL situations. + return AccessCheck::isChrome(c) || IsXBLScope(c) || !AllowXBLScope(c); } } // namespace dom diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index b63c634..af1cf89 100644 --- a/js/xpconnect/src/xpcprivate.h +++ b/js/xpconnect/src/xpcprivate.h @@ -1435,7 +1435,7 @@ public: nsAutoPtr<JSObject2JSObjectMap> mWaiverWrapperMap; bool IsXBLScope() { return mIsXBLScope; } - bool AllowXBLScope() { return mAllowXBLScope; } + bool AllowXBLScope(); bool UseXBLScope() { return mUseXBLScope; } protected: @@ -1472,20 +1472,17 @@ private: bool mIsXBLScope; - // There are certain cases where we explicitly disallow XBL scopes: they - // can be prefed off, or we might be running in a remote XUL domain where - // we want to run all XBL in content to maintain compat. We separately + // For remote XUL domains, we run all XBL in the content scope for compat + // reasons (though we sometimes pref this off for automation). We separately // track the result of this decision (mAllowXBLScope), from the decision // of whether to actually _use_ an XBL scope (mUseXBLScope), which depends // on the type of global and whether the compartment is system principal // or not. // - // This distinction is useful primarily because it tells us whether we - // can infer the XBL-ness of a caller by checking that the caller is - // running in an XBL scope, or whether we need to check the XBL bit on the - // script. The XBL bit is nasty, so we want to consult it only if we - // absolutely have to, which should generally happen only in unsupported - // pref configurations. + // This distinction is useful primarily because, if true, we know that we + // have no way of distinguishing XBL script from content script for the + // given scope. In these (unsupported) situations, we just always claim to + // be XBL. bool mAllowXBLScope; bool mUseXBLScope; };

1 0

[tor-browser/esr24] Bug 925747 - Patch file extraction cleanup. r=bbondy, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6ff583446d721fdda2c272fb0d6ee108427c4304 Author: Robert Strong <robert.bugzilla(a)gmail.com> Date: Mon Jan 27 10:50:54 2014 -0800 Bug 925747 - Patch file extraction cleanup. r=bbondy, a=sledru --- .../macbuild/Contents/_CodeSignature/CodeResources | 12 ++++++++++ toolkit/mozapps/update/test/unit/head_update.js.in | 23 ++++++++++++++++++++ toolkit/mozapps/update/updater/updater.cpp | 10 +++++++-- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/browser/app/macbuild/Contents/_CodeSignature/CodeResources b/browser/app/macbuild/Contents/_CodeSignature/CodeResources index 22666b9..6f6e20e 100644 --- a/browser/app/macbuild/Contents/_CodeSignature/CodeResources +++ b/browser/app/macbuild/Contents/_CodeSignature/CodeResources @@ -54,6 +54,18 @@ <key>weight</key> <real>10</real> </dict> + <key>^Updated.app/.*</key><dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^updating/.*</key><dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> </dict> </dict> </plist> diff --git a/toolkit/mozapps/update/test/unit/head_update.js.in b/toolkit/mozapps/update/test/unit/head_update.js.in index 974afa4..68a19e1 100644 --- a/toolkit/mozapps/update/test/unit/head_update.js.in +++ b/toolkit/mozapps/update/test/unit/head_update.js.in @@ -424,6 +424,22 @@ function getUpdatedDirPath() { } /** + * Helper function for getting the updating directory which is used by the + * updater to extract the update manifest and patch files. + * + * @return nsIFile for the directory for the updating directory. + */ +function getUpdatingDir() { + let updatingDir = getApplyDirFile(null, true); + + if (IS_MACOSX) { + updatingDir = updatingDir.parent.parent; + } + updatingDir.append("updating"); + return updatingDir; +} + +/** * Helper function for getting the nsIFile for the directory where the update * has been applied. * @@ -650,6 +666,9 @@ function runUpdate() { updateSettingsIni.moveTo(updateSettingsIni.parent, FILE_UPDATE_SETTINGS_INI); } + logTestInfo("testing updating directory doesn't exist"); + do_check_false(getUpdatingDir().exists()); + return process.exitValue; } @@ -1015,6 +1034,10 @@ function runUpdateUsingService(aInitialStatus, aExpectedStatus, if (aCheckSvcLog) { checkServiceLogs(svcOriginalLog); } + + logTestInfo("testing updating directory doesn't exist"); + do_check_false(getUpdatingDir().exists()); + aCallback(); } diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index eae3ce3..927f77e 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -1394,7 +1394,7 @@ PatchFile::Prepare() mPatchIndex = sPatchIndex++; NS_tsnprintf(spath, sizeof(spath)/sizeof(spath[0]), - NS_T("%s/%d.patch"), gSourcePath, mPatchIndex); + NS_T("%s/updating/%d.patch"), gDestinationPath, mPatchIndex); NS_tremove(spath); @@ -2230,6 +2230,10 @@ UpdateThreadFunc(void *param) if (rv == OK) { rv = DoUpdate(); gArchiveReader.Close(); + NS_tchar updatingDir[MAXPATHLEN]; + NS_tsnprintf(updatingDir, sizeof(updatingDir)/sizeof(updatingDir[0]), + NS_T("%s/updating"), gDestinationPath); + ensure_remove_recursive(updatingDir); } } @@ -3644,7 +3648,8 @@ int DoUpdate() { NS_tchar manifest[MAXPATHLEN]; NS_tsnprintf(manifest, sizeof(manifest)/sizeof(manifest[0]), - NS_T("%s/update.manifest"), gSourcePath); + NS_T("%s/updating/update.manifest"), gDestinationPath); + ensure_parent_dir(manifest); // extract the manifest int rv = gArchiveReader.ExtractFile("updatev2.manifest", manifest); @@ -3657,6 +3662,7 @@ int DoUpdate() } NS_tchar *rb = GetManifestContents(manifest); + NS_tremove(manifest); if (rb == NULL) { LOG(("DoUpdate: error opening manifest file: " LOG_S, manifest)); return READ_ERROR;

1 0

[tor-browser/esr24] Bug 958867 - Consistent OwningObject handling in IDBFactory::Create methods. r=bent, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1b768e2f4c6ed464264efaef40d7c8efda730ab3 Author: Olli Pettay <Olli.Pettay(a)helsinki.fi> Date: Sun Jan 12 04:45:15 2014 +0200 Bug 958867 - Consistent OwningObject handling in IDBFactory::Create methods. r=bent, a=sledru --- dom/indexedDB/IDBFactory.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index 43a6cc4..1e7b73a 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -133,6 +133,9 @@ IDBFactory::Create(nsPIDOMWindow* aWindow, factory->mWindow = aWindow; factory->mContentParent = aContentParent; + NS_HOLD_JS_OBJECTS(factory, IDBFactory); + factory->mRootedOwningObject = true; + if (!IndexedDatabaseManager::IsMainProcess()) { TabChild* tabChild = GetTabChildFrom(aWindow); NS_ENSURE_TRUE(tabChild, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);

1 0

[tor-browser/esr24] Bug 912322 - Fix tests. r=bz
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5cd158557d04d3918b9911f624777a3f44fb1007 Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Mon Feb 10 14:07:27 2014 -0800 Bug 912322 - Fix tests. r=bz The crashtest changes are untested (aside from the fact that they don't crash). --- content/base/crashtests/308120-1.xul | 2 +- content/base/crashtests/330925-1.xhtml | 2 +- content/base/crashtests/401993-1.html | 2 +- content/base/test/test_base.xhtml | 2 +- content/base/test/test_bug330925.xhtml | 9 +++++---- content/base/test/test_bug372086.html | 4 ++-- content/base/test/test_bug444030.xhtml | 2 +- content/html/content/crashtests/465466-1.xhtml | 2 +- content/xbl/crashtests/472260-1.xhtml | 2 +- content/xbl/test/file_bug379959_cross.html | 4 ++-- content/xbl/test/file_bug379959_data.html | 2 +- content/xbl/test/file_bug591198_inner.html | 2 +- content/xbl/test/test_bug378866.xhtml | 2 +- content/xbl/test/test_bug468210.xhtml | 2 +- content/xslt/tests/mochitest/test_bug319374.xhtml | 9 ++++++--- content/xul/content/crashtests/326864-1.xul | 10 +++++++--- content/xul/content/crashtests/384740-1.xul | 2 +- dom/base/crashtests/404869-1.xul | 2 +- dom/indexedDB/test/head.js | 2 +- js/xpconnect/crashtests/471366-1.html | 2 +- layout/base/crashtests/379105-1.xhtml | 2 +- layout/inspector/tests/test_bug522601.xhtml | 2 +- layout/reftests/bugs/495385-2f.xhtml | 18 ++++++++++++++---- layout/reftests/bugs/reftest.list | 2 +- .../test/test_selectors_on_anonymous_content.html | 2 +- layout/xul/base/src/crashtests/328135-1.xul | 2 +- layout/xul/base/src/crashtests/329477-1.xhtml | 4 ++-- toolkit/content/tests/widgets/test_popupanchor.xul | 2 +- 28 files changed, 59 insertions(+), 41 deletions(-) diff --git a/content/base/crashtests/308120-1.xul b/content/base/crashtests/308120-1.xul index dc8a21c..55963d7 100644 --- a/content/base/crashtests/308120-1.xul +++ b/content/base/crashtests/308120-1.xul @@ -1,3 +1,3 @@ -<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="var button=document.getElementsByTagName('button')[0]; try { button.appendChild(document.getAnonymousNodes(button)[0]); } catch(e) { }"> +<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="var button=document.getElementsByTagName('button')[0]; try { button.appendChild(SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(button))[0]); } catch(e) { }"> <button/> </window> diff --git a/content/base/crashtests/330925-1.xhtml b/content/base/crashtests/330925-1.xhtml index 02e1dac..7dac837 100644 --- a/content/base/crashtests/330925-1.xhtml +++ b/content/base/crashtests/330925-1.xhtml @@ -10,7 +10,7 @@ function init() var emb = document.getElementById("emb"); try { - foopy.appendChild(document.getAnonymousNodes(emb)[0]); + foopy.appendChild(SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(emb))[0]); emb.parentNode.removeChild(emb); foopy.parentNode.removeChild(foopy); } catch (e) { diff --git a/content/base/crashtests/401993-1.html b/content/base/crashtests/401993-1.html index ba071e2..b8679df 100644 --- a/content/base/crashtests/401993-1.html +++ b/content/base/crashtests/401993-1.html @@ -11,7 +11,7 @@ function s() function boom() { - var nodes = document.getAnonymousNodes(x); + var nodes = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(x)); if (!nodes) { setTimeout(boom, 10); return; diff --git a/content/base/test/test_base.xhtml b/content/base/test/test_base.xhtml index 41e5bbc..b77551a 100644 --- a/content/base/test/test_base.xhtml +++ b/content/base/test/test_base.xhtml @@ -40,7 +40,7 @@ addLoadEvent(function() { "http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml", "http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml#shesellsse…", ]; - node = document.getAnonymousNodes(document.getElementById("bound"))[0]; + node = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById("bound")))[0]; while(node) { is(node.baseURI, svgExpected.shift(), "node base"); node = node.firstChild; diff --git a/content/base/test/test_bug330925.xhtml b/content/base/test/test_bug330925.xhtml index 3784bd1..a26ab94 100644 --- a/content/base/test/test_bug330925.xhtml +++ b/content/base/test/test_bug330925.xhtml @@ -46,20 +46,21 @@ addLoadEvent(init); function init() { var t = document.getElementById("t"); + var d = SpecialPowers.wrap(document); - is(document.getBindingParent(document.getAnonymousNodes(t)[0]), + is(SpecialPowers.unwrap(d.getBindingParent(d.getAnonymousNodes(t)[0])), t, "Wrong binding parent for anonymous node"); - is(document.getBindingParent(document.getAnonymousNodes(t)[1].childNodes[0]), + is(SpecialPowers.unwrap(d.getBindingParent(d.getAnonymousNodes(t)[1].childNodes[0])), t, "Wrong binding parent for child of anonymous node"); - is(document.getBindingParent(t), + is(d.getBindingParent(t), null, "Non-anonymous node should not have a binding parent"); - is(document.getBindingParent(document.documentElement), + is(d.getBindingParent(document.documentElement), null, "Document element should not have a binding parent"); diff --git a/content/base/test/test_bug372086.html b/content/base/test/test_bug372086.html index d439215..43d8c6e 100644 --- a/content/base/test/test_bug372086.html +++ b/content/base/test/test_bug372086.html @@ -42,7 +42,7 @@ function runTest() { is(range.endOffset, 3, "Unexpected end offset"); is(range.toString(), "bc", "Unexpected range serialization"); - var anon = document.getAnonymousNodes($("d"))[0]; + var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("d")))[0]; // Should collapse the range, because can't determine order range.setEnd(anon, 2); is(range.startContainer, anon, "Unexpected collapsed start container"); @@ -59,7 +59,7 @@ function runTest() { is(range.endOffset, 2, "Unexpected end offset after"); is(range.toString(), "de", "Unexpected range serialization after"); - anon = document.getAnonymousNodes($("d"))[2]; + anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("d")))[2]; // Collapses because one endpoint is anonymous from point of view of // the other. range.setStart(anon, 1); diff --git a/content/base/test/test_bug444030.xhtml b/content/base/test/test_bug444030.xhtml index 92f6ba0..6ba2c6e 100644 --- a/content/base/test/test_bug444030.xhtml +++ b/content/base/test/test_bug444030.xhtml @@ -26,7 +26,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=444030 /** Test for Bug 444030 **/ function doTest() { - var anonTextNode = document.getAnonymousNodes(document.getElementById("boundElement"))[0]; + var anonTextNode = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById("boundElement")))[0]; var hadException = false; try { var wholeText = anonTextNode.wholeText; diff --git a/content/html/content/crashtests/465466-1.xhtml b/content/html/content/crashtests/465466-1.xhtml index d1b85da..4e12587 100644 --- a/content/html/content/crashtests/465466-1.xhtml +++ b/content/html/content/crashtests/465466-1.xhtml @@ -11,7 +11,7 @@ function boom() { var f = document.getElementById("f"); - var anon = document.getAnonymousNodes(f)[0]; + var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(f))[0]; document.body.removeChild(f); anon.appendChild(document.createElement("label")); } diff --git a/content/xbl/crashtests/472260-1.xhtml b/content/xbl/crashtests/472260-1.xhtml index 4b8d97f..49d5407 100644 --- a/content/xbl/crashtests/472260-1.xhtml +++ b/content/xbl/crashtests/472260-1.xhtml @@ -12,7 +12,7 @@ function boom() { var bo = document.getElementById("bo"); - var anon = document.getAnonymousNodes(bo)[0]; + var anon = SpecialPowers.wrap(document).getAnonymousNodes(bo)[0]; bo.style.MozBinding = "url(#bar)"; diff --git a/content/xbl/test/file_bug379959_cross.html b/content/xbl/test/file_bug379959_cross.html index 29a456d..8f356d2 100644 --- a/content/xbl/test/file_bug379959_cross.html +++ b/content/xbl/test/file_bug379959_cross.html @@ -16,9 +16,9 @@ <div id="div2"></div> <script> onload = function() { - nodes = document.getAnonymousNodes(document.getElementById('div1')); + nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('div1')); parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888"); - nodes = document.getAnonymousNodes(document.getElementById('div2')); + nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('div2')); parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888"); } </script> diff --git a/content/xbl/test/file_bug379959_data.html b/content/xbl/test/file_bug379959_data.html index a84b63c..dd10176 100644 --- a/content/xbl/test/file_bug379959_data.html +++ b/content/xbl/test/file_bug379959_data.html @@ -11,7 +11,7 @@ <div id="d"></div> <script> onload = function() { - nodes = document.getAnonymousNodes(document.getElementById('d')); + nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('d')); parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888"); } </script> diff --git a/content/xbl/test/file_bug591198_inner.html b/content/xbl/test/file_bug591198_inner.html index 12fc9f5..89b547a 100644 --- a/content/xbl/test/file_bug591198_inner.html +++ b/content/xbl/test/file_bug591198_inner.html @@ -22,7 +22,7 @@ function sendResults() { try { res.anonChildCount = - document.getAnonymousNodes(document.getElementById('b')).length; + SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('b')).length; } catch (ex) {} diff --git a/content/xbl/test/test_bug378866.xhtml b/content/xbl/test/test_bug378866.xhtml index d4de492..8dcbf11 100644 --- a/content/xbl/test/test_bug378866.xhtml +++ b/content/xbl/test/test_bug378866.xhtml @@ -33,7 +33,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=378866 /** Test for Bug 378866 **/ function runTest() { - var anon = document.getAnonymousNodes(document.getElementById('grandparent')); + var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('grandparent'))); var child = document.getElementById('child'); var insertionPoint = anon[0].childNodes[0]; insertionPoint.parentNode.removeChild(insertionPoint); diff --git a/content/xbl/test/test_bug468210.xhtml b/content/xbl/test/test_bug468210.xhtml index f930880..04434fd 100644 --- a/content/xbl/test/test_bug468210.xhtml +++ b/content/xbl/test/test_bug468210.xhtml @@ -32,7 +32,7 @@ addLoadEvent(function() { var div = $("d"); var n = document.anchors.length; is(n, 1, "Unexpected number of anchors"); - var anon = document.getAnonymousNodes(div)[0]; + var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(div))[0]; is(anon instanceof HTMLSpanElement, true, "Unexpected node"); is(anon.parentNode, div, "Unexpected parent"); document.body.appendChild(div); diff --git a/content/xslt/tests/mochitest/test_bug319374.xhtml b/content/xslt/tests/mochitest/test_bug319374.xhtml index c891fb3..a3496b7 100644 --- a/content/xslt/tests/mochitest/test_bug319374.xhtml +++ b/content/xslt/tests/mochitest/test_bug319374.xhtml @@ -31,6 +31,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374 // cause non-anonymous XPath result to throw exceptions.. var counter = 0; var error = null; + function getAnonymousNodes(e) { + return SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(e)); + } try { var xp = new XPathEvaluator(); var result = xp.evaluate("*", @@ -42,7 +45,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374 var res = null; while (res = result.iterateNext()) { ++counter; - var anon = document.getAnonymousNodes(res); + var anon = getAnonymousNodes(res); anon[0].removeChild(anon[0].firstChild); // Removing a child node anon[0].removeAttribute("attr1"); // Removing an attribute anon[1].firstChild.data = "anon text changed" // Modifying text data @@ -56,10 +59,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374 // Test 2: If the context node is in anonymous content, changing some // other anonymous tree shouldn't cause XPath result to throw. var anonAttr1 = - document.getAnonymousNodes(document.getElementById('content'). + getAnonymousNodes(document.getElementById('content'). firstChild)[0].getAttributeNode('attr'); var anonAttr2 = - document.getAnonymousNodes(document.getElementById('content'). + getAnonymousNodes(document.getElementById('content'). lastChild)[0].getAttributeNode('attr'); var resultAttr = null; try { diff --git a/content/xul/content/crashtests/326864-1.xul b/content/xul/content/crashtests/326864-1.xul index 154b134..5515ca2 100644 --- a/content/xul/content/crashtests/326864-1.xul +++ b/content/xul/content/crashtests/326864-1.xul @@ -6,13 +6,17 @@ <script> +function getAnonymousNodes(e) { + return SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(e)); +} + function init() { var tt = document.getElementById("textbox"); - var hb = document.getAnonymousNodes(tt)[0]; // hbox - var men = document.getAnonymousNodes(hb)[1]; // menupopup + var hb = getAnonymousNodes(tt)[0]; // hbox + var men = getAnonymousNodes(hb)[1]; // menupopup var menitem = men.childNodes[0]; // menuitem - var hb2 = document.getAnonymousNodes(menitem)[1]; // hbox + var hb2 = getAnonymousNodes(menitem)[1]; // hbox var label2 = hb2.childNodes[0]; // label men.menu = null; diff --git a/content/xul/content/crashtests/384740-1.xul b/content/xul/content/crashtests/384740-1.xul index 3f47b47..374f47c 100644 --- a/content/xul/content/crashtests/384740-1.xul +++ b/content/xul/content/crashtests/384740-1.xul @@ -12,7 +12,7 @@ function boom() var scrollbar = document.createElementNS(XUL_NS, 'scrollbar'); document.documentElement.appendChild(scrollbar); - var sbb = document.getAnonymousNodes(scrollbar)[0]; + var sbb = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(scrollbar))[0]; var action = document.createElementNS(XUL_NS, 'action'); action.setAttribute('datasources', ""); sbb.appendChild(action); diff --git a/dom/base/crashtests/404869-1.xul b/dom/base/crashtests/404869-1.xul index e530f7e..f5c7fac 100644 --- a/dom/base/crashtests/404869-1.xul +++ b/dom/base/crashtests/404869-1.xul @@ -10,7 +10,7 @@ function boom() { var menupopup = document.getElementById("menupopup"); - var x = document.getAnonymousNodes(menupopup)[0]; + var x = SpecialPowers.wrap(document).getAnonymousNodes(menupopup)[0]; menupopup.style.MozBinding = "url('#empty')"; for (var ppp in x) { } diff --git a/dom/indexedDB/test/head.js b/dom/indexedDB/test/head.js index 514b509..f47bead 100644 --- a/dom/indexedDB/test/head.js +++ b/dom/indexedDB/test/head.js @@ -60,7 +60,7 @@ function triggerSecondaryCommand(popup, index) // Cancel the arrow panel slide-in transition (bug 767133) such that // it won't interfere with us interacting with the dropdown. - document.getAnonymousNodes(popup)[0].style.transition = "none"; + SpecialPowers.wrap(document).getAnonymousNodes(popup)[0].style.transition = "none"; notification.button.focus(); diff --git a/js/xpconnect/crashtests/471366-1.html b/js/xpconnect/crashtests/471366-1.html index 75d0f25..b450d5e 100644 --- a/js/xpconnect/crashtests/471366-1.html +++ b/js/xpconnect/crashtests/471366-1.html @@ -3,7 +3,7 @@ <head> <script type="text/javascript"> -document.getAnonymousNodes({__proto__: XPCNativeWrapper.prototype}); +SpecialPowers.wrap(document).getAnonymousNodes({__proto__: XPCNativeWrapper.prototype}); </script> </head> diff --git a/layout/base/crashtests/379105-1.xhtml b/layout/base/crashtests/379105-1.xhtml index 662ebbd..e20cced 100644 --- a/layout/base/crashtests/379105-1.xhtml +++ b/layout/base/crashtests/379105-1.xhtml @@ -25,7 +25,7 @@ function boom1() function boom2() { - var nodes = document.getAnonymousNodes(xbltarget); + var nodes = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(xbltarget)); if (!nodes) { setTimeout(boom2, 10); return; diff --git a/layout/inspector/tests/test_bug522601.xhtml b/layout/inspector/tests/test_bug522601.xhtml index 8a94fe6..344dc61 100644 --- a/layout/inspector/tests/test_bug522601.xhtml +++ b/layout/inspector/tests/test_bug522601.xhtml @@ -106,7 +106,7 @@ addLoadEvent(function() { testFunc(walkerNonAnon, "previousNode", null, "step back past root"); - var anonDiv = document.getAnonymousNodes($("display"))[0]; + var anonDiv = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("display")))[0]; var walkerAnon = SpecialPowers.Cc["@mozilla.org/inspector/deep-tree-walker;1"] diff --git a/layout/reftests/bugs/495385-2f.xhtml b/layout/reftests/bugs/495385-2f.xhtml index 9b01963..3c35872 100644 --- a/layout/reftests/bugs/495385-2f.xhtml +++ b/layout/reftests/bugs/495385-2f.xhtml @@ -13,6 +13,19 @@ </binding> <binding id="empty2"> <content><children/><div xmlns="http://www.w3.org/1999/xhtml">Kitty</div></content> + <implementation> + <constructor> + // We used to do this in an onload handler, but getAnonymousNodes is no + // longer accessible to content, and we can't use SpecialPowers in + // reftests. So we enable XBL scopes and take advantage of the fact that XBL + // scopes can access these functions. We apply this binding + // programatically to make absolutely sure this constructor runs after all the + // other bindings have been set up. + document.body.offsetHeight; + document.getAnonymousNodes(document.getElementById("d3"))[0].style.display = 'inline'; + document.getAnonymousNodes(document.getElementById("d4"))[2].style.display = 'inline'; + </constructor> + </implementation> </binding> </bindings> <style> @@ -21,13 +34,10 @@ body > div { border:1px solid black; margin:1em; #d1 { -moz-binding:url(#before); } #d2 { -moz-binding:url(#after); } #d3 { -moz-binding:url(#empty1); } -#d4 { -moz-binding:url(#empty2); } </style> <script> function loaded() { - document.body.offsetHeight; - document.getAnonymousNodes(document.getElementById("d3"))[0].style.display = 'inline'; - document.getAnonymousNodes(document.getElementById("d4"))[2].style.display = 'inline'; + document.getElementById('d4').style.MozBinding = "url(#empty2)"; } </script> </head> diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index d4424e4..0dbd0e6 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1370,7 +1370,7 @@ fails-if(Android) == 488685-1.html 488685-1-ref.html == 495385-2c.html 495385-2-ref.html == 495385-2d.html 495385-2-ref.html == 495385-2e.html 495385-2-ref.html -== 495385-2f.xhtml 495385-2-ref.html +pref(dom.use_xbl_scopes_for_remote_xul,true) == 495385-2f.xhtml 495385-2-ref.html == 495385-2g.html 495385-2-ref.html == 495385-2h.html 495385-2-ref.html == 495385-2i.html 495385-2-ref.html diff --git a/layout/style/test/test_selectors_on_anonymous_content.html b/layout/style/test/test_selectors_on_anonymous_content.html index 89da83fe..7a65f53 100644 --- a/layout/style/test/test_selectors_on_anonymous_content.html +++ b/layout/style/test/test_selectors_on_anonymous_content.html @@ -42,7 +42,7 @@ function run() { style_text.data = selector + "{ z-index: " + zi + " }"; var doc_div = document.getElementById("display"); - var anon_div = document.getAnonymousNodes(doc_div)[0]; + var anon_div = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(doc_div))[0]; var should_match = []; var should_not_match = []; (matches_docdiv ? should_match : should_not_match).push(doc_div); diff --git a/layout/xul/base/src/crashtests/328135-1.xul b/layout/xul/base/src/crashtests/328135-1.xul index 1a532e18..77a4679 100644 --- a/layout/xul/base/src/crashtests/328135-1.xul +++ b/layout/xul/base/src/crashtests/328135-1.xul @@ -9,7 +9,7 @@ function init() { var pop = document.getElementsByTagName("popup")[0]; - document.getAnonymousNodes(pop)[0]; + SpecialPowers.wrap(document).getAnonymousNodes(pop)[0]; eval.eee = document.documentElement; }; diff --git a/layout/xul/base/src/crashtests/329477-1.xhtml b/layout/xul/base/src/crashtests/329477-1.xhtml index 87c8bd6..fcbd3da 100644 --- a/layout/xul/base/src/crashtests/329477-1.xhtml +++ b/layout/xul/base/src/crashtests/329477-1.xhtml @@ -9,8 +9,8 @@ function init() { var textbox = document.getElementsByTagName("textbox")[0]; - var hbox = document.getAnonymousNodes(textbox)[0]; - var menupopup = document.getAnonymousNodes(hbox)[1]; + var hbox = SpecialPowers.wrap(document).getAnonymousNodes(textbox)[0]; + var menupopup = SpecialPowers.wrap(document).getAnonymousNodes(hbox)[1]; menupopup.click(); } diff --git a/toolkit/content/tests/widgets/test_popupanchor.xul b/toolkit/content/tests/widgets/test_popupanchor.xul index ec6548d..9ad60e2 100644 --- a/toolkit/content/tests/widgets/test_popupanchor.xul +++ b/toolkit/content/tests/widgets/test_popupanchor.xul @@ -383,7 +383,7 @@ SimpleTest.waitForExplicitFinish(); addEventListener("load", function() { // anchor is set by the test runner above panel = document.getElementById("testPanel"); - arrow = document.getAnonymousElementByAttribute(panel, "anonid", "arrow"); + arrow = SpecialPowers.wrap(document).getAnonymousElementByAttribute(panel, "anonid", "arrow"); // Cancel the arrow panel slide-in transition (bug 767133) so the size and // position are "stable" enough to test without jumping through hoops... arrow.style.transition = "none";

1 0

[tor-browser/esr24] Bug 894448 part 1. Move IsChromeOrXBL to xpcpublic.h. r=bholley
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 8f3244276e1f3d464239d2fe6ee44ea4a2c7f672 Author: Boris Zbarsky <bzbarsky(a)mit.edu> Date: Mon Feb 10 14:07:26 2014 -0800 Bug 894448 part 1. Move IsChromeOrXBL to xpcpublic.h. r=bholley --- content/base/public/nsINode.h | 6 ------ content/base/src/nsINode.cpp | 9 --------- dom/bindings/Codegen.py | 3 +-- dom/webidl/Node.webidl | 4 ++-- js/xpconnect/src/nsXPConnect.cpp | 13 +++++++++++++ js/xpconnect/src/xpcpublic.h | 6 ++++++ 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h index 8d725a5..2c0b0b5 100644 --- a/content/base/public/nsINode.h +++ b/content/base/public/nsINode.h @@ -1120,12 +1120,6 @@ public: return NS_OK; } - /** - * Control if GetUserData and SetUserData methods will be exposed to - * unprivileged content. - */ - static bool IsChromeOrXBL(JSContext* aCx, JSObject* /* unused */); - void LookupPrefix(const nsAString& aNamespace, nsAString& aResult); bool IsDefaultNamespace(const nsAString& aNamespaceURI) { diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp index bc93f7e..297d519 100644 --- a/content/base/src/nsINode.cpp +++ b/content/base/src/nsINode.cpp @@ -735,15 +735,6 @@ nsINode::GetUserData(JSContext* aCx, const nsAString& aKey, ErrorResult& aError) return result; } -//static -bool -nsINode::IsChromeOrXBL(JSContext* aCx, JSObject* /* unused */) -{ - JSCompartment* compartment = js::GetContextCompartment(aCx); - return xpc::AccessCheck::isChrome(compartment) || - xpc::IsXBLScope(compartment); -} - uint16_t nsINode::CompareDocumentPosition(nsINode& aOtherNode) const { diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py index a8f277f..88892d7 100644 --- a/dom/bindings/Codegen.py +++ b/dom/bindings/Codegen.py @@ -1479,8 +1479,7 @@ class MethodDefiner(PropertyDefiner): "length": 1, "flags": "0", "condition": - MemberCondition(None, - "nsINode::IsChromeOrXBL") }) + MemberCondition(None, "IsChromeOrXBL") }) if not static: stringifier = descriptor.operations['Stringifier'] diff --git a/dom/webidl/Node.webidl b/dom/webidl/Node.webidl index c6084de..2002d64 100644 --- a/dom/webidl/Node.webidl +++ b/dom/webidl/Node.webidl @@ -96,9 +96,9 @@ interface Node : EventTarget { readonly attribute DOMString? localName; boolean hasAttributes(); - [Throws, Func="nsINode::IsChromeOrXBL"] + [Throws, Func="IsChromeOrXBL"] any setUserData(DOMString key, any data, UserDataHandler? handler); - [Throws, Func="nsINode::IsChromeOrXBL"] + [Throws, Func="IsChromeOrXBL"] any getUserData(DOMString key); [ChromeOnly] readonly attribute Principal nodePrincipal; diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp index 9c6f74b..12a8fd0 100644 --- a/js/xpconnect/src/nsXPConnect.cpp +++ b/js/xpconnect/src/nsXPConnect.cpp @@ -1707,3 +1707,16 @@ IsXrayWrapper(JSObject *obj) } // namespace xpc +namespace mozilla { +namespace dom { + +bool +IsChromeOrXBL(JSContext* cx, JSObject* /* unused */) +{ + JSCompartment* compartment = js::GetContextCompartment(cx); + return AccessCheck::isChrome(compartment) || + IsXBLScope(compartment); +} + +} // namespace dom +} // namespace mozilla diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h index 9398f24..365f1ba5 100644 --- a/js/xpconnect/src/xpcpublic.h +++ b/js/xpconnect/src/xpcpublic.h @@ -498,6 +498,12 @@ DefineStaticJSVals(JSContext *cx); void Register(nsScriptNameSpaceManager* aNameSpaceManager); +/** + * A test for whether WebIDL methods that should only be visible to + * chrome or XBL scopes should be exposed. + */ +bool IsChromeOrXBL(JSContext* cx, JSObject* /* unused */); + } // namespace dom } // namespace mozilla

1 0

[tor-browser/esr24] Bug 912322 - Sync pref from reftest-cmdline.js to bootstrap.js. r=jgriffin
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 920a9fc53347f5a778a2d142326957381ed73198 Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Mon Feb 10 14:07:26 2014 -0800 Bug 912322 - Sync pref from reftest-cmdline.js to bootstrap.js. r=jgriffin --- layout/reftests/bugs/reftest.list | 6 +++--- layout/tools/reftest/bootstrap.js | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index a5a4512..d4424e4 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1170,9 +1170,9 @@ fuzzy(127,2) == 448193.html 448193-ref.html # == 448987.html 448987-ref.html # Disabled for now - it needs privileges != 449149-1a.html about:blank != 449149-1b.html about:blank -# Retry the above with in-content XBL behavior -test-pref(dom.use_xbl_scopes_for_remote_xul,false) fails-if(Android) != 449149-1a.html about:blank -test-pref(dom.use_xbl_scopes_for_remote_xul,false) fails-if(Android) != 449149-1b.html about:blank +# Retry the above with XBL scopes +test-pref(dom.use_xbl_scopes_for_remote_xul,true) != 449149-1a.html about:blank +test-pref(dom.use_xbl_scopes_for_remote_xul,true) != 449149-1b.html about:blank == 449149-2.html 449149-2-ref.html == 449171-1.html 449171-ref.html == 449362-1.html 449362-1-ref.html diff --git a/layout/tools/reftest/bootstrap.js b/layout/tools/reftest/bootstrap.js index a6123fc..36ab76c 100644 --- a/layout/tools/reftest/bootstrap.js +++ b/layout/tools/reftest/bootstrap.js @@ -12,6 +12,11 @@ function setDefaultPrefs() { var prefs = Components.classes["@mozilla.org/preferences-service;1"]. getService(Components.interfaces.nsIPrefService); var branch = prefs.getDefaultBranch(""); + // For mochitests, we're more interested in testing the behavior of in- + // content XBL bindings, so we set this pref to true. In reftests, we're + // more interested in testing the behavior of XBL as it works in chrome, + // so we want this pref to be false. + branch.setBoolPref("dom.use_xbl_scopes_for_remote_xul", false); branch.setBoolPref("gfx.color_management.force_srgb", true); branch.setBoolPref("browser.dom.window.dump.enabled", true); branch.setIntPref("ui.caretBlinkTime", -1);

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] No bug, Automated HSTS preload list update from host bld-linux64-ix-030 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 76d07341b98cf3d709e83a24e5a82b6bc639316c Author: ffxbld <none@none> Date: Sat Feb 8 03:16:34 2014 -0800 No bug, Automated HSTS preload list update from host bld-linux64-ix-030 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 3 ++- security/manager/boot/src/nsSTSPreloadList.inc | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index bca0870..2bd6d28 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -8,6 +8,7 @@ bassh.net: did not receive HSTS header bcrook.com: max-age too low: 86400 betnet.fr: could not connect to host bigshinylock.minazo.net: could not connect to host +blacklane.com: did not receive HSTS header braintreegateway.com: did not receive HSTS header braintreepayments.com: did not receive HSTS header browserid.org: did not receive HSTS header @@ -55,6 +56,7 @@ jottit.com: did not receive HSTS header kiwiirc.com: max-age too low: 5256000 ledgerscope.net: did not receive HSTS header liberty.lavabit.com: could not connect to host +lifeguard.aecom.com: did not receive HSTS header lists.mayfirst.org: did not receive HSTS header mail.google.com: did not receive HSTS header market.android.com: did not receive HSTS header @@ -64,7 +66,6 @@ mydigipass.com: did not receive HSTS header neonisi.com: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host -packagist.org: max-age too low: 2592000 passport.yandex.by: did not receive HSTS header passport.yandex.com: did not receive HSTS header passport.yandex.com.tr: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 312aac3..82fc0af 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(1402139132264000); +const PRTime gPreloadListExpirationTime = INT64_C(1402743927341000); class nsSTSPreload { @@ -34,8 +34,10 @@ static const nsSTSPreload kSTSPreloadList[] = { { "blog.linode.com", false }, { "blog.lookout.com", false }, { "blog.torproject.org", false }, + { "boxcryptor.com", true }, { "bugzilla.mozilla.org", true }, { "business.lookout.com", false }, + { "calyxinstitute.org", false }, { "carezone.com", false }, { "check.torproject.org", false }, { "chromiumcodereview.appspot.com", false }, @@ -86,7 +88,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "lastpass.com", false }, { "launchkey.com", true }, { "library.linode.com", false }, - { "lifeguard.aecom.com", false }, { "linode.com", false }, { "linx.net", false }, { "lockify.com", true }, @@ -116,9 +117,11 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mykolab.com", true }, { "mylookout.com", false }, { "neg9.org", false }, + { "neilwynne.com", false }, { "oplop.appspot.com", true }, { "opsmate.com", false }, { "p.linode.com", false }, + { "packagist.org", false }, { "passwd.io", true }, { "paste.linode.com", false }, { "pastebin.linode.com", false }, @@ -156,6 +159,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "writeapp.me", 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 },

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] Bug 966021 - Fix load_truetype_table in the cairo dwrite font backend. r=bas, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 52fc03cd74b5f99269698c57a2cc8a5117deaf4c Author: Jonathan Kew <jkew(a)mozilla.com> Date: Sat Feb 1 09:24:58 2014 +0000 Bug 966021 - Fix load_truetype_table in the cairo dwrite font backend. r=bas, a=lsblakk --- gfx/cairo/cairo/src/cairo-dwrite-font.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp index bc97e11..f234421 100644 --- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp +++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp @@ -1052,10 +1052,12 @@ _cairo_dwrite_load_truetype_table(void *scaled_font, return CAIRO_INT_STATUS_UNSUPPORTED; } - *length = size; - if (buffer) { - memcpy(buffer, data, size); + if (buffer && *length && (UINT32)offset < size) { + size = MIN(size - (UINT32)offset, *length); + memcpy(buffer, (const char*)data + offset, size); } + *length = size; + if (tableContext) { face->dwriteface->ReleaseFontTable(tableContext); }

1 0