- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 1000185 - Part 2: Add a bool to keep track of whether nsSMILAnimationController instances are registered with a refresh driver. r=birtles, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit da3de5dd2b884c4d54c86fd0a5164f137a509958 Author: Daniel Holbert <dholbert(a)cs.stanford.edu> Date: Tue May 20 08:34:26 2014 -0400 Bug 1000185 - Part 2: Add a bool to keep track of whether nsSMILAnimationController instances are registered with a refresh driver. r=birtles, a=abillings --- content/smil/nsSMILAnimationController.cpp | 11 +++++++++-- content/smil/nsSMILAnimationController.h | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/content/smil/nsSMILAnimationController.cpp b/content/smil/nsSMILAnimationController.cpp index 77d06cd..b625b21 100644 --- a/content/smil/nsSMILAnimationController.cpp +++ b/content/smil/nsSMILAnimationController.cpp @@ -29,6 +29,7 @@ nsSMILAnimationController::nsSMILAnimationController(nsIDocument* aDoc) mResampleNeeded(false), mDeferredStartSampling(false), mRunningSample(false), + mRegisteredWithRefreshDriver(false), mDocument(aDoc) { NS_ABORT_IF_FALSE(aDoc, "need a non-null document"); @@ -52,6 +53,8 @@ nsSMILAnimationController::~nsSMILAnimationController() NS_ASSERTION(mAnimationElementTable.Count() == 0, "Animation controller shouldn't be tracking any animation" " elements when it dies"); + NS_ASSERTION(!mRegisteredWithRefreshDriver, + "Leaving stale entry in refresh driver's observer list"); } void @@ -263,6 +266,8 @@ nsSMILAnimationController::StartSampling(nsRefreshDriver* aRefreshDriver) NS_ASSERTION(!mDeferredStartSampling, "Started sampling but the deferred start flag is still set"); if (aRefreshDriver) { + MOZ_ASSERT(!mRegisteredWithRefreshDriver, + "Redundantly registering with refresh driver"); NS_ABORT_IF_FALSE(!GetRefreshDriver() || aRefreshDriver == GetRefreshDriver(), "Starting sampling with wrong refresh driver"); @@ -270,19 +275,21 @@ nsSMILAnimationController::StartSampling(nsRefreshDriver* aRefreshDriver) // or else it will confuse our "average time between samples" calculations. mCurrentSampleTime = mozilla::TimeStamp::Now(); aRefreshDriver->AddRefreshObserver(this, Flush_Style); + mRegisteredWithRefreshDriver = true; } } void nsSMILAnimationController::StopSampling(nsRefreshDriver* aRefreshDriver) { - if (aRefreshDriver) { + if (aRefreshDriver && mRegisteredWithRefreshDriver) { // NOTE: The document might already have been detached from its PresContext - // (and RefreshDriver), which would make GetRefreshDriverForDoc return null. + // (and RefreshDriver), which would make GetRefreshDriver() return null. NS_ABORT_IF_FALSE(!GetRefreshDriver() || aRefreshDriver == GetRefreshDriver(), "Stopping sampling with wrong refresh driver"); aRefreshDriver->RemoveRefreshObserver(this, Flush_Style); + mRegisteredWithRefreshDriver = false; } } diff --git a/content/smil/nsSMILAnimationController.h b/content/smil/nsSMILAnimationController.h index ab98cd6..b42ffee 100644 --- a/content/smil/nsSMILAnimationController.h +++ b/content/smil/nsSMILAnimationController.h @@ -214,6 +214,9 @@ protected: bool mDeferredStartSampling; bool mRunningSample; + // Are we registered with our document's refresh driver? + bool mRegisteredWithRefreshDriver; + // Store raw ptr to mDocument. It owns the controller, so controller // shouldn't outlive it nsIDocument* mDocument;

1 0

[tor-browser/esr24] Bug 992274 - Tweak an edge case in line number handling. r=jorendorff, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 59b328741452e211e0a1790c32a621e7e2b05689 Author: Nicholas Nethercote <nnethercote(a)mozilla.com> Date: Sun Apr 6 21:31:04 2014 -0700 Bug 992274 - Tweak an edge case in line number handling. r=jorendorff, a=abillings --- js/src/frontend/Parser.cpp | 6 ++++-- js/src/frontend/TokenStream.cpp | 17 +++++++++++------ js/src/frontend/TokenStream.h | 4 ++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp index ce87e25..f9e15a1 100644 --- a/js/src/frontend/Parser.cpp +++ b/js/src/frontend/Parser.cpp @@ -2058,7 +2058,8 @@ Parser<FullParseHandler>::functionArgsAndBody(ParseNode *pn, HandleFunction fun, // Move the syntax parser to the current position in the stream. TokenStream::Position position(keepAtoms); tokenStream.tell(&position); - parser->tokenStream.seek(position, tokenStream); + if (!parser->tokenStream.seek(position, tokenStream)) + return false; ParseContext<SyntaxParseHandler> funpc(parser, outerpc, funbox, outerpc->staticLevel + 1, outerpc->blockidGen); @@ -2080,7 +2081,8 @@ Parser<FullParseHandler>::functionArgsAndBody(ParseNode *pn, HandleFunction fun, // Advance this parser over tokens processed by the syntax parser. parser->tokenStream.tell(&position); - tokenStream.seek(position, parser->tokenStream); + if (!tokenStream.seek(position, parser->tokenStream)) + return false; } pn->pn_funbox = funbox; diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp index 02da46f..6ae5102 100644 --- a/js/src/frontend/TokenStream.cpp +++ b/js/src/frontend/TokenStream.cpp @@ -163,20 +163,23 @@ TokenStream::SourceCoords::add(uint32_t lineNum, uint32_t lineStartOffset) } } -JS_ALWAYS_INLINE void +JS_ALWAYS_INLINE bool TokenStream::SourceCoords::fill(const TokenStream::SourceCoords &other) { JS_ASSERT(lineStartOffsets_.back() == MAX_PTR); JS_ASSERT(other.lineStartOffsets_.back() == MAX_PTR); if (lineStartOffsets_.length() >= other.lineStartOffsets_.length()) - return; + return true; uint32_t sentinelIndex = lineStartOffsets_.length() - 1; lineStartOffsets_[sentinelIndex] = other.lineStartOffsets_[sentinelIndex]; - for (size_t i = sentinelIndex + 1; i < other.lineStartOffsets_.length(); i++) - (void)lineStartOffsets_.append(other.lineStartOffsets_[i]); + for (size_t i = sentinelIndex + 1; i < other.lineStartOffsets_.length(); i++) { + if (!lineStartOffsets_.append(other.lineStartOffsets_[i])) + return false; + } + return true; } JS_ALWAYS_INLINE uint32_t @@ -570,12 +573,14 @@ TokenStream::seek(const Position &pos) tokens[(cursor + 1 + i) & ntokensMask] = pos.lookaheadTokens[i]; } -void +bool TokenStream::seek(const Position &pos, const TokenStream &other) { - srcCoords.fill(other.srcCoords); + if (!srcCoords.fill(other.srcCoords)) + return false; lastFunctionKeyword = other.lastFunctionKeyword; seek(pos); + return true; } void diff --git a/js/src/frontend/TokenStream.h b/js/src/frontend/TokenStream.h index 48fdec3..57ac159 100644 --- a/js/src/frontend/TokenStream.h +++ b/js/src/frontend/TokenStream.h @@ -659,7 +659,7 @@ class MOZ_STACK_CLASS TokenStream void advance(size_t position); void tell(Position *); void seek(const Position &pos); - void seek(const Position &pos, const TokenStream &other); + bool seek(const Position &pos, const TokenStream &other); void positionAfterLastFunctionKeyword(Position &pos); size_t positionToOffset(const Position &pos) const { @@ -750,7 +750,7 @@ class MOZ_STACK_CLASS TokenStream SourceCoords(JSContext *cx, uint32_t ln); void add(uint32_t lineNum, uint32_t lineStartOffset); - void fill(const SourceCoords &other); + bool fill(const SourceCoords &other); bool isOnThisLine(uint32_t offset, uint32_t lineNum) const { uint32_t lineIndex = lineNumToIndex(lineNum);

1 0

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

29 Aug '14

commit ed69ba7275bc0d146ac459e2bec8d61281a820b6 Author: ffxbld <none@none> Date: Sat May 3 03:13:48 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-367 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 6 ++++-- security/manager/boot/src/nsSTSPreloadList.inc | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 4c1a6eb..0e19384 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,5 +1,6 @@ admin.google.com: did not receive HSTS header alpha.irccloud.com: could not connect to host +anycoin.me: did not receive HSTS header api.mega.co.nz: could not connect to host api.recurly.com: did not receive HSTS header api.simple.com: did not receive HSTS header @@ -30,6 +31,7 @@ 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 +edmodo.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 @@ -61,7 +63,6 @@ lifeguard.aecom.com: did not receive HSTS header lists.mayfirst.org: did not receive HSTS header mail.google.com: did not receive HSTS header market.android.com: did not receive HSTS header -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 @@ -82,6 +83,8 @@ sah3.net: 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 +seifried.org: did not receive HSTS header +semenkovich.com: could not connect to host serverdensity.io: did not receive HSTS header shops.neonisi.com: could not connect to host silentcircle.org: could not connect to host @@ -109,7 +112,6 @@ wepay.com: max-age too low: 2592000 whonix.org: did not receive HSTS header www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host -www.dropcam.com: max-age too low: 2592000 www.elanex.biz: did not receive HSTS header www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index e2ecfc3..4673c6a 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(1408788322005000); +const PRTime gPreloadListExpirationTime = INT64_C(1409997954029000); class nsSTSPreload { @@ -26,6 +26,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "alpha.irccloud.com", false }, { "api.intercom.io", false }, { "api.xero.com", false }, + { "app.manilla.com", true }, { "app.recurly.com", false }, { "app.yinxiang.com", false }, { "appseccalifornia.org", true }, @@ -60,6 +61,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "data.qld.gov.au", false }, { "davidlyness.com", true }, { "developer.mydigipass.com", false }, + { "dillonkorman.com", true }, { "dist.torproject.org", false }, { "dm.lookout.com", false }, { "dm.mylookout.com", false }, @@ -88,6 +90,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "gocardless.com", true }, { "grc.com", false }, { "grepular.com", true }, + { "harvestapp.com", true }, { "haste.ch", true }, { "heha.co", true }, { "howrandom.org", true }, @@ -123,6 +126,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mattmccutchen.net", true }, { "mbp.banking.co.at", false }, { "mediacru.sh", true }, + { "medium.com", true }, { "mega.co.nz", false }, { "members.mayfirst.org", false }, { "members.nearlyfreespeech.net", false }, @@ -166,7 +170,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "roundcube.mayfirst.org", false }, { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, - { "seifried.org", true }, { "semenkovich.com", true }, { "shodan.io", true }, { "silentcircle.com", false }, @@ -196,7 +199,9 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.braintreepayments.com", false }, { "www.calyxinstitute.org", false }, { "www.cyveillance.com", true }, + { "www.dropcam.com", false }, { "www.entropia.de", false }, + { "www.eternalgoth.co.uk", true }, { "www.evernote.com", false }, { "www.getcloak.com", false }, { "www.gov.uk", false },

