- tbb-commits - lists.torproject.org

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

29 Aug '14

commit 629c9ae2a3c77466e9d348cf8e8b279682255b6f Author: ffxbld <none@none> Date: Sat May 17 03:13:45 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-315 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 3 +++ security/manager/boot/src/nsSTSPreloadList.inc | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 2e6f60f..c1694bd 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,4 +1,5 @@ admin.google.com: did not receive HSTS header +airbnb.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 @@ -20,6 +21,7 @@ checkout.google.com: did not receive HSTS header chrome-devtools-frontend.appspot.com: did not receive HSTS header chrome.google.com: did not receive HSTS header cloud.google.com: did not receive HSTS header +cloudns.com.au: could not connect to host code.google.com: did not receive HSTS header codereview.chromium.org: did not receive HSTS header crate.io: did not receive HSTS header @@ -105,6 +107,7 @@ talk.google.com: did not receive HSTS header talkgadget.google.com: did not receive HSTS header translate.googleapis.com: did not receive HSTS header uprotect.it: could not connect to host +usaa.com: did not receive HSTS header wallet.google.com: did not receive HSTS header webmail.mayfirst.org: did not receive HSTS header wepay.com: max-age too low: 2592000 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index abb6bf2..bde7a03 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(1410602782560000); +const PRTime gPreloadListExpirationTime = INT64_C(1411207520608000); class nsSTSPreload { @@ -119,7 +119,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "luneta.nearbuysystems.com", false }, { "mail.de", true }, { "mailbox.org", false }, - { "makeyourlaws.org", false }, + { "makeyourlaws.org", true }, { "manage.zenpayroll.com", false }, { "manager.linode.com", false }, { "matteomarescotti.name", true }, @@ -131,6 +131,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "members.mayfirst.org", false }, { "members.nearlyfreespeech.net", false }, { "mnsure.org", true }, + { "mobile.usaa.com", false }, { "mudcrab.us", true }, { "my.onlime.ch", false }, { "my.xero.com", false }, @@ -181,6 +182,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "stocktrade.de", false }, { "stripe.com", true }, { "strongest-privacy.com", true }, + { "subrosa.io", true }, { "support.mayfirst.org", false }, { "surkatty.org", true }, { "tent.io", true }, @@ -195,6 +197,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "wiz.biz", true }, { "writeapp.me", false }, { "www.aclu.org", false }, + { "www.airbnb.com", true }, { "www.apollo-auto.com", true }, { "www.banking.co.at", false }, { "www.braintreepayments.com", false }, @@ -212,7 +215,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.irccloud.com", false }, { "www.linode.com", false }, { "www.lookout.com", false }, - { "www.makeyourlaws.org", false }, + { "www.makeyourlaws.org", true }, { "www.mydigipass.com", false }, { "www.mylookout.com", false }, { "www.noisebridge.net", false }, @@ -223,6 +226,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.therapynotes.com", false }, { "www.torproject.org", false }, { "www.twitter.com", false }, + { "www.usaa.com", false }, { "www.zenpayroll.com", false }, { "zenpayroll.com", false }, };

1 0

