- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 957666 - Send back a huge retry reconnection time in delayedServerEvents.sjs. r=ehsan, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 277eb9ffa868359c16f3fd7a27bdaa67418cac7f Author: Olli Pettay <Olli.Pettay(a)helsinki.fi> Date: Wed Apr 16 20:56:20 2014 -0400 Bug 957666 - Send back a huge retry reconnection time in delayedServerEvents.sjs. r=ehsan, a=test-only --- content/base/test/delayedServerEvents.sjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/test/delayedServerEvents.sjs b/content/base/test/delayedServerEvents.sjs index 9491af2..c2d2f5d 100644 --- a/content/base/test/delayedServerEvents.sjs +++ b/content/base/test/delayedServerEvents.sjs @@ -1,7 +1,7 @@ // this will take strings_to_send.length*500 ms = 5 sec var timer = null; -var strings_to_send = ["data\r\n\nda", "ta", ":", "de", "layed1\n\n", +var strings_to_send = ["retry:999999999\ndata\r\n\nda", "ta", ":", "de", "layed1\n\n", "", "", "data:delayed2\n\n", "", ""];

1 0

[tor-browser/esr24] Bug 991471 - Fix offset when setting host on URL. r=mcmanus, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6f92a1feadf46e50286dfed67835e92038196dc2 Author: Valentin Gosu <valentin.gosu(a)gmail.com> Date: Thu Apr 10 10:23:04 2014 -0400 Bug 991471 - Fix offset when setting host on URL. r=mcmanus, a=abillings --- netwerk/base/src/nsStandardURL.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/netwerk/base/src/nsStandardURL.cpp b/netwerk/base/src/nsStandardURL.cpp index 2216580..d97718a 100644 --- a/netwerk/base/src/nsStandardURL.cpp +++ b/netwerk/base/src/nsStandardURL.cpp @@ -1476,7 +1476,14 @@ nsStandardURL::SetHost(const nsACString &input) len = flat.Length(); if (mHost.mLen < 0) { - mHost.mPos = mAuthority.mPos; + int port_length = 0; + if (mPort != -1) { + nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + port_length = buf.Length(); + } + mHost.mPos = mAuthority.mPos + mAuthority.mLen - port_length; mHost.mLen = 0; } @@ -1520,7 +1527,7 @@ nsStandardURL::SetPort(int32_t port) nsAutoCString buf; buf.Assign(':'); buf.AppendInt(port); - mSpec.Insert(buf, mHost.mPos + mHost.mLen); + mSpec.Insert(buf, mAuthority.mPos + mAuthority.mLen); mAuthority.mLen += buf.Length(); ShiftFromPath(buf.Length()); } @@ -1528,9 +1535,14 @@ nsStandardURL::SetPort(int32_t port) // Don't allow mPort == mDefaultPort port = -1; + // compute length of the current port + nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + // need to remove the port number from the URL spec - uint32_t start = mHost.mPos + mHost.mLen; - int32_t lengthToCut = mPath.mPos - start; + uint32_t start = mAuthority.mPos + mAuthority.mLen - buf.Length(); + int32_t lengthToCut = buf.Length(); mSpec.Cut(start, lengthToCut); mAuthority.mLen -= lengthToCut; ShiftFromPath(-lengthToCut); @@ -1538,9 +1550,13 @@ nsStandardURL::SetPort(int32_t port) else { // need to replace the existing port nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + uint32_t start = mAuthority.mPos + mAuthority.mLen - buf.Length(); + uint32_t length = buf.Length(); + + buf.Assign(':'); buf.AppendInt(port); - uint32_t start = mHost.mPos + mHost.mLen + 1; - uint32_t length = mPath.mPos - start; mSpec.Replace(start, length, buf); if (buf.Length() != length) { mAuthority.mLen += buf.Length() - length;

1 0