1 0

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

29 Aug '14

commit 95aaea3eb4639452833c46a98bde5d121bcf14a8 Author: ffxbld <none@none> Date: Sat May 3 03:11:30 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-445 - a=blocklist-update --- browser/app/blocklist.xml | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 8de9f0f..ffbfe51 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="1398202482000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1398899403000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -113,6 +113,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i578" id="jid1-XLjasWL55iEE1Q@jetpack"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i529" id="/^(torntv@torntv\.com|trtv3@trtv\.com|torntv2@torntv\.com|e2fd07a6-e282-4f2e-8965-85565fcb6384@b69158e6-3c3b-476c-9d98-ae5838c5b707\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -139,8 +145,13 @@ <prefs> </prefs> </emItem> - <emItem blockID="i10" id="{8CE11043-9A15-4207-A565-0C94C42D590D}"> - <prefs> + <emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}"> + <versionRange minVersion="1.2" maxVersion="1.2"> + <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> + <versionRange minVersion="3.0a1" maxVersion="*" /> + </targetApplication> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i492" id="{af95cc15-3b9b-45ae-8d9b-98d08eda3111}"> @@ -245,8 +256,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i84" id="pink(a)rosaplugin.info"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i582" id="discoverypro(a)discoverypro.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -562,11 +573,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}"> - <versionRange minVersion="1.2" maxVersion="1.2"> - <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> - <versionRange minVersion="3.0a1" maxVersion="*" /> - </targetApplication> + <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> + <versionRange minVersion="0" maxVersion="*"> </versionRange> <prefs> </prefs> @@ -732,6 +740,10 @@ <prefs> </prefs> </emItem> + <emItem blockID="i10" id="{8CE11043-9A15-4207-A565-0C94C42D590D}"> + <prefs> + </prefs> + </emItem> <emItem blockID="i548" id="/^firefox@(jumpflip|webconnect|browsesmart|mybuzzsearch|outobox|greygray|lemurleap|divapton|secretsauce|batbrowse|whilokii|linkswift|qualitink|browsefox|kozaka|diamondata|glindorus|saltarsmart|bizzybolt|websparkle)\.(com?|net|org|info|biz)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1356,7 +1368,7 @@ <prefs> </prefs> </emItem> - <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> + <emItem blockID="i84" id="pink(a)rosaplugin.info"> <versionRange minVersion="0" maxVersion="*"> </versionRange> <prefs> @@ -1523,6 +1535,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i580" id="{51c77233-c0ad-4220-8388-47c11c18b355}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i541" id="/^({988919ff-0cd8-4d0c-bc7e-60d55a49eb64}|{494b9726-9084-415c-a499-68c07e187244}|{55b95864-3251-45e9-bb30-1a82589aaff1}|{eef3855c-fc2d-41e6-8d91-d368f51b3055}|{90a1b331-c2b4-4933-9f63-ba7b84d60d58}|{d2cf9842-af95-48cd-b873-bfbb48cd7f5e})$/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange>