[tor-browser/esr24] Bug 995603 - Ensure mouse-enter/exit events are sent to plugins as appropriate. r=mstange, masayuki a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit af3ec6b99835c54f7de8fd5615386e15c583cd71 Author: Steven Michaud <smichaud(a)pobox.com> Date: Fri May 16 12:55:28 2014 -0500 Bug 995603 - Ensure mouse-enter/exit events are sent to plugins as appropriate. r=mstange,masayuki a=sledru --- content/events/src/nsContentEventHandler.cpp | 25 +++++++-- content/events/src/nsContentEventHandler.h | 2 +- widget/cocoa/nsChildView.mm | 78 +++++++++----------------- widget/cocoa/nsCocoaWindow.h | 3 - widget/cocoa/nsCocoaWindow.mm | 30 ---------- 5 files changed, 45 insertions(+), 93 deletions(-) diff --git a/content/events/src/nsContentEventHandler.cpp b/content/events/src/nsContentEventHandler.cpp index 8b151cb..03c0721 100644 --- a/content/events/src/nsContentEventHandler.cpp +++ b/content/events/src/nsContentEventHandler.cpp @@ -44,11 +44,8 @@ nsContentEventHandler::nsContentEventHandler( } nsresult -nsContentEventHandler::InitCommon() +nsContentEventHandler::InitBasic() { - if (mSelection) - return NS_OK; - NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE); // If text frame which has overflowing selection underline is dirty, @@ -58,11 +55,24 @@ nsContentEventHandler::InitCommon() // Flushing notifications can cause mPresShell to be destroyed (bug 577963). NS_ENSURE_TRUE(!mPresShell->IsDestroying(), NS_ERROR_FAILURE); + return NS_OK; +} + +nsresult +ContentEventHandler::InitCommon() +{ + if (mSelection) { + return NS_OK; + } + + nsresult rv = InitBasic(); + NS_ENSURE_SUCCESS(rv, rv); + nsCopySupport::GetSelectionForCopy(mPresShell->GetDocument(), getter_AddRefs(mSelection)); nsCOMPtr<nsIDOMRange> firstRange; - nsresult rv = mSelection->GetRangeAt(0, getter_AddRefs(firstRange)); + rv = mSelection->GetRangeAt(0, getter_AddRefs(firstRange)); // This shell doesn't support selection. if (NS_FAILED(rv)) return NS_ERROR_NOT_AVAILABLE; @@ -860,10 +870,13 @@ nsContentEventHandler::OnQueryCharacterAtPoint(nsQueryContentEvent* aEvent) nsresult nsContentEventHandler::OnQueryDOMWidgetHittest(nsQueryContentEvent* aEvent) { - nsresult rv = Init(aEvent); + NS_ASSERTION(aEvent, "aEvent must not be null"); + + nsresult rv = InitBasic(); if (NS_FAILED(rv)) return rv; + aEvent->mSucceeded = false; aEvent->mReply.mWidgetIsHit = false; NS_ENSURE_TRUE(aEvent->widget, NS_ERROR_FAILURE); diff --git a/content/events/src/nsContentEventHandler.h b/content/events/src/nsContentEventHandler.h index 4c4f492..1624d35 100644 --- a/content/events/src/nsContentEventHandler.h +++ b/content/events/src/nsContentEventHandler.h @@ -66,7 +66,7 @@ protected: nsresult Init(nsQueryContentEvent* aEvent); nsresult Init(nsSelectionEvent* aEvent); - // InitCommon() is called from each Init(). + nsresult InitBasic(); nsresult InitCommon(); public: diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index aef01c7..fe619e0 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2790,6 +2790,31 @@ NSEvent* gLastDragMouseDownEvent = nil; return mIsPluginView; } +- (NSView *)hitTest:(NSPoint)aPoint +{ + NSView* target = [super hitTest:aPoint]; + if ((target == self) && [self isPluginView] && mGeckoChild) { + nsAutoRetainCocoaObject kungFuDeathGrip(self); + + NSPoint cocoaLoc = [[self superview] convertPoint:aPoint toView:self]; + LayoutDeviceIntPoint widgetLoc = LayoutDeviceIntPoint::FromUntyped( + mGeckoChild->CocoaPointsToDevPixels(cocoaLoc)); + + WidgetQueryContentEvent hitTest(true, NS_QUERY_DOM_WIDGET_HITTEST, + mGeckoChild); + hitTest.InitForQueryDOMWidgetHittest(widgetLoc); + // This might destroy our widget. + mGeckoChild->DispatchWindowEvent(hitTest); + if (!mGeckoChild) { + return nil; + } + if (hitTest.mSucceeded && !hitTest.mReply.mWidgetIsHit) { + return nil; + } + } + return target; +} + // Are we processing an NSLeftMouseDown event that will fail to click through? // If so, we shouldn't focus or unfocus a plugin. - (BOOL)isInFailingLeftClickThrough @@ -4913,65 +4938,12 @@ static int32_t RoundUp(double aDouble) return !mGeckoChild->DispatchWindowEvent(geckoEvent); } -// Don't focus a plugin if the user has clicked on a DOM element above it. -// In this case the user has actually clicked on the plugin's ChildView -// (underneath the non-plugin DOM element). But we shouldn't allow the -// ChildView to be focused. See bug 627649. -- (BOOL)currentEventShouldFocusPlugin -{ - if (!mGeckoChild) - return NO; - - NSEvent* currentEvent = [NSApp currentEvent]; - if ([currentEvent type] != NSLeftMouseDown) - return YES; - - nsAutoRetainCocoaObject kungFuDeathGrip(self); - - // hitTest needs coordinates in device pixels - NSPoint eventLoc = nsCocoaUtils::ScreenLocationForEvent(currentEvent); - eventLoc.y = nsCocoaUtils::FlippedScreenY(eventLoc.y); - nsIntPoint widgetLoc = mGeckoChild->CocoaPointsToDevPixels(eventLoc) - - mGeckoChild->WidgetToScreenOffset(); - - nsQueryContentEvent hitTest(true, NS_QUERY_DOM_WIDGET_HITTEST, mGeckoChild); - hitTest.InitForQueryDOMWidgetHittest(widgetLoc); - // This might destroy our widget (and null out mGeckoChild). - mGeckoChild->DispatchWindowEvent(hitTest); - if (!mGeckoChild) - return NO; - if (hitTest.mSucceeded && !hitTest.mReply.mWidgetIsHit) - return NO; - - return YES; -} - -// Don't focus a plugin if we're in a left click-through that will fail (see -// [ChildView isInFailingLeftClickThrough] above). -- (BOOL)shouldFocusPlugin:(BOOL)getFocus -{ - if (!mGeckoChild) - return NO; - - nsCocoaWindow* windowWidget = mGeckoChild->GetXULWindowWidget(); - if (windowWidget && !windowWidget->ShouldFocusPlugin()) - return NO; - - if (getFocus && ![self currentEventShouldFocusPlugin]) - return NO; - - return YES; -} - // Returns NO if the plugin shouldn't be focused/unfocused. - (BOOL)updatePluginFocusStatus:(BOOL)getFocus { if (!mGeckoChild) return NO; - if (![self shouldFocusPlugin:getFocus]) - return NO; - if (mPluginEventModel == NPEventModelCocoa) { nsPluginEvent pluginEvent(true, NS_PLUGIN_FOCUS_EVENT, mGeckoChild); NPCocoaEvent cocoaEvent; diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h index ac434e0..dc5994671 100644 --- a/widget/cocoa/nsCocoaWindow.h +++ b/widget/cocoa/nsCocoaWindow.h @@ -316,9 +316,6 @@ public: void SetPopupWindowLevel(); - bool IsChildInFailingLeftClickThrough(NSView *aChild); - bool ShouldFocusPlugin(); - NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent); protected: diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm index b95c072..b435155 100644 --- a/widget/cocoa/nsCocoaWindow.mm +++ b/widget/cocoa/nsCocoaWindow.mm @@ -2051,36 +2051,6 @@ void nsCocoaWindow::SetPopupWindowLevel() } } -bool nsCocoaWindow::IsChildInFailingLeftClickThrough(NSView *aChild) -{ - if ([aChild isKindOfClass:[ChildView class]]) { - ChildView* childView = (ChildView*) aChild; - if ([childView isInFailingLeftClickThrough]) - return true; - } - NSArray* subviews = [aChild subviews]; - if (subviews) { - NSUInteger count = [subviews count]; - for (NSUInteger i = 0; i < count; ++i) { - NSView* aView = (NSView*) [subviews objectAtIndex:i]; - if (IsChildInFailingLeftClickThrough(aView)) - return true; - } - } - return false; -} - -// Don't focus a plugin if we're in a left click-through that will -// fail (see [ChildView isInFailingLeftClickThrough]). Called from -// [ChildView shouldFocusPlugin]. -bool nsCocoaWindow::ShouldFocusPlugin() -{ - if (!mWindow || IsChildInFailingLeftClickThrough([mWindow contentView])) - return false; - - return true; -} - NS_IMETHODIMP nsCocoaWindow::NotifyIME(NotificationToIME aNotification) {

