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

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

29 Aug '14

commit b1450ea59fa01396210dbea13d3e02a5fb229c8f Author: ffxbld <none@none> Date: Sat Apr 12 03:14:06 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-474 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 10 ++++++---- security/manager/boot/src/nsSTSPreloadList.inc | 13 ++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 342aec9..cfe99ee 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -11,7 +11,6 @@ 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 business.medbank.com.mt: did not receive HSTS header carlolly.co.uk: did not receive HSTS header @@ -25,14 +24,16 @@ codereview.chromium.org: did not receive HSTS header crate.io: did not receive HSTS header crowdcurity.com: did not receive HSTS header crypto.is: did not receive HSTS header -csawctf.poly.edu: did not receive HSTS header +csawctf.poly.edu: could not connect to host dl.google.com: did not receive HSTS header docs.google.com: did not receive HSTS header +donmez.ws: could not connect to host drive.google.com: did not receive HSTS header 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 fatzebra.com.au: did not receive HSTS header fj.simple.com: did not receive HSTS header @@ -66,7 +67,7 @@ mydigipass.com: did not receive HSTS header mykolab.com: did not receive HSTS header neonisi.com: could not connect to host nexth.de: could not connect to host -nexth.net: could not connect to host +nexth.net: did not receive HSTS header nexth.us: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host @@ -84,6 +85,7 @@ 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 +sandbox.mydigipass.com: could not connect to host saturngames.co.uk: did not receive HSTS header script.google.com: did not receive HSTS header security.google.com: did not receive HSTS header @@ -94,7 +96,7 @@ simon.butcher.name: max-age too low: 2629743 sites.google.com: did not receive HSTS header sol.io: could not connect to host souyar.de: could not connect to host -souyar.net: could not connect to host +souyar.net: did not receive HSTS header souyar.us: could not connect to host spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 2f909b9..b547933 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(1407578787593000); +const PRTime gPreloadListExpirationTime = INT64_C(1408183539445000); class nsSTSPreload { @@ -20,6 +20,7 @@ class nsSTSPreload static const nsSTSPreload kSTSPreloadList[] = { { "accounts.google.com", true }, { "aclu.org", false }, + { "activiti.alfresco.com", false }, { "aladdinschools.appspot.com", false }, { "alpha.irccloud.com", false }, { "api.intercom.io", false }, @@ -36,6 +37,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "blog.lookout.com", false }, { "blog.torproject.org", false }, { "boxcryptor.com", true }, + { "braintreepayments.com", false }, { "bugzilla.mozilla.org", true }, { "business.lookout.com", false }, { "calyxinstitute.org", false }, @@ -59,10 +61,12 @@ static const nsSTSPreload kSTSPreloadList[] = { { "dist.torproject.org", false }, { "dm.lookout.com", false }, { "dm.mylookout.com", false }, + { "docs.python.org", true }, { "download.jitsi.org", false }, { "ebanking.indovinabank.com.vn", false }, { "ecosystem.atlassian.net", true }, { "eff.org", true }, + { "encircleapp.com", true }, { "entropia.de", false }, { "epoxate.com", false }, { "errors.zenpayroll.com", false }, @@ -89,6 +93,8 @@ static const nsSTSPreload kSTSPreloadList[] = { { "inertianetworks.com", true }, { "intercom.io", false }, { "itriskltd.com", true }, + { "keeperapp.com", true }, + { "keepersecurity.com", true }, { "keyerror.com", true }, { "kinsights.com", false }, { "lastpass.com", false }, @@ -125,6 +131,8 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mylookout.com", false }, { "neg9.org", false }, { "neilwynne.com", false }, + { "onedrive.com", true }, + { "onedrive.live.com", false }, { "oplop.appspot.com", true }, { "opsmate.com", false }, { "p.linode.com", false }, @@ -141,6 +149,8 @@ static const nsSTSPreload kSTSPreloadList[] = { { "plus.google.com", false }, { "plus.sandbox.google.com", false }, { "publications.qld.gov.au", false }, + { "pypi.python.org", true }, + { "python.org", false }, { "riseup.net", true }, { "roddis.net", false }, { "romab.com", true }, @@ -190,6 +200,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.mylookout.com", false }, { "www.noisebridge.net", false }, { "www.opsmate.com", true }, + { "www.python.org", true }, { "www.simbolo.co.uk", false }, { "www.simple.com", false }, { "www.therapynotes.com", false },

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