1 0

[tor-browser/esr24] Bug 994907 - imgDecoderObserver does reference counting on different threads, so should be using thread safe reference counting. r=sfowler, r=ehsan, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit d1a76b53ffd0876efbe77c22b8b181843eebfd57 Author: Milan Sreckovic <milan(a)mozilla.com> Date: Wed May 7 15:31:52 2014 -0400 Bug 994907 - imgDecoderObserver does reference counting on different threads, so should be using thread safe reference counting. r=sfowler, r=ehsan, a=abillings --- image/src/imgDecoderObserver.h | 7 +++++-- image/src/imgStatusTracker.cpp | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/image/src/imgDecoderObserver.h b/image/src/imgDecoderObserver.h index 138f6b0..06d1798 100644 --- a/image/src/imgDecoderObserver.h +++ b/image/src/imgDecoderObserver.h @@ -32,10 +32,10 @@ * loaded data fire before the call returns. If FLAG_SYNC_DECODE is not passed, * all, some, or none of the notifications may fire before the call returns. */ -class imgDecoderObserver : public mozilla::RefCounted<imgDecoderObserver> +class imgDecoderObserver { public: - virtual ~imgDecoderObserver() = 0; + NS_INLINE_DECL_THREADSAFE_REFCOUNTING(imgDecoderObserver); /** * Load notification. @@ -124,6 +124,9 @@ public: * Called when an image is realized to be in error state. */ virtual void OnError() = 0; + +protected: + virtual ~imgDecoderObserver() = 0; }; // We must define a destructor because derived classes call our destructor from diff --git a/image/src/imgStatusTracker.cpp b/image/src/imgStatusTracker.cpp index 06a352b..99c8f48 100644 --- a/image/src/imgStatusTracker.cpp +++ b/image/src/imgStatusTracker.cpp @@ -228,8 +228,6 @@ public: imgStatusTrackerObserver(imgStatusTracker* aTracker) : mTracker(aTracker) {} - virtual ~imgStatusTrackerObserver() {} - void SetTracker(imgStatusTracker* aTracker) { mTracker = aTracker; } @@ -317,6 +315,9 @@ public: mTracker->RecordError(); } +protected: + virtual ~imgStatusTrackerObserver() {} + private: imgStatusTracker* mTracker; };