1 0

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

29 Aug '14

commit 44eb9e3191149ec8c81a428979705da871f240ab Author: ffxbld <none@none> Date: Sat May 10 03:15:16 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-066 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 3 +-- security/manager/boot/src/nsSTSPreloadList.inc | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 0e19384..2e6f60f 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -70,6 +70,7 @@ neonisi.com: could not connect to host nexth.de: could not connect to host nexth.net: did not receive HSTS header nexth.us: could not connect to host +noexpect.org: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host paypal.com: max-age too low: 14400 @@ -83,8 +84,6 @@ 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 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 4673c6a..abb6bf2 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(1409997954029000); +const PRTime gPreloadListExpirationTime = INT64_C(1410602782560000); class nsSTSPreload { @@ -170,6 +170,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 },

1 0

[tor-browser/esr24] Bug 998302 - Connect to about:config instead of about:credits to avoid accessing mozilla.org when the test runs. r=robcee, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit bf56c4ddf258ad32644db8deaaea932c9c9b6bcf Author: Rob Campbell <rcampbell(a)mozilla.com> Date: Wed May 7 10:38:00 2014 -0400 Bug 998302 - Connect to about:config instead of about:credits to avoid accessing mozilla.org when the test runs. r=robcee, a=test-only --- browser/devtools/webconsole/test/browser_webconsole_chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/devtools/webconsole/test/browser_webconsole_chrome.js b/browser/devtools/webconsole/test/browser_webconsole_chrome.js index badd3e5..a04a011 100644 --- a/browser/devtools/webconsole/test/browser_webconsole_chrome.js +++ b/browser/devtools/webconsole/test/browser_webconsole_chrome.js @@ -6,7 +6,7 @@ // Tests that code completion works properly. function test() { - addTab("about:credits"); + addTab("about:config"); browser.addEventListener("load", function onLoad() { browser.removeEventListener("load", onLoad, true); openConsole(null, testChrome);