[tor-browser/esr24] Bug 969226 - Check if there is enough data to read u32 to avoid buffer overflow. r=bgirard, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5977bbe71d2afc1b836080515fb9503db4a14bfa Author: Jeff Muizelaar <jmuizelaar(a)mozilla.com> Date: Fri Apr 11 10:25:01 2014 -0400 Bug 969226 - Check if there is enough data to read u32 to avoid buffer overflow. r=bgirard, a=abillings --- gfx/qcms/iccread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gfx/qcms/iccread.c b/gfx/qcms/iccread.c index 5c72cf3..63bd090 100644 --- a/gfx/qcms/iccread.c +++ b/gfx/qcms/iccread.c @@ -1007,6 +1007,9 @@ qcms_profile* qcms_profile_from_memory(const void *mem, size_t size) source.size = size; source.valid = true; + if (size < 4) + return INVALID_PROFILE; + length = read_u32(src, 0); if (length <= size) { // shrink the area that we can read if appropriate

1 0

[tor-browser/esr24] Bug 966843 - Fix intermittent browser_615394-SSWindowState_events.js hangs. r=smacleod, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 467f9d81557f5f1222ca451340be61547b07c9ef Author: Tim Taubert <ttaubert(a)mozilla.com> Date: Mon Apr 14 12:03:18 2014 +0200 Bug 966843 - Fix intermittent browser_615394-SSWindowState_events.js hangs. r=smacleod, a=test-only --- .../sessionstore/test/browser_615394-SSWindowState_events.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js index f699083..26064be 100644 --- a/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js +++ b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -const stateBackup = ss.getBrowserState(); +const stateBackup = JSON.parse(ss.getBrowserState()); const testState = { windows: [{ tabs: [ @@ -73,8 +73,7 @@ function runNextTest() { waitForBrowserState(testState, currentTest); } else { - ss.setBrowserState(stateBackup); - finish(); + waitForBrowserState(stateBackup, finish); } }

1 0

[tor-browser/esr24] Bug 944353. If we've had a decoder error then the image is not usable. r=seth a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 92a295290dd3e45c8df0749372db1891f04e5034 Author: Timothy Nikkel <tnikkel(a)gmail.com> Date: Wed Feb 26 21:48:51 2014 -0600 Bug 944353. If we've had a decoder error then the image is not usable. r=seth a=sledru This matches what RasterImage will do. --- image/src/Decoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/Decoder.cpp b/image/src/Decoder.cpp index 85845f6..2e3b36f 100644 --- a/image/src/Decoder.cpp +++ b/image/src/Decoder.cpp @@ -154,7 +154,7 @@ Decoder::Finish(RasterImage::eShutdownIntent aShutdownIntent) } } - bool usable = true; + bool usable = !HasDecoderError(); if (aShutdownIntent != RasterImage::eShutdownIntent_NotNeeded && !HasDecoderError()) { // If we only have a data error, we're usable if we have at least one complete frame. if (GetCompleteFrameCount() == 0) {

1 0

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

29 Aug '14

commit f1040dc694dca0a7dfb91a834bea0aa01ea64fec Author: ffxbld <none@none> Date: Sat Apr 12 03:11:06 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-084 - a=blocklist-update --- browser/app/blocklist.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 6b94ea0..5f776e3 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="1396307847000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1396993434000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -2075,6 +2075,12 @@ <pluginItem blockID="p558"> <match name="description" exp="^($|Unity Web Player version ([0-3]|(4\.([0-2]|3(\.[0-4])?[^0-9.]))))" /> <match name="filename" exp="Unity Web Player\.plugin" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange> </pluginItem> + <pluginItem blockID="p572"> + <match name="filename" exp="npdjvu\.dll" /> <versionRange minVersion="0" maxVersion="6.1.4.27993" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> + <pluginItem blockID="p574"> + <match name="filename" exp="NPDjVu\.plugin" /> <versionRange minVersion="0" maxVersion="6.1.1" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> </pluginItems> <gfxItems>

1 0

[tor-browser/esr24] Bug 944353. If we've encountered an error while decoding an image and the main thread has asked to do more decoding of that image before the main thread has acknowledged the error then refuse to decode more. r=seth a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 69f9b401dfffdc377205f0fa77d0894a812ad9d6 Author: Timothy Nikkel <tnikkel(a)gmail.com> Date: Wed Feb 26 21:48:47 2014 -0600 Bug 944353. If we've encountered an error while decoding an image and the main thread has asked to do more decoding of that image before the main thread has acknowledged the error then refuse to decode more. r=seth a=sledru --- image/src/RasterImage.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index 8b066434..42d4232 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -3398,6 +3398,11 @@ RasterImage::DecodePool::DecodeSomeOfImage(RasterImage* aImg, if (aImg->mError) return NS_OK; + // If there is an error worker pending (say because the main thread has enqueued + // another decode request for us before processing the error worker) then bail out. + if (aImg->mPendingError) + return NS_OK; + // If mDecoded or we don't have a decoder, we must have finished already (for // example, a synchronous decode request came while the worker was pending). if (!aImg->mDecoder || aImg->mDecoded)

1 0

[tor-browser/esr24] Bug 995041 - Properly disable the problematic portions of browser_aboutHome.js. a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 06467b96cdedd70af1f741d72a45a051b14288ac Author: Gavin Sharp <gavin(a)gavinsharp.com> Date: Wed Jan 8 15:58:47 2014 -0500 Bug 995041 - Properly disable the problematic portions of browser_aboutHome.js. a=test-only --- browser/base/content/test/Makefile.in | 5 ++--- browser/base/content/test/browser_aboutHome.js | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in index d41a36f..104ad59 100644 --- a/browser/base/content/test/Makefile.in +++ b/browser/base/content/test/Makefile.in @@ -67,13 +67,14 @@ MOCHITEST_BROWSER_FILES = \ browser_keywordSearch_postData.js \ POSTSearchEngine.xml \ print_postdata.sjs \ + browser_aboutHome.js \ browser_alltabslistener.js \ browser_bug304198.js \ title_test.svg \ browser_bug329212.js \ browser_bug356571.js \ browser_bug380960.js \ - browser_bug386835.js \ + browser_bug386835.js \ browser_bug405137.js \ browser_bug406216.js \ browser_bug409481.js \ @@ -360,12 +361,10 @@ MOCHITEST_BROWSER_FILES += \ endif # browser_aboutHealthReport.js disabled for frequent failures on Linux (bug 924307) -# browser_aboutHome.js disabled for frequent failures on Linux (bug 945667) # browser_CTP_context_menu.js fails intermittently on Linux (bug 909342) ifndef MOZ_WIDGET_GTK MOCHITEST_BROWSER_FILES += \ browser_aboutHealthReport.js \ - browser_aboutHome.js \ browser_CTP_context_menu.js \ $(NULL) endif diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js index a890d5f..3edbc56 100644 --- a/browser/base/content/test/browser_aboutHome.js +++ b/browser/base/content/test/browser_aboutHome.js @@ -88,11 +88,19 @@ let gTests = [ } }, +// Disabled on Linux for intermittent issues with FHR, see Bug 945667. +// Disabled always due to bug 992485 { desc: "Check that performing a search fires a search event and records to " + "Firefox Health Report.", setup: function () { }, run: function () { + // Skip this test always for now since it loads google.com and that causes bug 992485 + return; + + // Skip this test on Linux. + if (navigator.platform.indexOf("Linux") == 0) { return; } + try { let cm = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager); cm.getCategoryEntry("healthreport-js-provider-default", "SearchesProvider");

1 0

[tor-browser/esr24] No Bug - Fix browser_net_timing-division.js leak when run as the last test on a CLOSED TREE. rs=past, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit d2fd29446d9cf264383984ee0a055fe4e3f8fedd Author: Tim Taubert <tim(a)timtaubert.de> Date: Fri Apr 11 09:12:47 2014 +0200 No Bug - Fix browser_net_timing-division.js leak when run as the last test on a CLOSED TREE. rs=past, a=test-only --- browser/devtools/netmonitor/test/head.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/devtools/netmonitor/test/head.js b/browser/devtools/netmonitor/test/head.js index 16cec27..dca1dc3 100644 --- a/browser/devtools/netmonitor/test/head.js +++ b/browser/devtools/netmonitor/test/head.js @@ -115,7 +115,7 @@ function teardown(aMonitor) { let deferred = Promise.defer(); let tab = aMonitor.target.tab; - aMonitor.once("destroyed", deferred.resolve); + aMonitor.once("destroyed", () => executeSoon(deferred.resolve)); removeTab(tab); return deferred.promise;

1 0

[tor-browser/esr24] Bug 966006. r=mcmanus a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b14cced3e448b5d5eec98675909a42a156e478cb Author: Nicholas Hurley <hurley(a)todesschaf.org> Date: Tue Apr 8 12:41:17 2014 -0700 Bug 966006. r=mcmanus a=abillings --- netwerk/dns/nsHostResolver.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/netwerk/dns/nsHostResolver.cpp b/netwerk/dns/nsHostResolver.cpp index ef652f9..72eec6a 100644 --- a/netwerk/dns/nsHostResolver.cpp +++ b/netwerk/dns/nsHostResolver.cpp @@ -549,18 +549,22 @@ nsHostResolver::ResolveHost(const char *host, // For entries that are in the grace period with a failed connect, // or all cached negative entries, use the cache but start a new lookup in // the background - if ((((TimeStamp::NowLoRes() > he->rec->expiration) && - he->rec->mBlacklistedItems.Length()) || - he->rec->negative) && !he->rec->resolving) { - LOG(("Using %s cache entry for host [%s] but starting async renewal.", - he->rec->negative ? "negative" :"positive", host)); - IssueLookup(he->rec); - - if (!he->rec->negative) { - // negative entries are constantly being refreshed, only - // track positive grace period induced renewals - Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2, - METHOD_RENEWAL); + { + MutexAutoLock lock(he->rec->addr_info_lock); + + if ((((TimeStamp::NowLoRes() > he->rec->expiration) && + he->rec->mBlacklistedItems.Length()) || + he->rec->negative) && !he->rec->resolving) { + LOG(("Using %s cache entry for host [%s] but starting async renewal.", + he->rec->negative ? "negative" :"positive", host)); + IssueLookup(he->rec); + + if (!he->rec->negative) { + // negative entries are constantly being refreshed, only + // track positive grace period induced renewals + Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2, + METHOD_RENEWAL); + } } }

1 0

[tor-browser/esr24] Bug 987892 - Clear up oranges for debug mochitest-browser-chrome jobs, disable browser_connections.js test. r=armenzg, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit bce807354b26028d362f6b8afae9bdcc9aff12ce Author: Joel Maher <jmaher(a)mozilla.com> Date: Wed Apr 9 16:08:12 2014 -0400 Bug 987892 - Clear up oranges for debug mochitest-browser-chrome jobs, disable browser_connections.js test. r=armenzg, a=test-only --- browser/components/preferences/in-content/tests/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/components/preferences/in-content/tests/Makefile.in b/browser/components/preferences/in-content/tests/Makefile.in index d0a13ed..fea500e 100644 --- a/browser/components/preferences/in-content/tests/Makefile.in +++ b/browser/components/preferences/in-content/tests/Makefile.in @@ -14,7 +14,6 @@ MOCHITEST_BROWSER_FILES := \ head.js \ browser_advanced_update.js \ browser_bug731866.js \ - browser_connection.js \ browser_privacypane_1.js \ browser_privacypane_3.js \ browser_privacypane_4.js \

1 0

[tor-browser/esr24] Bug 986678 - Fix type check in TryAddTypeBarrierForWrite. r=bhackett, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 71a0e59c9902c90b02ba0a2897ad1a23a60be472 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Fri Apr 4 19:38:10 2014 +0200 Bug 986678 - Fix type check in TryAddTypeBarrierForWrite. r=bhackett, a=abillings --- js/src/jit/MIR.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp index eea62ff..ef20000 100644 --- a/js/src/jit/MIR.cpp +++ b/js/src/jit/MIR.cpp @@ -2701,10 +2701,10 @@ TryAddTypeBarrierForWrite(JSContext *cx, MBasicBlock *current, types::StackTypeS case MIRType_String: { // The property is a particular primitive type, guard by unboxing the // value before the write. - if ((*pvalue)->type() != MIRType_Value) { - // The value is a different primitive, just do a VM call as it will - // always trigger invalidation of the compiled code. - JS_ASSERT((*pvalue)->type() != propertyType); + if (!(*pvalue)->mightBeType(propertyType)) { + // The value's type does not match the property type. Just do a VM + // call as it will always trigger invalidation of the compiled code. + JS_ASSERT_IF((*pvalue)->type() != MIRType_Value, (*pvalue)->type() != propertyType); return false; } MInstruction *ins = MUnbox::New(*pvalue, propertyType, MUnbox::Fallible);

1 0

[tor-browser/esr24] Bug 986843 - Replace AutoHoldZone with AutoCompartmentRooter. r=terrence, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit dcaf26b42bbfbb61c7ed1df992c3919052fa82a9 Author: Jon Coppeard <jcoppeard(a)mozilla.com> Date: Mon Mar 24 21:45:23 2014 +0000 Bug 986843 - Replace AutoHoldZone with AutoCompartmentRooter. r=terrence, a=lsblakk --- js/src/gc/RootMarking.cpp | 2 +- js/src/gc/Zone.cpp | 11 ++++++++++- js/src/gc/Zone.h | 4 ++-- js/src/jsapi.cpp | 29 ++++++++++++++++++----------- js/src/jscompartment.cpp | 2 +- js/src/jscompartment.h | 2 +- js/src/jsgc.cpp | 8 +++++--- 7 files changed, 38 insertions(+), 20 deletions(-) diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp index 861c2d6..88574f3 100644 --- a/js/src/gc/RootMarking.cpp +++ b/js/src/gc/RootMarking.cpp @@ -744,7 +744,7 @@ js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots) #endif for (CompartmentsIter c(rt); !c.done(); c.next()) - c->mark(trc); + c->markRoots(trc); /* The embedding can register additional roots here. */ for (size_t i = 0; i < rt->gcBlackRootTracers.length(); i++) { diff --git a/js/src/gc/Zone.cpp b/js/src/gc/Zone.cpp index 5625b99..e1f0147 100644 --- a/js/src/gc/Zone.cpp +++ b/js/src/gc/Zone.cpp @@ -23,7 +23,6 @@ using namespace js::gc; JS::Zone::Zone(JSRuntime *rt) : rt(rt), allocator(this), - hold(false), ionUsingBarriers_(false), active(false), gcScheduled(false), @@ -227,3 +226,13 @@ Zone::discardJitCode(FreeOp *fop, bool discardConstraints) } #endif } + +bool +Zone::hasMarkedCompartments() +{ + for (CompartmentsInZoneIter comp(this); !comp.done(); comp.next()) { + if (comp->marked) + return true; + } + return false; +} diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h index 73e7043..d740306 100644 --- a/js/src/gc/Zone.h +++ b/js/src/gc/Zone.h @@ -108,8 +108,6 @@ struct Zone : private JS::shadow::Zone, js::CompartmentVector compartments; - bool hold; - private: bool ionUsingBarriers_; @@ -300,6 +298,8 @@ struct Zone : private JS::shadow::Zone, void sweep(js::FreeOp *fop, bool releaseTypes); + bool hasMarkedCompartments(); + private: void sweepBreakpoints(js::FreeOp *fop); }; diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 3632a74..68b6afa 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -3171,23 +3171,32 @@ JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp) return JS_TRUE; } -class AutoHoldZone +class AutoCompartmentRooter : private JS::CustomAutoRooter { public: - explicit AutoHoldZone(Zone *zone - MOZ_GUARD_OBJECT_NOTIFIER_PARAM) - : holdp(&zone->hold) + explicit AutoCompartmentRooter(JSContext *cx, JSCompartment *comp + MOZ_GUARD_OBJECT_NOTIFIER_PARAM) + : CustomAutoRooter(cx), compartment(comp) { MOZ_GUARD_OBJECT_NOTIFIER_INIT; - *holdp = true; } - ~AutoHoldZone() { - *holdp = false; + operator JSCompartment *() { + return compartment; + } + + JSCompartment *operator->() { + return compartment; + } + + protected: + virtual void trace(JSTracer *trc) + { + compartment->mark(); } private: - bool *holdp; + JSCompartment *compartment; MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER }; @@ -3209,7 +3218,7 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals, else zone = ((JSObject *)options.zoneSpec)->zone(); - JSCompartment *compartment = NewCompartment(cx, zone, principals, options); + AutoCompartmentRooter compartment(cx, NewCompartment(cx, zone, principals, options)); if (!compartment) return NULL; @@ -3218,8 +3227,6 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals, rt->systemZone->isSystem = true; } - AutoHoldZone hold(compartment->zone()); - Rooted<GlobalObject *> global(cx); { AutoCompartment ac(cx, compartment); diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp index c448e10..2e66253 100644 --- a/js/src/jscompartment.cpp +++ b/js/src/jscompartment.cpp @@ -488,7 +488,7 @@ JSCompartment::markAllCrossCompartmentWrappers(JSTracer *trc) } void -JSCompartment::mark(JSTracer *trc) +JSCompartment::markRoots(JSTracer *trc) { #ifdef JS_ION if (ionCompartment_) diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h index 6cc1bc8..1ef2ed8 100644 --- a/js/src/jscompartment.h +++ b/js/src/jscompartment.h @@ -293,7 +293,7 @@ struct JSCompartment WrapperEnum(JSCompartment *c) : js::WrapperMap::Enum(c->crossCompartmentWrappers) {} }; - void mark(JSTracer *trc); + void markRoots(JSTracer *trc); bool isDiscardingJitCode(JSTracer *trc); void sweep(js::FreeOp *fop, bool releaseTypes); void sweepCrossCompartmentWrappers(); diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 53a636e..0db550f 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -2541,8 +2541,10 @@ SweepZones(FreeOp *fop, bool lastGC) while (read < end) { Zone *zone = *read++; - if (!zone->hold && zone->wasGCStarted()) { - if (zone->allocator.arenas.arenaListsAreEmpty() || lastGC) { + if (zone->wasGCStarted()) { + if ((zone->allocator.arenas.arenaListsAreEmpty() && !zone->hasMarkedCompartments()) || + lastGC) + { zone->allocator.arenas.checkEmptyFreeLists(); if (callback) callback(zone); @@ -2723,7 +2725,7 @@ BeginMarkPhase(JSRuntime *rt) } zone->scheduledForDestruction = false; - zone->maybeAlive = zone->hold; + zone->maybeAlive = false; zone->setPreservingCode(false); }

1 0

[tor-browser/esr24] Bug 980537 - Only store FakeBackstagePass instances in mThisObjects. r=khuey, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 00d381db6844041ac1a6e3b8b6a9e2e1829c56fc Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Sun Apr 6 12:32:39 2014 -0700 Bug 980537 - Only store FakeBackstagePass instances in mThisObjects. r=khuey, a=sledru --- js/xpconnect/loader/mozJSComponentLoader.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index 06e3a30..ddc74ef 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -614,7 +614,9 @@ mozJSComponentLoader::NoteSubScript(HandleScript aScript, HandleObject aThisObje MOZ_CRASH(); } - mThisObjects.Put(aScript, aThisObject); + if (js::GetObjectJSClass(aThisObject) == &kFakeBackstagePassJSClass) { + mThisObjects.Put(aScript, aThisObject); + } } // Some stack based classes for cleaning up on early return @@ -1024,7 +1026,10 @@ mozJSComponentLoader::ObjectForLocation(nsIFile *aComponentFile, MOZ_ASSERT(tableScript); } - mThisObjects.Put(tableScript, obj); + if (js::GetObjectJSClass(obj) == &kFakeBackstagePassJSClass) { + MOZ_ASSERT(mReuseLoaderGlobal); + mThisObjects.Put(tableScript, obj); + } uint32_t oldopts = JS_GetOptions(cx); JS_SetOptions(cx, oldopts | (aPropagateExceptions ? JSOPTION_DONT_REPORT_UNCAUGHT : 0));

1 0

[tor-browser/esr24] Bug 987892 - disable 1 test for perma-orange on esr24. r=armenzg, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1f5e460d063e39169d6feb889763a086e06bf47d Author: Joel Maher <jmaher(a)mozilla.com> Date: Mon Apr 7 14:53:31 2014 -0400 Bug 987892 - disable 1 test for perma-orange on esr24. r=armenzg, a=test-only --- browser/components/preferences/in-content/tests/Makefile.in | 1 - browser/components/preferences/tests/Makefile.in | 1 - 2 files changed, 2 deletions(-) diff --git a/browser/components/preferences/in-content/tests/Makefile.in b/browser/components/preferences/in-content/tests/Makefile.in index 9fe7713..d0a13ed 100644 --- a/browser/components/preferences/in-content/tests/Makefile.in +++ b/browser/components/preferences/in-content/tests/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk MOCHITEST_BROWSER_FILES := \ head.js \ browser_advanced_update.js \ - browser_bug410900.js \ browser_bug731866.js \ browser_connection.js \ browser_privacypane_1.js \ diff --git a/browser/components/preferences/tests/Makefile.in b/browser/components/preferences/tests/Makefile.in index cffc88f..459a4e9 100644 --- a/browser/components/preferences/tests/Makefile.in +++ b/browser/components/preferences/tests/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk MOCHITEST_BROWSER_FILES := \ head.js \ browser_advanced_update.js \ - browser_bug410900.js \ browser_bug705422.js \ browser_permissions.js \ browser_chunk_permissions.js \

1 0

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

29 Aug '14

commit cd05cbc3690324f656e43ff3b5ba2d5a0ae37514 Author: ffxbld <none@none> Date: Sat Apr 5 03:15:28 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-126 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 2 +- security/manager/boot/src/nsSTSPreloadList.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index ec727af..342aec9 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -34,7 +34,6 @@ email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header espra.com: could not connect to host -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 @@ -45,6 +44,7 @@ googleplex.com: could not connect to host goto.google.com: did not receive HSTS header greplin.com: did not receive HSTS header groups.google.com: did not receive HSTS header +haste.ch: could not connect to host history.google.com: did not receive HSTS header hostedtalkgadget.google.com: did not receive HSTS header id.atlassian.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index b0d59de9..2f909b9 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(1406973929143000); +const PRTime gPreloadListExpirationTime = INT64_C(1407578787593000); class nsSTSPreload { @@ -130,6 +130,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "p.linode.com", false }, { "packagist.org", false }, { "passwd.io", true }, + { "passwordbox.com", false }, { "paste.linode.com", false }, { "pastebin.linode.com", false }, { "pay.gigahost.dk", true },

1 0

[tor-browser/esr24] Bug 987140 - Return width/height from the most recent image request. r=bz, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit a183688e06b0a2674b28003370ea0e3314050e68 Author: Olli Pettay <Olli.Pettay(a)helsinki.fi> Date: Wed Mar 26 14:43:27 2014 -0400 Bug 987140 - Return width/height from the most recent image request. r=bz, a=sledru --- content/html/content/src/nsGenericHTMLElement.cpp | 2 +- content/html/content/src/nsGenericHTMLElement.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index 47e79f8..080294a 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -3293,7 +3293,7 @@ nsGenericHTMLElement::GetProperties(nsISupports** aProperties) } nsSize -nsGenericHTMLElement::GetWidthHeightForImage(imgIRequest *aImageRequest) +nsGenericHTMLElement::GetWidthHeightForImage(nsRefPtr<imgRequestProxy>& aImageRequest) { nsSize size(0,0); diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h index 955d4ea..cdf3f36 100644 --- a/content/html/content/src/nsGenericHTMLElement.h +++ b/content/html/content/src/nsGenericHTMLElement.h @@ -328,8 +328,10 @@ public: /** * Get width and height, using given image request if attributes are unset. + * Pass a reference to the image request, since the method may change the + * value and we want to use the updated value. */ - nsSize GetWidthHeightForImage(imgIRequest *aImageRequest); + nsSize GetWidthHeightForImage(nsRefPtr<imgRequestProxy>& aImageRequest); public: // Implementation for nsIContent

1 0

[tor-browser/esr24] Bug 981030 - Fix outdated stage-config in testsuite-targets.mk, r=bustage, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6adc08ba69e1667e338a85f267c5b8d8db6d75d8 Author: Andrew Halberstadt <ahalberstadt(a)mozilla.com> Date: Fri Mar 21 14:02:54 2014 -0400 Bug 981030 - Fix outdated stage-config in testsuite-targets.mk, r=bustage, a=test-only --- testing/testsuite-targets.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index b10ff0f..a679d1f 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -442,7 +442,8 @@ stage-b2g: make-stage-dir $(NSINSTALL) $(topsrcdir)/b2g/test/b2g-unittest-requirements.txt $(PKG_STAGE)/b2g stage-config: make-stage-dir - $(NSINSTALL) $(topsrcdir)/testing/config/mozharness_config.py $(PKG_STAGE)/config + $(NSINSTALL) -D $(PKG_STAGE)/config + @(cd $(topsrcdir)/testing/config && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/config && tar -xf -) stage-mochitest: make-stage-dir $(MAKE) -C $(DEPTH)/testing/mochitest stage-package

1 0

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

29 Aug '14

commit 30c57c6b6e4246523590b9d69dbe6ff38d884d68 Author: ffxbld <none@none> Date: Sat Mar 29 03:11:50 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-421 - a=blocklist-update --- browser/app/blocklist.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 9dd2a2c..cb9dca8 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="1395351978000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1396046918000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -257,6 +257,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i93" id="{68b8676b-99a5-46d1-b390-22411d8bcd61}"> + <versionRange minVersion="0" maxVersion="*"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i140" id="mozillahmpg(a)mozilla.org"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -1350,8 +1356,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i93" id="{68b8676b-99a5-46d1-b390-22411d8bcd61}"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i568" os="Darwin" id="thunder(a)xunlei.com"> + <versionRange minVersion="0" maxVersion="2.0.6" severity="1"> </versionRange> <prefs> </prefs>

1 0

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

29 Aug '14

commit 4d458df7e373774c15960e99b8fea6865b34dd25 Author: ffxbld <none@none> Date: Sat Mar 22 03:13:26 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-328 - 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 e4334c4..9dd2a2c 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="1394054454000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1395351978000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -1051,7 +1051,7 @@ </prefs> </emItem> <emItem blockID="i547" id="{87934c42-161d-45bc-8cef-ef18abe2a30c}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <versionRange minVersion="0" maxVersion="3.7.9999999999" severity="1"> </versionRange> <prefs> </prefs>

1 0

[tor-browser/esr24] Bug 981030 - Create platform specific mozharness files for storing test harness options, r=aki, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 28a5504d154c0dece36db3ca97c21e9b90380d6f Author: Andrew Halberstadt <ahalberstadt(a)mozilla.com> Date: Fri Mar 21 12:39:07 2014 -0400 Bug 981030 - Create platform specific mozharness files for storing test harness options, r=aki, a=test-only --- testing/config/mozharness/android_arm_config.py | 37 +++++++++ testing/config/mozharness/android_panda_config.py | 86 +++++++++++++++++++++ testing/config/mozharness/android_x86_config.py | 37 +++++++++ testing/config/mozharness/b2g_desktop_config.py | 18 +++++ testing/config/mozharness/b2g_emulator_config.py | 48 ++++++++++++ testing/config/mozharness/linux_config.py | 34 ++++++++ testing/config/mozharness/mac_config.py | 34 ++++++++ testing/config/mozharness/windows_config.py | 34 ++++++++ testing/config/mozharness_config.py | 28 ------- 9 files changed, 328 insertions(+), 28 deletions(-) diff --git a/testing/config/mozharness/android_arm_config.py b/testing/config/mozharness/android_arm_config.py new file mode 100644 index 0000000..06ec34a --- /dev/null +++ b/testing/config/mozharness/android_arm_config.py @@ -0,0 +1,37 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "suite_definitions": { + "mochitest": { + "run_filename": "runtestsremote.py", + "options": ["--autorun", "--close-when-done", "--dm_trans=sut", + "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s" + ], + }, + "reftest": { + "run_filename": "remotereftest.py", + "options": [ "--app=%(app)s", "--ignore-window-size", + "--bootstrap", "--enable-privilege", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s", + "--devicePort=%(device_port)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components", + "--symbols-path=%(symbols_path)s", + ], + }, + "xpcshell": { + "run_filename": "remotexpcshelltests.py", + "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s", + "--apk=%(installer_path)s", "--no-logfiles", + "--symbols-path=%(symbols_path)s", + ], + }, + }, # end suite_definitions +} diff --git a/testing/config/mozharness/android_panda_config.py b/testing/config/mozharness/android_panda_config.py new file mode 100644 index 0000000..2bafcc7 --- /dev/null +++ b/testing/config/mozharness/android_panda_config.py @@ -0,0 +1,86 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "mochitest_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", "--certificate-path=certs", + "--app=%(app_name)s", "--console-level=INFO", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--run-only-tests=android.json", "--symbols-path=%(symbols_path)s" + ], + "reftest_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", + "--app=%(app_name)s", + "--ignore-window-size", "--bootstrap", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--symbols-path=%(symbols_path)s", + "reftest/tests/layout/reftests/reftest.list" + ], + "crashtest_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", + "--app=%(app_name)s", + "--enable-privilege", "--ignore-window-size", "--bootstrap", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--symbols-path=%(symbols_path)s", + "reftest/tests/testing/crashtest/crashtests.list" + ], + "jsreftest_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", + "--app=%(app_name)s", + "--enable-privilege", "--ignore-window-size", "--bootstrap", + "--extra-profile-file=jsreftest/tests/user.js", "jsreftest/tests/jstests.list", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--symbols-path=%(symbols_path)s" + ], + "robocop_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", + "--certificate-path=certs", + "--app=%(app_name)s", "--console-level=INFO", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--symbols-path=%(symbols_path)s", + "--robocop=mochitest/robocop.ini" + ], + "xpcshell_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--manifest=xpcshell/tests/xpcshell_android.ini", + "--build-info-json=xpcshell/mozinfo.json", + "--testing-modules-dir=modules", + "--local-lib-dir=../fennec", + "--apk=../%(apk_name)s", + "--no-logfiles", + "--symbols-path=%(symbols_path)s" + ], + "jittest_options": [ + "bin/js", + "--remote", + "-j", "1", + "--deviceTransport=sut", + "--deviceIP=%(device_ip)s", + "--localLib=../tests/bin", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=tests/bin", + "--dm_trans=SUT", + "--deviceIP=%(device_ip)s", + "--localBinDir=../tests/bin", + "--apk=%(apk_path)s", + "--skip-manifest=../tests/cppunittests/android_cppunittest_manifest.txt" + ], +} diff --git a/testing/config/mozharness/android_x86_config.py b/testing/config/mozharness/android_x86_config.py new file mode 100644 index 0000000..06ec34a --- /dev/null +++ b/testing/config/mozharness/android_x86_config.py @@ -0,0 +1,37 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "suite_definitions": { + "mochitest": { + "run_filename": "runtestsremote.py", + "options": ["--autorun", "--close-when-done", "--dm_trans=sut", + "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s" + ], + }, + "reftest": { + "run_filename": "remotereftest.py", + "options": [ "--app=%(app)s", "--ignore-window-size", + "--bootstrap", "--enable-privilege", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s", + "--devicePort=%(device_port)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components", + "--symbols-path=%(symbols_path)s", + ], + }, + "xpcshell": { + "run_filename": "remotexpcshelltests.py", + "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s", + "--apk=%(installer_path)s", "--no-logfiles", + "--symbols-path=%(symbols_path)s", + ], + }, + }, # end suite_definitions +} diff --git a/testing/config/mozharness/b2g_desktop_config.py b/testing/config/mozharness/b2g_desktop_config.py new file mode 100644 index 0000000..772566c --- /dev/null +++ b/testing/config/mozharness/b2g_desktop_config.py @@ -0,0 +1,18 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "mochitest_options": [ + "--console-level=INFO", "%(test_manifest)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + "--profile=%(gaia_profile)s", "--app=%(application)s", "--desktop", + "--utility-path=%(utility_path)s", "--certificate-path=%(cert_path)s", + "--symbols-path=%(symbols_path)s", + ], + + "reftest_options": [ + "--desktop", "--profile=%(gaia_profile)s", "--appname=%(application)s", + "--symbols-path=%(symbols_path)s", "%(test_manifest)s", + ] +} diff --git a/testing/config/mozharness/b2g_emulator_config.py b/testing/config/mozharness/b2g_emulator_config.py new file mode 100644 index 0000000..d20c5f8 --- /dev/null +++ b/testing/config/mozharness/b2g_emulator_config.py @@ -0,0 +1,48 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "jsreftest_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s", + "--emulator-res=800x1000", "--logcat-dir=%(logcat_dir)s", + "--remote-webserver=%(remote_webserver)s", "--ignore-window-size", + "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + "--extra-profile-file=jsreftest/tests/user.js", + "%(test_manifest)s", + ], + + "mochitest_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--console-level=INFO", + "--emulator=%(emulator)s", "--logcat-dir=%(logcat_dir)s", + "--remote-webserver=%(remote_webserver)s", "%(test_manifest)s", + "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + ], + + "reftest_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s", + "--emulator-res=800x1000", "--logcat-dir=%(logcat_dir)s", + "--remote-webserver=%(remote_webserver)s", "--ignore-window-size", + "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + "%(test_manifest)s", + ], + + "crashtest_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s", + "--emulator-res=800x1000", "--logcat-dir=%(logcat_dir)s", + "--remote-webserver=%(remote_webserver)s", "--ignore-window-size", + "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + "%(test_manifest)s", + ], + + "xpcshell_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s", + "--logcat-dir=%(logcat_dir)s", "--manifest=%(test_manifest)s", "--use-device-libs", + "--testing-modules-dir=%(modules_dir)s", "--symbols-path=%(symbols_path)s", + "--busybox=%(busybox)s", "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + ], +} diff --git a/testing/config/mozharness/linux_config.py b/testing/config/mozharness/linux_config.py new file mode 100644 index 0000000..bba4f61 --- /dev/null +++ b/testing/config/mozharness/linux_config.py @@ -0,0 +1,34 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "reftest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s" + ], + "mochitest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--autorun", "--close-when-done", + "--console-level=INFO", "--setpref=webgl.force-enabled=true" + ], + "xpcshell_options": [ + "--symbols-path=%(symbols_path)s", + "--test-plugin-path=%(test_plugin_path)s" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=%(abs_app_dir)s" + ], + "jittest_options": [ + "tests/bin/js", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "mozbase_options": [ + "-b", "%(binary_path)s" + ], +} diff --git a/testing/config/mozharness/mac_config.py b/testing/config/mozharness/mac_config.py new file mode 100644 index 0000000..73fa299 --- /dev/null +++ b/testing/config/mozharness/mac_config.py @@ -0,0 +1,34 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "reftest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s" + ], + "mochitest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--autorun", "--close-when-done", + "--console-level=INFO" + ], + "xpcshell_options": [ + "--symbols-path=%(symbols_path)s", + "--test-plugin-path=%(test_plugin_path)s" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=%(abs_app_dir)s" + ], + "jittest_options": [ + "tests/bin/js", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "mozbase_options": [ + "-b", "%(binary_path)s" + ], +} diff --git a/testing/config/mozharness/windows_config.py b/testing/config/mozharness/windows_config.py new file mode 100644 index 0000000..73fa299 --- /dev/null +++ b/testing/config/mozharness/windows_config.py @@ -0,0 +1,34 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "reftest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s" + ], + "mochitest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--autorun", "--close-when-done", + "--console-level=INFO" + ], + "xpcshell_options": [ + "--symbols-path=%(symbols_path)s", + "--test-plugin-path=%(test_plugin_path)s" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=%(abs_app_dir)s" + ], + "jittest_options": [ + "tests/bin/js", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "mozbase_options": [ + "-b", "%(binary_path)s" + ], +} diff --git a/testing/config/mozharness_config.py b/testing/config/mozharness_config.py deleted file mode 100644 index 1f8e36a..0000000 --- a/testing/config/mozharness_config.py +++ /dev/null @@ -1,28 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -"""The config defined in this module is read by mozharness, which is a -tool used to run many of the tests reporting to TBPL. This file is -primarily useful for pushing custom test harness configurations to try. - -For example you can define a custom mochitest configuration by adding: - "mochitest_options": [ - "--appname=%(binary_path)s", "--utility-path=tests/bin", - "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", - "--certificate-path=tests/certs", "--autorun", "--close-when-done", - "--console-level=INFO", "--setpref=webgl.force-enabled=true" - ], - -Be warned that these values will be picked up by all platforms and changing them -may result in unexpected behaviour. For example, the above will break B2G -mochitests. - -You must also provide the complete command line to avoid errors. The official -configuration files containing the default values live in: - https://hg.mozilla.org/build/mozharness/configs -""" - -config = { - # Add custom mozharness config options here -}

1 0

[tor-browser/esr24] Automated checkin: version bump for thunderbird 24.4.0 release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 12d5f5524ef0b57a3cd7b7bf86c413d3a9dd494e Author: tbirdbld <none@none> Date: Sun Mar 16 15:50:47 2014 -0400 Automated checkin: version bump for thunderbird 24.4.0 release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index 6b6c02a..c0110c9 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.4.0esrpre +24.4.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 6b6c02a..c0110c9 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.4.0esrpre +24.4.0

1 0

[tor-browser/esr24] Bug 895557 - Add a test for fragment navigation during load. r=nsm, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 9259f4b43af5a48d8c1a891e372e3a3941d37887 Author: Olli Pettay <Olli.Pettay(a)helsinki.fi> Date: Sat Mar 1 20:11:30 2014 +0200 Bug 895557 - Add a test for fragment navigation during load. r=nsm, a=lsblakk --- docshell/test/navigation/Makefile.in | 1 + .../file_fragment_handling_during_load.html | 24 ++++++++++++++++++++ docshell/test/navigation/test_sessionhistory.html | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/docshell/test/navigation/Makefile.in b/docshell/test/navigation/Makefile.in index f8162b9..9d45ed0 100644 --- a/docshell/test/navigation/Makefile.in +++ b/docshell/test/navigation/Makefile.in @@ -38,6 +38,7 @@ MOCHITEST_FILES = \ file_bug462076_3.html \ file_bug508537_1.html \ file_document_write_1.html \ + file_fragment_handling_during_load.html \ file_static_and_dynamic_1.html \ frame0.html \ frame1.html \ diff --git a/docshell/test/navigation/file_fragment_handling_during_load.html b/docshell/test/navigation/file_fragment_handling_during_load.html new file mode 100644 index 0000000..fbfa0cb --- /dev/null +++ b/docshell/test/navigation/file_fragment_handling_during_load.html @@ -0,0 +1,24 @@ +<html> + <head> + <script> + var timerID = 0; + function testDone() { + clearTimeout(timerID); + var l = document.body.firstChild.contentWindow.location.href; + opener.is(l, "data:text/html,bar", "Should have loaded a new document"); + opener.nextTest(); + window.close(); + } + function test() { + var ifr = document.getElementsByTagName("iframe")[0]; + ifr.onload = testDone; + ifr.contentWindow.location.hash = "b"; + ifr.contentWindow.location.href = "data:text/html,bar"; + history.back(); + timerID = setTimeout(testDone, 2000); + } + </script> + </head> + <body onload="setTimeout(test, 0)"><iframe src="data:text/html,foo#a"></iframe> + </body> +</html> diff --git a/docshell/test/navigation/test_sessionhistory.html b/docshell/test/navigation/test_sessionhistory.html index a9ee9ec..c33df36 100644 --- a/docshell/test/navigation/test_sessionhistory.html +++ b/docshell/test/navigation/test_sessionhistory.html @@ -26,7 +26,8 @@ var testFiles = "file_bug508537_1.html", // Dynamic frames and forward-back "file_document_write_1.html", // Session history + document.write "file_static_and_dynamic_1.html",// Static and dynamic frames and forward-back - "file_bug534178.html" // Session history transaction clean-up. + "file_bug534178.html", // Session history transaction clean-up. + "file_fragment_handling_during_load.html" ]; var testCount = 0; // Used by the test files.

1 0

[tor-browser/esr24] Automated checkin: version bump for firefox 24.4.0esr release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4c92e485d8272fd50863f1ab395215e4444a865c Author: ffxbld <none@none> Date: Sat Mar 15 11:34:14 2014 -0400 Automated checkin: version bump for firefox 24.4.0esr release. DONTBUILD CLOSED TREE a=release --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 7a89ba7..2781e2b 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.3.0esrpre +24.4.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index eefa94b..6b6c02a 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.3.0 +24.4.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index eefa94b..6b6c02a 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.3.0 +24.4.0esrpre

1 0

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

29 Aug '14

commit 16de9a941b3743a09f99586e3ca2d41b26978fd3 Author: ffxbld <none@none> Date: Sat Mar 15 03:16:43 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-353 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 3 --- security/manager/boot/src/nsSTSPreloadList.inc | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 63597b7..83719ac 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -32,7 +32,6 @@ dropcam.com: did not receive HSTS header email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header -errors.zenpayroll.com: could not connect to host espra.com: could not connect to host factor.cc: could not connect to host fatzebra.com.au: did not receive HSTS header @@ -76,8 +75,6 @@ paypal.com: max-age too low: 14400 payroll.xero.com: max-age too low: 3600 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 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index eb6e1af..7269072 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(1405163237024000); +const PRTime gPreloadListExpirationTime = INT64_C(1405764355403000); class nsSTSPreload { @@ -133,8 +133,11 @@ static const nsSTSPreload kSTSPreloadList[] = { { "paymill.de", false }, { "piratenlogin.de", true }, { "pixi.me", true }, + { "plus.google.com", false }, + { "plus.sandbox.google.com", false }, { "publications.qld.gov.au", false }, { "riseup.net", true }, + { "roddis.net", false }, { "romab.com", true }, { "roundcube.mayfirst.org", false }, { "sandbox.mydigipass.com", false }, @@ -180,6 +183,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.mylookout.com", false }, { "www.noisebridge.net", false }, { "www.opsmate.com", true }, + { "www.roddis.net", false }, { "www.simbolo.co.uk", false }, { "www.simple.com", false }, { "www.therapynotes.com", false },

1 0