1 0

[tor-browser/esr24] Bug 997820 - Properly set the reftest pref on esr24. a=bustage
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6317e1c9d1d835fffbbcb3a871d52681038de416 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue Apr 29 10:50:52 2014 -0400 Bug 997820 - Properly set the reftest pref on esr24. a=bustage --- layout/tools/reftest/runreftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 70323a7..683b0a1 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -73,7 +73,7 @@ class RefTest(object): # Ensure that telemetry is disabled, so we don't connect to the telemetry # server in the middle of the tests. - prefs['toolkit.telemetry.enabled'] = False + prefsFile.write('user_pref("toolkit.telemetry.enabled", false);\n') for v in options.extraPrefs: thispref = v.split("=")

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] Bug 996009 - Ensure that the richtext2 browserscope tests do not attempt to contact the external network. r=roc, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5eb2bb6325cdeaa666711df2c52a03fd743bf7f9 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Tue Apr 15 09:32:36 2014 -0400 Bug 996009 - Ensure that the richtext2 browserscope tests do not attempt to contact the external network. r=roc, a=test-only --- .../lib/richtext2/richtext2/tests/insert.py | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py b/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py index edf602a..a2e79c2 100644 --- a/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py +++ b/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py @@ -165,34 +165,34 @@ INSERT_TESTS = { 'tests': [ { 'id': 'IIMG:url_TEXT-1_SC', 'rte1-id': 'a-insertimage-0', - 'desc': 'Insert image with URL "http://goo.gl/bar.png"', - 'value': 'http://goo.gl/bar.png', + 'desc': 'Insert image with URL "bar.png"', + 'value': 'bar.png', 'checkAttrs': True, 'pad': 'foo^bar', - 'expected': [ 'foo<img src="http://goo.gl/bar.png">|bar', - 'foo<img src="http://goo.gl/bar.png">^bar' ] }, + 'expected': [ 'foo<img src="bar.png">|bar', + 'foo<img src="bar.png">^bar' ] }, { 'id': 'IIMG:url_IMG-1_SO', 'desc': 'Change existing image to new URL, selection on <img>', - 'value': 'http://baz.com/quz.png', + 'value': 'quz.png', 'checkAttrs': True, - 'pad': 'foo{<img src="http://goo.gl/bar.png">}bar', - 'expected': [ 'foo<img src="http://baz.com/quz.png"/>|bar', - 'foo<img src="http://baz.com/quz.png"/>^bar' ] }, + 'pad': 'foo{<img src="bar.png">}bar', + 'expected': [ 'foo<img src="quz.png"/>|bar', + 'foo<img src="quz.png"/>^bar' ] }, { 'id': 'IIMG:url_SPAN-IMG-1_SO', 'desc': 'Change existing image to new URL, selection in text surrounding <img>', - 'value': 'http://baz.com/quz.png', + 'value': 'quz.png', 'checkAttrs': True, - 'pad': 'foo[<img src="http://goo.gl/bar.png">]bar', - 'expected': [ 'foo<img src="http://baz.com/quz.png"/>|bar', - 'foo<img src="http://baz.com/quz.png"/>^bar' ] }, + 'pad': 'foo[<img src="bar.png">]bar', + 'expected': [ 'foo<img src="quz.png"/>|bar', + 'foo<img src="quz.png"/>^bar' ] }, { 'id': 'IIMG:._SPAN-IMG-1_SO', 'desc': 'Remove existing image or URL, selection on <img>', 'value': '', 'checkAttrs': True, - 'pad': 'foo{<img src="http://goo.gl/bar.png">}bar', + 'pad': 'foo{<img src="bar.png">}bar', 'expected': [ 'foo^bar', 'foo<img>|bar', 'foo<img>^bar', @@ -203,7 +203,7 @@ INSERT_TESTS = { 'desc': 'Remove existing image or URL, selection in text surrounding <img>', 'value': '', 'checkAttrs': True, - 'pad': 'foo[<img src="http://goo.gl/bar.png">]bar', + 'pad': 'foo[<img src="bar.png">]bar', 'expected': [ 'foo^bar', 'foo<img>|bar', 'foo<img>^bar',

1 0

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

29 Aug '14

commit cfc4e0103099db4e854f80e2c08e42d012a93a63 Author: ffxbld <none@none> Date: Sat Apr 19 03:13:13 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-486 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 13 +++++-------- security/manager/boot/src/nsSTSPreloadList.inc | 13 ++++++++++++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index cfe99ee..4c1a6eb 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -24,7 +24,7 @@ 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: could not connect to host +csawctf.poly.edu: did not receive HSTS header dl.google.com: did not receive HSTS header docs.google.com: did not receive HSTS header donmez.ws: could not connect to host @@ -71,12 +71,6 @@ 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 -passport.yandex.by: did not receive HSTS header -passport.yandex.com: did not receive HSTS header -passport.yandex.com.tr: did not receive HSTS header -passport.yandex.kz: did not receive HSTS header -passport.yandex.ru: did not receive HSTS header -passport.yandex.ua: did not receive HSTS header paypal.com: max-age too low: 14400 payroll.xero.com: max-age too low: 3600 platform.lookout.com: could not connect to host @@ -85,7 +79,6 @@ 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 @@ -102,6 +95,8 @@ spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header ssl.google-analytics.com: did not receive HSTS header ssl.panoramio.com: did not receive HSTS header +stage.wepay.com: max-age too low: 2592000 +static.wepay.com: did not receive HSTS header sunshinepress.org: could not connect to host surfeasy.com: did not receive HSTS header talk.google.com: did not receive HSTS header @@ -110,6 +105,7 @@ translate.googleapis.com: did not receive HSTS header uprotect.it: could not connect to host wallet.google.com: did not receive HSTS header webmail.mayfirst.org: did not receive HSTS header +wepay.com: max-age too low: 2592000 whonix.org: did not receive HSTS header www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host @@ -129,4 +125,5 @@ 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 +www.wepay.com: max-age too low: 2592000 zoo24.de: max-age too low: 2592000 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index b547933..e2ecfc3 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(1408183539445000); +const PRTime gPreloadListExpirationTime = INT64_C(1408788322005000); class nsSTSPreload { @@ -21,6 +21,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "accounts.google.com", true }, { "aclu.org", false }, { "activiti.alfresco.com", false }, + { "adsfund.org", true }, { "aladdinschools.appspot.com", false }, { "alpha.irccloud.com", false }, { "api.intercom.io", false }, @@ -44,6 +45,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "carezone.com", false }, { "check.torproject.org", false }, { "chromiumcodereview.appspot.com", false }, + { "cloudcert.org", true }, { "cloudns.com.au", true }, { "cloudsecurityalliance.org", true }, { "codereview.appspot.com", false }, @@ -137,6 +139,12 @@ static const nsSTSPreload kSTSPreloadList[] = { { "opsmate.com", false }, { "p.linode.com", false }, { "packagist.org", false }, + { "passport.yandex.by", false }, + { "passport.yandex.com", false }, + { "passport.yandex.com.tr", false }, + { "passport.yandex.kz", false }, + { "passport.yandex.ru", false }, + { "passport.yandex.ua", false }, { "passwd.io", true }, { "passwordbox.com", false }, { "paste.linode.com", false }, @@ -149,6 +157,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "plus.google.com", false }, { "plus.sandbox.google.com", false }, { "publications.qld.gov.au", false }, + { "pult.co", true }, { "pypi.python.org", true }, { "python.org", false }, { "riseup.net", true }, @@ -157,6 +166,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "roundcube.mayfirst.org", false }, { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, + { "seifried.org", true }, { "semenkovich.com", true }, { "shodan.io", true }, { "silentcircle.com", false }, @@ -174,6 +184,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "torproject.org", false }, { "twitter.com", false }, { "ubertt.org", true }, + { "vmoagents.com", false }, { "webmail.gigahost.dk", false }, { "webmail.onlime.ch", false }, { "wiki.python.org", true },

1 0

[tor-browser/esr24] Backed out changeset 32bb91602986 (bug 995995) for mochitest bustage.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit c5e8d09fd82fce6198b0e89f107377f69832f25e Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Fri Apr 18 11:39:47 2014 -0400 Backed out changeset 32bb91602986 (bug 995995) for mochitest bustage. --- testing/profiles/prefs_general.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index 2e5a16f..3032a65 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -141,12 +141,3 @@ user_pref("media.webaudio.legacy.AudioParam", true); user_pref("media.webaudio.legacy.BiquadFilterNode", true); user_pref("media.webaudio.legacy.PannerNode", true); user_pref("media.webaudio.legacy.OscillatorNode", true); - -// Don't connect to Yahoo! for RSS feed tests. -// en-US only uses .types.0.uri, but set all of them just to be sure. -user_pref('browser.contentHandlers.types.0.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.1.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.2.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.3.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.4.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.5.uri', 'http://test1.example.org/rss?url=%%s')

1 0