1 0

[tor-browser/esr24] Bug 997341 - Modify content/xul/document/test/bug497875-iframe.xul to not connect to mozilla.org. r=smaug, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4b774c1d8ff33c32cd8d95ba4e158797a3a0218e Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Mon Apr 28 10:24:19 2014 -0400 Bug 997341 - Modify content/xul/document/test/bug497875-iframe.xul to not connect to mozilla.org. r=smaug, a=test-only --- content/xul/document/test/bug497875-iframe.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/xul/document/test/bug497875-iframe.xul b/content/xul/document/test/bug497875-iframe.xul index 030af18..8365e7d 100644 --- a/content/xul/document/test/bug497875-iframe.xul +++ b/content/xul/document/test/bug497875-iframe.xul @@ -1,6 +1,6 @@ <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"> <box onerror="document.loadOverlay('file:///does-not-exist', null);" > -<html:script src="ftp://mozilla.org"/> +<html:script src="ftp://some.website.that.will.cause.an.error"/> </box> </window>

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 997820 - Disable telemetry in tests. r=ted, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4fdb5662d96302066846bc29ba4c06f2633dd610 Author: Nathan Froyd <froydnj(a)gmail.com> Date: Fri Apr 18 11:03:00 2014 -0400 Bug 997820 - Disable telemetry in tests. r=ted, a=test-only --- js/src/tests/user.js | 2 +- layout/tools/reftest/runreftest.py | 4 ++++ testing/profiles/prefs_general.js | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/js/src/tests/user.js b/js/src/tests/user.js index a5c88b1..8849221 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -26,4 +26,4 @@ user_pref("javascript.options.strict", false); user_pref("javascript.options.werror", false); user_pref("toolkit.startup.max_resumed_crashes", -1); user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true); - +user_pref("toolkit.telemetry.enabled", false); diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 88c3199..70323a7 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -71,6 +71,10 @@ class RefTest(object): prefsFile.write('user_pref("reftest.filter", %s);\n' % self.makeJSString(options.filter)) prefsFile.write('user_pref("reftest.focusFilterMode", %s);\n' % self.makeJSString(options.focusFilterMode)) + # 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 + for v in options.extraPrefs: thispref = v.split("=") if len(thispref) < 2: diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index 3032a65..44b29b1 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -141,3 +141,6 @@ 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); + +// We want to collect telemetry, but we don't want to send in the results. +user_pref('toolkit.telemetry.server', 'https://%(server)s/telemetry-dummy/');

