tbb-commits

tbb-commits@lists.torproject.org

1 participants
17624 discussions

[tor-browser/esr24] Bug 989183 - Check for nsXBLJSClass on esr24. r=bz a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit bfbab2b7a05871e82aa18ac2a61d14667d8b366e Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Wed Apr 2 16:29:00 2014 -0300 Bug 989183 - Check for nsXBLJSClass on esr24. r=bz a=sledru --- content/xbl/src/nsXBLBinding.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp index 8b6133a6..9832a3c 100644 --- a/content/xbl/src/nsXBLBinding.cpp +++ b/content/xbl/src/nsXBLBinding.cpp @@ -1155,7 +1155,7 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JS::Handle<JSObject*> global, if (!::JS_LookupPropertyWithFlags(cx, global, className.get(), 0, val.address())) return NS_ERROR_OUT_OF_MEMORY; - if (val.isObject()) { + if (val.isObject() && JS_GetClass(&val.toObject())->finalize == XBLFinalize) { *aNew = false; proto = &val.toObject(); } else {

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 08927001a0ef1ba4ebf555b8fb26075c251f3e98 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 | 1 - js/src/gc/Zone.h | 2 -- js/src/jsapi.cpp | 29 ++++++++++++++++++----------- js/src/jscompartment.cpp | 2 +- js/src/jscompartment.h | 2 +- js/src/jsgc.cpp | 4 ++-- 7 files changed, 23 insertions(+), 19 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..0b6161c 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), diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h index 73e7043..39e867d 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_; 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..3157861 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -2541,7 +2541,7 @@ SweepZones(FreeOp *fop, bool lastGC) while (read < end) { Zone *zone = *read++; - if (!zone->hold && zone->wasGCStarted()) { + if (zone->wasGCStarted()) { if (zone->allocator.arenas.arenaListsAreEmpty() || lastGC) { zone->allocator.arenas.checkEmptyFreeLists(); if (callback) @@ -2723,7 +2723,7 @@ BeginMarkPhase(JSRuntime *rt) } zone->scheduledForDestruction = false; - zone->maybeAlive = zone->hold; + zone->maybeAlive = false; zone->setPreservingCode(false); }

1 0

[tor-browser/esr24] Bug 952022 - Add missing detachAsmJSModule (r=bhackett, a=lsblakk)
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit e50a64fad059458f276b9bfd45f96452be9a457c Author: Luke Wagner <luke(a)mozilla.com> Date: Tue Apr 1 09:21:09 2014 -0500 Bug 952022 - Add missing detachAsmJSModule (r=bhackett,a=lsblakk) --- js/src/jit/Ion.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp index 99f8854..83cdb27 100644 --- a/js/src/jit/Ion.cpp +++ b/js/src/jit/Ion.cpp @@ -2044,6 +2044,8 @@ InvalidateActivation(FreeOp *fop, uint8_t *ionTop, bool invalidateAll) // in case anyone tries to read it. ionScript->purgeCaches(script->zone()); + ionScript->detachDependentAsmJSModules(fop); + // This frame needs to be invalidated. We do the following: // // 1. Increment the reference counter to keep the ionScript alive

1 0

[tor-browser/esr24] Bug 919482 - Replace mozilla-banner.gif with a plain blue image in 163504-1*.html since we aren't trying to test individual pixel differences in resized image painting there. r=tn, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 502d1968c2f842ae66b17de3865c9f19f0e6a909 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Thu Mar 27 11:02:27 2014 -0400 Bug 919482 - Replace mozilla-banner.gif with a plain blue image in 163504-1*.html since we aren't trying to test individual pixel differences in resized image painting there. r=tn, a=test-only --- layout/reftests/bugs/163504-1-inner.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/layout/reftests/bugs/163504-1-inner.html b/layout/reftests/bugs/163504-1-inner.html index 85f9e15..602ce84 100644 --- a/layout/reftests/bugs/163504-1-inner.html +++ b/layout/reftests/bugs/163504-1-inner.html @@ -5,13 +5,14 @@ <style type="text/css"> html, body { height: 100%; } div { height: 3%; } +img { image-rendering: -moz-crisp-edges; } </style> </head> <body> -<div><img src="mozilla-banner.gif" width="100" style="height: 50%"></div> -<div><img src="mozilla-banner.gif" width="2" style="min-height: 50%"></div> -<div><img src="mozilla-banner.gif" width="100" style="max-height: 50%"></div> +<div><img src="blue-600x58.png" width="100" style="height: 50%"></div> +<div><img src="blue-600x58.png" width="2" style="min-height: 50%"></div> +<div><img src="blue-600x58.png" width="100" style="max-height: 50%"></div> <div><span style="position:relative; top: 30%">text</span></div> <div><span style="position:relative; bottom: 30%">text</span></div>

1 0

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

29 Aug '14

commit 94438b0c361590edb3ee667476e28ff83bdf87d5 Author: Brian R. Bondy <netzen(a)gmail.com> Date: Mon Mar 31 12:43:38 2014 -0400 Bug 961676. r=rstrong. a=abillings --- toolkit/mozapps/update/common/updatehelper.cpp | 60 ++++++++++++++++++++---- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/toolkit/mozapps/update/common/updatehelper.cpp b/toolkit/mozapps/update/common/updatehelper.cpp index 275b7dc..ab64c2d 100644 --- a/toolkit/mozapps/update/common/updatehelper.cpp +++ b/toolkit/mozapps/update/common/updatehelper.cpp @@ -23,6 +23,7 @@ #include "shlobj.h" #include "updatehelper.h" #include "pathhash.h" +#include "mozilla/Scoped.h" // Needed for PathAppendW #include <shlwapi.h> @@ -216,26 +217,67 @@ StartServiceUpdate(LPCWSTR installDir) CloseServiceHandle(manager); return FALSE; } - CloseServiceHandle(svc); - CloseServiceHandle(manager); // If we reach here, then the service is installed, so // proceed with upgrading it. + CloseServiceHandle(manager); + + // The service exists and we opened it, get the config bytes needed + DWORD bytesNeeded; + if (!QueryServiceConfigW(svc, nullptr, 0, &bytesNeeded) && + GetLastError() != ERROR_INSUFFICIENT_BUFFER) { + CloseServiceHandle(svc); + return FALSE; + } + + // Get the service config information, in particular we want the binary + // path of the service. + mozilla::ScopedDeleteArray<char> serviceConfigBuffer(new char[bytesNeeded]); + if (!QueryServiceConfigW(svc, + reinterpret_cast<QUERY_SERVICE_CONFIGW*>(serviceConfigBuffer.get()), + bytesNeeded, &bytesNeeded)) { + CloseServiceHandle(svc); + return FALSE; + } + + CloseServiceHandle(svc); + + QUERY_SERVICE_CONFIGW &serviceConfig = + *reinterpret_cast<QUERY_SERVICE_CONFIGW*>(serviceConfigBuffer.get()); + + PathUnquoteSpacesW(serviceConfig.lpBinaryPathName); + + // Obtain the temp path of the maintenance service binary + WCHAR tmpService[MAX_PATH + 1] = { L'\0' }; + if (!PathGetSiblingFilePath(tmpService, serviceConfig.lpBinaryPathName, + L"maintenanceservice_tmp.exe")) { + return FALSE; + } + + // Get the new maintenance service path from the install dir + WCHAR newMaintServicePath[MAX_PATH + 1] = { L'\0' }; + wcsncpy(newMaintServicePath, installDir, MAX_PATH); + PathAppendSafe(newMaintServicePath, + L"maintenanceservice.exe"); + + // Copy the temp file in alongside the maintenace service. + // This is a requirement for maintenance service upgrades. + if (!CopyFileW(newMaintServicePath, tmpService, FALSE)) { + return FALSE; + } + + // Start the upgrade comparison process + STARTUPINFOW si = {0}; si.cb = sizeof(STARTUPINFOW); // No particular desktop because no UI si.lpDesktop = L""; PROCESS_INFORMATION pi = {0}; - - WCHAR maintserviceInstallerPath[MAX_PATH + 1] = { L'\0' }; - wcsncpy(maintserviceInstallerPath, installDir, MAX_PATH); - PathAppendSafe(maintserviceInstallerPath, - L"maintenanceservice_installer.exe"); WCHAR cmdLine[64] = { '\0' }; - wcsncpy(cmdLine, L"dummyparam.exe /Upgrade", + wcsncpy(cmdLine, L"dummyparam.exe upgrade", sizeof(cmdLine) / sizeof(cmdLine[0]) - 1); - BOOL svcUpdateProcessStarted = CreateProcessW(maintserviceInstallerPath, + BOOL svcUpdateProcessStarted = CreateProcessW(tmpService, cmdLine, NULL, NULL, FALSE, 0,

1 0

[tor-browser/esr24] Bug 987003 - Be more careful sandboxing javascript: URLs. r=bholley, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 3f9092acb0075896fa3178c95601ffaa7f985779 Author: Boris Zbarsky <bzbarsky(a)mit.edu> Date: Wed Mar 26 21:44:25 2014 -0400 Bug 987003 - Be more careful sandboxing javascript: URLs. r=bholley, a=sledru --- dom/src/jsurl/nsJSProtocolHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp index de5ff3b..27b8ddb 100644 --- a/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -282,7 +282,8 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel, nsIXPConnect *xpc = nsContentUtils::XPConnect(); nsCOMPtr<nsIXPConnectJSObjectHolder> sandbox; - rv = xpc->CreateSandbox(cx, principal, getter_AddRefs(sandbox)); + // Important: Use a null principal here + rv = xpc->CreateSandbox(cx, nullptr, getter_AddRefs(sandbox)); NS_ENSURE_SUCCESS(rv, rv); // The nsXPConnect sandbox API gives us a wrapper to the sandbox for

1 0

[tor-browser/esr24] Bug 909305 - Replace mozilla-banner.gif with a plain blue image in 163504-2*.html since we aren't trying to test individual pixel differences in resized image painting there. r=tn, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit e8cf00433ffac6ed0c6294fe64f97910ba7710ee Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Thu Mar 27 11:02:26 2014 -0400 Bug 909305 - Replace mozilla-banner.gif with a plain blue image in 163504-2*.html since we aren't trying to test individual pixel differences in resized image painting there. r=tn, a=test-only --- layout/reftests/bugs/163504-2-inner.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/layout/reftests/bugs/163504-2-inner.html b/layout/reftests/bugs/163504-2-inner.html index 991b70c..e77cb44 100644 --- a/layout/reftests/bugs/163504-2-inner.html +++ b/layout/reftests/bugs/163504-2-inner.html @@ -5,13 +5,14 @@ <style type="text/css"> html, body { height: 100%; } div { height: 3%; } +img { image-rendering: -moz-crisp-edges; } </style> </head> <body> -<div><span><img src="mozilla-banner.gif" width="100" style="height: 50%"></span></div> -<div><span><img src="mozilla-banner.gif" width="2" style="min-height: 50%"></span></div> -<div><span><img src="mozilla-banner.gif" width="100" style="max-height: 50%"></span></div> +<div><span><img src="blue-600x58.png" width="100" style="height: 50%"></span></div> +<div><span><img src="blue-600x58.png" width="2" style="min-height: 50%"></span></div> +<div><span><img src="blue-600x58.png" width="100" style="max-height: 50%"></span></div> <div><span><span style="position:relative; top: 30%">text</span></span></div> <div><span><span style="position:relative; bottom: 30%">text</span></span></div>

1 0

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

29 Aug '14

commit 6d7f5993be49aef2dea38ef64a3188ff3c7e9a63 Author: ffxbld <none@none> Date: Sat Mar 29 03:15:06 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-445 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 11 ++++++++++- security/manager/boot/src/nsSTSPreloadList.inc | 11 ++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 83719ac..ec727af 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,3 +1,4 @@ +admin.google.com: did not receive HSTS header alpha.irccloud.com: could not connect to host api.mega.co.nz: could not connect to host api.recurly.com: did not receive HSTS header @@ -62,7 +63,11 @@ market.android.com: did not receive HSTS header medium.com: max-age too low: 2592000 my.alfresco.com: did not receive HSTS header 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.us: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host passport.yandex.by: did not receive HSTS header @@ -88,6 +93,9 @@ silentcircle.org: could not connect to host 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.us: could not connect to host spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header ssl.google-analytics.com: did not receive HSTS header @@ -116,6 +124,7 @@ www.moneybookers.com: did not receive HSTS header www.neonisi.com: could not connect to host www.paycheckrecords.com: max-age too low: 86400 www.paypal.com: max-age too low: 14400 +www.roddis.net: did not receive HSTS header www.sandbox.mydigipass.com: could not connect to host www.surfeasy.com: did not receive HSTS header -zoo24.de: did not receive HSTS header +zoo24.de: max-age too low: 2592000 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 7269072..b0d59de9 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(1405764355403000); +const PRTime gPreloadListExpirationTime = INT64_C(1406973929143000); class nsSTSPreload { @@ -69,7 +69,10 @@ static const nsSTSPreload kSTSPreloadList[] = { { "espra.com", true }, { "f-droid.org", true }, { "factor.cc", false }, + { "fairbill.com", true }, { "faq.lookout.com", false }, + { "feedbin.com", false }, + { "fiken.no", true }, { "forum.linode.com", false }, { "forum.quantifiedself.com", true }, { "gernert-server.de", true }, @@ -80,6 +83,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "grc.com", false }, { "grepular.com", true }, { "haste.ch", true }, + { "heha.co", true }, { "howrandom.org", true }, { "id.mayfirst.org", false }, { "inertianetworks.com", true }, @@ -109,6 +113,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "manager.linode.com", false }, { "matteomarescotti.name", true }, { "mattmccutchen.net", true }, + { "mbp.banking.co.at", false }, { "mediacru.sh", true }, { "mega.co.nz", false }, { "members.mayfirst.org", false }, @@ -117,7 +122,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mudcrab.us", true }, { "my.onlime.ch", false }, { "my.xero.com", false }, - { "mykolab.com", true }, { "mylookout.com", false }, { "neg9.org", false }, { "neilwynne.com", false }, @@ -142,6 +146,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "roundcube.mayfirst.org", false }, { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, + { "semenkovich.com", true }, { "shodan.io", true }, { "silentcircle.com", false }, { "simbolo.co.uk", false }, @@ -165,6 +170,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "writeapp.me", false }, { "www.aclu.org", false }, { "www.apollo-auto.com", true }, + { "www.banking.co.at", false }, { "www.braintreepayments.com", false }, { "www.calyxinstitute.org", false }, { "www.cyveillance.com", true }, @@ -183,7 +189,6 @@ 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

[tor-browser/esr24] Bug 895557 - Follow the spec when doing fragment navigation during page loads. r=bz, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 2018a919c20f8f2123a93853bc447fa3788f39cb Author: Olli Pettay <Olli.Pettay(a)helsinki.fi> Date: Sat Mar 1 21:07:42 2014 +0200 Bug 895557 - Follow the spec when doing fragment navigation during page loads. r=bz, a=lsblakk --- docshell/base/nsDocShell.cpp | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 59cf956..1e602fd 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -8977,19 +8977,6 @@ nsDocShell::InternalLoad(nsIURI * aURI, sameExceptHashes && !newHash.IsEmpty()); if (doShortCircuitedLoad) { - // Cancel an outstanding new-document load if this is a history - // load. - // - // We can't cancel the oustanding load unconditionally, because if a - // page does - // - load a.html - // - start loading b.html - // - load a.html#h - // we break the web if we cancel the load of b.html. - if (aSHEntry && mDocumentRequest) { - mDocumentRequest->Cancel(NS_BINDING_ABORTED); - } - // Save the current URI; we need it if we fire a hashchange later. nsCOMPtr<nsIURI> oldURI = mCurrentURI; @@ -9024,6 +9011,8 @@ nsDocShell::InternalLoad(nsIURI * aURI, mURIResultedInDocument = true; + nsCOMPtr<nsISHEntry> oldLSHE = mLSHE; + /* we need to assign mLSHE to aSHEntry right here, so that on History loads, * SetCurrentURI() called from OnNewURI() will send proper * onLocationChange() notifications to the browser to update @@ -9101,10 +9090,10 @@ nsDocShell::InternalLoad(nsIURI * aURI, SetCurScrollPosEx(bx, by); } - /* Clear out mLSHE so that further anchor visits get - * recorded in SH and SH won't misbehave. + /* Restore the original LSHE if we were loading something + * while short-circuited load was initiated. */ - SetHistoryEntry(&mLSHE, nullptr); + SetHistoryEntry(&mLSHE, oldLSHE); /* Set the title for the SH entry for this target url. so that * SH menus in go/back/forward buttons won't be empty for this. */

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits