August 2014 - tbb-commits - lists.torproject.org

[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 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 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 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] 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] 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] 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] 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 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 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