1 0

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

29 Aug '14

commit 02fe2535cbf3166ea6b4ee02d5f3efdbfff815f5 Author: ffxbld <none@none> Date: Sat Apr 26 03:13:14 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-333 - a=blocklist-update --- browser/app/blocklist.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 5f776e3..8de9f0f 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="1396993434000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1398202482000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -182,7 +182,7 @@ <prefs> </prefs> </emItem> - <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> + <emItem blockID="i491" id="{515b2424-5911-40bd-8a2c-bdb20286d8f5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> @@ -1103,6 +1103,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i533" id="extension(a)Fast_Free_Converter.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1121,8 +1127,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i491" id="{515b2424-5911-40bd-8a2c-bdb20286d8f5}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <emItem blockID="i576" id="newmoz(a)facebook.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> <prefs> </prefs>

1 0

[tor-browser/esr24] Bug 772823 - Focus the main test window before closing the newly opened window in order to work around an unknown focus manager bug. r=gavin, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 745f14404e5e5d7ee21e3d70b5f09fd1f1533907 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Thu Apr 17 10:59:10 2014 -0400 Bug 772823 - Focus the main test window before closing the newly opened window in order to work around an unknown focus manager bug. r=gavin, a=test-only --- docshell/test/chrome/mozFrameType_window.xul | 31 ++++++++++++++------------ 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/docshell/test/chrome/mozFrameType_window.xul b/docshell/test/chrome/mozFrameType_window.xul index 020e6f0..aa811c3 100644 --- a/docshell/test/chrome/mozFrameType_window.xul +++ b/docshell/test/chrome/mozFrameType_window.xul @@ -33,20 +33,23 @@ "iframe with mozFrameType='content' in chrome document is typeContent"); SimpleTest.executeSoon(function () { - // Wait for the window to be closed before finishing the test - let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] - .getService(Components.interfaces.nsIWindowWatcher); - ww.registerNotification(function windowObs(subject, topic, data) { - if (topic == "domwindowclosed") { - ww.unregisterNotification(windowObs); - - SimpleTest.waitForFocus(function() { - SimpleTest.finish(); - }, opener); - } - }); - - window.close(); + // First focus the parent window and then close this one. + SimpleTest.waitForFocus(function() { + let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] + .getService(Components.interfaces.nsIWindowWatcher); + ww.registerNotification(function windowObs(subject, topic, data) { + if (topic == "domwindowclosed") { + ww.unregisterNotification(windowObs); + + // Don't start the next test synchronously! + SimpleTest.executeSoon(function() { + SimpleTest.finish(); + }); + } + }); + + window.close(); + }, opener); }); } ]]></script>

1 0

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

29 Aug '14

commit f5d107462c23081418999ca2e41f0a680d35e7d4 Author: ffxbld <none@none> Date: Mon Apr 21 19:00:36 2014 -0400 Automated checkin: version bump for firefox 24.5.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 2781e2b..3bd5cba 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.4.0esrpre +24.5.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index c0110c9..3c59cb3 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.4.0 +24.5.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c0110c9..3c59cb3 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.0 +24.5.0esrpre

1 0

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

29 Aug '14

commit 0a1739dd79858b1330c0e995f85da3a231104b30 Author: tbirdbld <none@none> Date: Thu Apr 24 11:52:32 2014 -0400 Automated checkin: version bump for thunderbird 24.5.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 3c59cb3..dbc95cf 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.5.0esrpre +24.5.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 3c59cb3..dbc95cf 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.5.0esrpre +24.5.0

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] Bug 992968. r=efaust, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit ef9950875b05a9d4e61954cd28b50db4b2879a84 Author: Nicolas B. Pierron <nicolas.b.pierron(a)mozilla.com> Date: Thu Apr 17 09:48:42 2014 -0400 Bug 992968. r=efaust, a=sledru --- js/src/jit/CodeGenerator.cpp | 3 +++ js/src/jit/shared/CodeGenerator-shared.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index 534ae07..4fe0327 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -91,6 +91,9 @@ class OutOfLineUpdateCache : bool CodeGeneratorShared::addCache(LInstruction *lir, size_t cacheIndex) { + if (cacheIndex == SIZE_MAX) + return false; + IonCache *cache = static_cast<IonCache *>(getCache(cacheIndex)); MInstruction *mir = lir->mirRaw()->toInstruction(); if (mir->resumePoint()) diff --git a/js/src/jit/shared/CodeGenerator-shared.h b/js/src/jit/shared/CodeGenerator-shared.h index 6fdf97a..f0a7c8b 100644 --- a/js/src/jit/shared/CodeGenerator-shared.h +++ b/js/src/jit/shared/CodeGenerator-shared.h @@ -203,6 +203,8 @@ class CodeGeneratorShared : public LInstructionVisitor template <typename T> inline size_t allocateCache(const T &cache) { size_t index = allocateCache(cache, sizeof(mozilla::AlignedStorage2<T>)); + if (masm.oom()) + return SIZE_MAX; // Use the copy constructor on the allocated space. new (&runtimeData_[cacheList_.back()]) T(cache); return index;

1 0

[tor-browser/esr24] Bug 993546 - Refactor malloc-wrapping memory reporter implementations. r=njn, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 2861f1003fbb11e74c901d5bebc7f33be38b5396 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Tue Apr 15 13:11:59 2014 -0400 Bug 993546 - Refactor malloc-wrapping memory reporter implementations. r=njn, a=abillings --- extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h | 2 +- gfx/thebes/gfxAndroidPlatform.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h b/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h index 8c60074..60b7d33 100644 --- a/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h +++ b/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h @@ -84,7 +84,7 @@ inline void* hunspell_realloc(void* ptr, size_t size) void* result = moz_realloc(ptr, size); if (result) { HunspellReportMemoryAllocation(result); - } else { + } else if (size != 0) { // realloc failed; undo the HunspellReportMemoryDeallocation from above HunspellReportMemoryAllocation(ptr); } diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp index b220085..b47e171 100644 --- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -71,7 +71,7 @@ CountingRealloc(FT_Memory memory, long cur_size, long new_size, void* p) void *pnew = realloc(p, new_size); if (pnew) { sFreetypeMemoryUsed += FreetypeMallocSizeOfOnAlloc(pnew); - } else { + } else if (new_size != 0) { // realloc failed; undo the decrement from above sFreetypeMemoryUsed += FreetypeMallocSizeOfOnAlloc(p); }

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