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

[tor-browser/esr24] Bug 1024765 - Part 1: Add test-case for timers firing when the target thread is not running. r=bwc, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 74160028fb42bf8b86ec5b90c4fd2538f6cd2ac8 Author: Byron Campen [:bwc] <docfaraday(a)gmail.com> Date: Tue Jun 17 13:37:04 2014 -0700 Bug 1024765 - Part 1: Add test-case for timers firing when the target thread is not running. r=bwc, a=sledru --- xpcom/tests/TestTimers.cpp | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/xpcom/tests/TestTimers.cpp b/xpcom/tests/TestTimers.cpp index 8b4ac25..545a8c4 100644 --- a/xpcom/tests/TestTimers.cpp +++ b/xpcom/tests/TestTimers.cpp @@ -14,6 +14,7 @@ #include "nsThreadUtils.h" #include "prinrval.h" #include "prmon.h" +#include "prthread.h" #include "mozilla/Attributes.h" #include "mozilla/ReentrantMonitor.h" @@ -78,6 +79,7 @@ public: : mThreadPtr(aThreadPtr), mReentrantMonitor(aReentrantMonitor) { } NS_IMETHOD Notify(nsITimer* aTimer) { + NS_ASSERTION(mThreadPtr, "Callback was not supposed to be called!"); nsCOMPtr<nsIThread> current(do_GetCurrentThread()); ReentrantMonitorAutoEnter mon(*mReentrantMonitor); @@ -133,13 +135,45 @@ TestTargetedTimers() return NS_OK; } +nsresult +TestTimerWithStoppedTarget() +{ + AutoTestThread testThread; + NS_ENSURE_TRUE(testThread, NS_ERROR_OUT_OF_MEMORY); + + nsresult rv; + nsCOMPtr<nsITimer> timer = do_CreateInstance(NS_TIMER_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + + nsIEventTarget* target = static_cast<nsIEventTarget*>(testThread); + + rv = timer->SetTarget(target); + NS_ENSURE_SUCCESS(rv, rv); + + // If this is called, we'll assert + nsCOMPtr<nsITimerCallback> callback = + new TimerCallback(nullptr, nullptr); + NS_ENSURE_TRUE(callback, NS_ERROR_OUT_OF_MEMORY); + + rv = timer->InitWithCallback(callback, PR_MillisecondsToInterval(100), + nsITimer::TYPE_ONE_SHOT); + NS_ENSURE_SUCCESS(rv, rv); + + testThread->Shutdown(); + + PR_Sleep(400); + + return NS_OK; +} + int main(int argc, char** argv) { ScopedXPCOM xpcom("TestTimers"); NS_ENSURE_FALSE(xpcom.failed(), 1); static TestFuncPtr testsToRun[] = { - TestTargetedTimers + TestTargetedTimers, + TestTimerWithStoppedTarget }; static uint32_t testCount = sizeof(testsToRun) / sizeof(testsToRun[0]);

1 0

[tor-browser/esr24] Bug 1024765 - Part 2: Make refcounting logic around PostTimerEvent more explicit. r=bz, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 24b9acce7908ed422611abb09b77ae5ae222ce0a Author: Byron Campen [:bwc] <docfaraday(a)gmail.com> Date: Mon Jun 16 14:13:04 2014 -0700 Bug 1024765 - Part 2: Make refcounting logic around PostTimerEvent more explicit. r=bz, a=sledru --- xpcom/threads/TimerThread.cpp | 17 +++++++---- xpcom/threads/nsTimerImpl.cpp | 67 +++++++++++++++++++++++++++-------------- xpcom/threads/nsTimerImpl.h | 4 ++- 3 files changed, 59 insertions(+), 29 deletions(-) diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp index f8a7cb7..ebf5751 100644 --- a/xpcom/threads/TimerThread.cpp +++ b/xpcom/threads/TimerThread.cpp @@ -211,8 +211,9 @@ NS_IMETHODIMP TimerThread::Run() // must be racing with us, blocked in gThread->RemoveTimer waiting // for TimerThread::mMonitor, under nsTimerImpl::Release. - NS_ADDREF(timer); + nsRefPtr<nsTimerImpl> timerRef(timer); RemoveTimerInternal(timer); + timer = nullptr; { // We release mMonitor around the Fire call to avoid deadlock. @@ -222,16 +223,21 @@ NS_IMETHODIMP TimerThread::Run() if (PR_LOG_TEST(GetTimerLog(), PR_LOG_DEBUG)) { PR_LOG(GetTimerLog(), PR_LOG_DEBUG, ("Timer thread woke up %fms from when it was supposed to\n", - fabs((now - timer->mTimeout).ToMilliseconds()))); + fabs((now - timerRef->mTimeout).ToMilliseconds()))); } #endif // We are going to let the call to PostTimerEvent here handle the // release of the timer so that we don't end up releasing the timer // on the TimerThread instead of on the thread it targets. - if (NS_FAILED(timer->PostTimerEvent())) { - nsrefcnt rc; - NS_RELEASE2(timer, rc); + timerRef = nsTimerImpl::PostTimerEvent(timerRef.forget()); + + if (timerRef) { + // We got our reference back due to an error. + // Unhook the nsRefPtr, and release manually so we can get the + // refcount. + nsrefcnt rc = timerRef.forget().get()->Release(); + (void)rc; // The nsITimer interface requires that its users keep a reference // to the timers they use while those timers are initialized but @@ -246,7 +252,6 @@ NS_IMETHODIMP TimerThread::Run() // preventing this situation from occurring. MOZ_ASSERT(rc != 0, "destroyed timer off its target thread!"); } - timer = nullptr; } if (mShutdown) diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp index fd4b391..717f280 100644 --- a/xpcom/threads/nsTimerImpl.cpp +++ b/xpcom/threads/nsTimerImpl.cpp @@ -105,9 +105,10 @@ class nsTimerEvent : public nsRunnable { public: NS_IMETHOD Run(); - nsTimerEvent(nsTimerImpl *timer, int32_t generation) - : mTimer(dont_AddRef(timer)), mGeneration(generation) { - // timer is already addref'd for us + nsTimerEvent() + : mTimer() + , mGeneration(0) + { MOZ_COUNT_CTOR(nsTimerEvent); MOZ_ASSERT(gThread->IsOnTimerThread(), @@ -132,8 +133,18 @@ public: DeleteAllocatorIfNeeded(); } + already_AddRefed<nsTimerImpl> ForgetTimer() + { + return mTimer.forget(); + } + + void SetTimer(already_AddRefed<nsTimerImpl> aTimer) + { + mTimer = aTimer; + mGeneration = mTimer->GetGeneration(); + } + private: - nsTimerEvent(); // Not implemented ~nsTimerEvent() { MOZ_COUNT_DTOR(nsTimerEvent); @@ -629,23 +640,27 @@ NS_IMETHODIMP nsTimerEvent::Run() return NS_OK; } -nsresult nsTimerImpl::PostTimerEvent() +already_AddRefed<nsTimerImpl> nsTimerImpl::PostTimerEvent(already_AddRefed<nsTimerImpl> aTimerRef) { - if (!mEventTarget) { + nsRefPtr<nsTimerImpl> timer(aTimerRef); + if (!timer->mEventTarget) { NS_ERROR("Attempt to post timer event to NULL event target"); - return NS_ERROR_NOT_INITIALIZED; + return timer.forget(); } // XXX we may want to reuse this nsTimerEvent in the case of repeating timers. - // Since TimerThread addref'd 'this' for us, we don't need to addref here. - // We will release in destroyMyEvent. We need to copy the generation number - // from this timer into the event, so we can avoid firing a timer that was - // re-initialized after being canceled. + // Since TimerThread addref'd 'timer' for us, we don't need to addref here. + // We will release either in ~nsTimerEvent(), or pass the reference back to + // the caller. We need to copy the generation number from this timer into the + // event, so we can avoid firing a timer that was re-initialized after being + // canceled. - nsRefPtr<nsTimerEvent> event = new nsTimerEvent(this, mGeneration); + // Note: We override operator new for this class, and the override is + // fallible! + nsRefPtr<nsTimerEvent> event = new nsTimerEvent; if (!event) - return NS_ERROR_OUT_OF_MEMORY; + return timer.forget(); #ifdef DEBUG_TIMERS if (PR_LOG_TEST(GetTimerLog(), PR_LOG_DEBUG)) { @@ -655,21 +670,29 @@ nsresult nsTimerImpl::PostTimerEvent() // If this is a repeating precise timer, we need to calculate the time for // the next timer to fire before we make the callback. - if (IsRepeatingPrecisely()) { - SetDelayInternal(mDelay); + if (timer->IsRepeatingPrecisely()) { + timer->SetDelayInternal(timer->mDelay); // But only re-arm REPEATING_PRECISE timers. - if (gThread && mType == TYPE_REPEATING_PRECISE) { - nsresult rv = gThread->AddTimer(this); + if (gThread && timer->mType == TYPE_REPEATING_PRECISE) { + nsresult rv = gThread->AddTimer(timer); if (NS_FAILED(rv)) - return rv; + return timer.forget(); } } - nsresult rv = mEventTarget->Dispatch(event, NS_DISPATCH_NORMAL); - if (NS_FAILED(rv) && gThread) - gThread->RemoveTimer(this); - return rv; + nsIEventTarget* target = timer->mEventTarget; + event->SetTimer(timer.forget()); + + nsresult rv = target->Dispatch(event, NS_DISPATCH_NORMAL); + if (NS_FAILED(rv)) { + timer = event->ForgetTimer(); + if (gThread) + gThread->RemoveTimer(timer); + } + return timer.forget(); + + return nullptr; } void nsTimerImpl::SetDelayInternal(uint32_t aDelay) diff --git a/xpcom/threads/nsTimerImpl.h b/xpcom/threads/nsTimerImpl.h index c318cf1..4a24060 100644 --- a/xpcom/threads/nsTimerImpl.h +++ b/xpcom/threads/nsTimerImpl.h @@ -54,7 +54,9 @@ public: friend struct TimerAdditionComparator; void Fire(); - nsresult PostTimerEvent(); + // If a failure is encountered, the reference is returned to the caller + static already_AddRefed<nsTimerImpl> PostTimerEvent( + already_AddRefed<nsTimerImpl> aTimerRef); void SetDelayInternal(uint32_t aDelay); NS_DECL_ISUPPORTS

1 0

[tor-browser/esr24] Bug 1023121 - Update our progress in docloader before calling state change listeners. r=smaug, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 36053c97fc9dcec827646d2660c5d5b18a35bdbe Author: Boris Zbarsky <bzbarsky(a)mit.edu> Date: Tue Jun 24 23:36:39 2014 -0400 Bug 1023121 - Update our progress in docloader before calling state change listeners. r=smaug, a=sledru --- uriloader/base/nsDocLoader.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index de08daf..d08bc97 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -1016,16 +1016,20 @@ int64_t nsDocLoader::GetMaxTotalProgress() NS_IMETHODIMP nsDocLoader::OnProgress(nsIRequest *aRequest, nsISupports* ctxt, uint64_t aProgress, uint64_t aProgressMax) { - nsRequestInfo *info; int64_t progressDelta = 0; // // Update the RequestInfo entry with the new progress data // - info = GetRequestInfo(aRequest); - if (info) { + if (nsRequestInfo* info = GetRequestInfo(aRequest)) { + // Update info->mCurrentProgress before we call FireOnStateChange, + // since that can make the "info" pointer invalid. + int64_t oldCurrentProgress = info->mCurrentProgress; + progressDelta = int64_t(aProgress) - oldCurrentProgress; + info->mCurrentProgress = int64_t(aProgress); + // suppress sending STATE_TRANSFERRING if this is upload progress (see bug 240053) - if (!info->mUploading && (int64_t(0) == info->mCurrentProgress) && (int64_t(0) == info->mMaxProgress)) { + if (!info->mUploading && (int64_t(0) == oldCurrentProgress) && (int64_t(0) == info->mMaxProgress)) { // // If we receive an OnProgress event from a toplevel channel that the URI Loader // has not yet targeted, then we must suppress the event. This is necessary to @@ -1072,11 +1076,8 @@ NS_IMETHODIMP nsDocLoader::OnProgress(nsIRequest *aRequest, nsISupports* ctxt, FireOnStateChange(this, aRequest, flags, NS_OK); } - // Update the current progress count... - progressDelta = int64_t(aProgress) - info->mCurrentProgress; + // Update our overall current progress count. mCurrentSelfProgress += progressDelta; - - info->mCurrentProgress = int64_t(aProgress); } // // The request is not part of the load group, so ignore its progress

1 0

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

29 Aug '14

commit 35490cd7e0133b1466fa80616d011b559ce6862a Author: ffxbld <none@none> Date: Sat May 24 03:13:49 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-ix-032 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 8 ++++++++ security/manager/boot/src/nsSTSPreloadList.inc | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index c1694bd..831c969 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,11 +1,14 @@ admin.google.com: did not receive HSTS header +adsfund.org: could not connect to host airbnb.com: did not receive HSTS header alpha.irccloud.com: could not connect to host anycoin.me: did not receive HSTS header +api.lookout.com: could not connect to host 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 apis.google.com: did not receive HSTS header +app.lookout.com: could not connect to host appengine.google.com: did not receive HSTS header bassh.net: did not receive HSTS header bcrook.com: max-age too low: 86400 @@ -28,6 +31,7 @@ crate.io: did not receive HSTS header crowdcurity.com: did not receive HSTS header crypto.is: did not receive HSTS header csawctf.poly.edu: did not receive HSTS header +discovery.lookout.com: 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 @@ -58,6 +62,7 @@ iop.intuit.com: max-age too low: 86400 irccloud.com: did not receive HSTS header jitsi.org: did not receive HSTS header jottit.com: did not receive HSTS header +keymaster.lookout.com: did not receive HSTS header kiwiirc.com: max-age too low: 5256000 ledgerscope.net: did not receive HSTS header liberty.lavabit.com: could not connect to host @@ -65,6 +70,8 @@ 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 +mobilethreat.net: could not connect to host +mobilethreatnetwork.net: could not connect to host my.alfresco.com: did not receive HSTS header mydigipass.com: did not receive HSTS header mykolab.com: did not receive HSTS header @@ -86,6 +93,7 @@ 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 +semenkovich.com: did not receive HSTS header 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 bde7a03..8266427 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(1411207520608000); +const PRTime gPreloadListExpirationTime = INT64_C(1411812354538000); class nsSTSPreload { @@ -60,6 +60,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "cyphertite.com", true }, { "data.qld.gov.au", false }, { "davidlyness.com", true }, + { "detectify.com", false }, { "developer.mydigipass.com", false }, { "dillonkorman.com", true }, { "dist.torproject.org", false }, @@ -172,7 +173,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, { "seifried.org", true }, - { "semenkovich.com", true }, { "shodan.io", true }, { "silentcircle.com", false }, { "simbolo.co.uk", false }, @@ -191,8 +191,22 @@ static const nsSTSPreload kSTSPreloadList[] = { { "twitter.com", false }, { "ubertt.org", true }, { "vmoagents.com", false }, + { "w-spotlight.appspot.com", true }, + { "webfilings-eu-mirror.appspot.com", true }, + { "webfilings-eu.appspot.com", true }, + { "webfilings-mirror-hrd.appspot.com", true }, + { "webfilings.appspot.com", true }, { "webmail.gigahost.dk", false }, { "webmail.onlime.ch", false }, + { "wf-bigsky-master.appspot.com", true }, + { "wf-demo-eu.appspot.com", true }, + { "wf-demo-hrd.appspot.com", true }, + { "wf-dogfood-hrd.appspot.com", true }, + { "wf-pentest.appspot.com", true }, + { "wf-staging-hr.appspot.com", true }, + { "wf-training-hrd.appspot.com", true }, + { "wf-training-master.appspot.com", true }, + { "wf-trial-hrd.appspot.com", true }, { "wiki.python.org", true }, { "wiz.biz", true }, { "writeapp.me", false }, @@ -228,5 +242,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.twitter.com", false }, { "www.usaa.com", false }, { "www.zenpayroll.com", false }, + { "xbrlsuccess.appspot.com", true }, { "zenpayroll.com", false }, };

1 0

[tor-browser/esr24] Bug 978811 - Fix isFakeExitFrame to return true for entry frames. r=nbp, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit e1710d77a0d80c5f2bd2e3bf3b09dad4a20478e8 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue May 20 08:34:25 2014 -0400 Bug 978811 - Fix isFakeExitFrame to return true for entry frames. r=nbp, a=lmandel --- js/src/jit/IonFrames-inl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/src/jit/IonFrames-inl.h b/js/src/jit/IonFrames-inl.h index c3893469..cd0c716 100644 --- a/js/src/jit/IonFrames-inl.h +++ b/js/src/jit/IonFrames-inl.h @@ -82,7 +82,8 @@ IonFrameIterator::isFakeExitFrame() const { bool res = (prevType() == IonFrame_Unwound_Rectifier || prevType() == IonFrame_Unwound_OptimizedJS || - prevType() == IonFrame_Unwound_BaselineStub); + prevType() == IonFrame_Unwound_BaselineStub || + (prevType() == IonFrame_Entry && type() == IonFrame_Exit)); JS_ASSERT_IF(res, type() == IonFrame_Exit || type() == IonFrame_BaselineJS); return res; }

1 0

[tor-browser/esr24] Bump version to 24.6.0esrpre DONTBUILD a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 548ea97875a91e3292d51b405dcbd46669a1ec69 Author: Nick Thomas <nthomas(a)mozilla.com> Date: Wed May 28 08:23:30 2014 +1200 Bump version to 24.6.0esrpre DONTBUILD a=lmandel --- 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 3bd5cba..60f1860 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.5.0esrpre +24.6.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index dbc95cf..c9dc647 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.5.0 +24.6.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index dbc95cf..c9dc647 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.0 +24.6.0esrpre

1 0

[tor-browser/esr24] Bug 983709 - Simple branch patch for uplift. r=hv1989, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit daf403c994ad846e5aebccf874c5df32e1de5c17 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Fri Apr 4 09:03:06 2014 -0400 Bug 983709 - Simple branch patch for uplift. r=hv1989, a=lmandel --- js/src/jit/MIR.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index e9bc029..96ba2d4 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -2156,6 +2156,9 @@ class MCreateThisWithProto AliasSet getAliasSet() const { return AliasSet::None(); } + bool congruentTo(MDefinition *ins) const { + return false; + } TypePolicy *typePolicy() { return this; }

1 0

[tor-browser/esr24] Bug 1007940 - Improve the performance of editor initialization. r=bzbarsky, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1bef29ba36ea5c8359617b3df4e68b76b4b50b98 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri May 9 17:02:29 2014 -0400 Bug 1007940 - Improve the performance of editor initialization. r=bzbarsky, a=lmandel --- editor/libeditor/html/nsHTMLEditRules.cpp | 32 +++++++++++++++++--------- editor/libeditor/html/nsHTMLEditRules.h | 2 ++ editor/libeditor/html/nsHTMLEditor.cpp | 7 +++--- editor/libeditor/text/nsPlaintextEditor.cpp | 8 +++---- editor/libeditor/text/nsTextEditRules.cpp | 33 +++++++++++++++++++-------- editor/libeditor/text/nsTextEditRules.h | 2 ++ 6 files changed, 56 insertions(+), 28 deletions(-) diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp index 04e94ea..599682e 100644 --- a/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/editor/libeditor/html/nsHTMLEditRules.cpp @@ -169,16 +169,25 @@ class nsEditableTextFunctor : public nsBoolDomIterFunctor * Constructor/Destructor ********************************************************/ -nsHTMLEditRules::nsHTMLEditRules() : -mDocChangeRange(nullptr) -,mListenerEnabled(true) -,mReturnInEmptyLIKillsList(true) -,mDidDeleteSelection(false) -,mDidRangedDelete(false) -,mRestoreContentEditableCount(false) -,mUtilRange(nullptr) -,mJoinOffset(0) +nsHTMLEditRules::nsHTMLEditRules() { + InitFields(); +} + +void +nsHTMLEditRules::InitFields() +{ + mHTMLEditor = nullptr; + mDocChangeRange = nullptr; + mListenerEnabled = true; + mReturnInEmptyLIKillsList = true; + mDidDeleteSelection = false; + mDidRangedDelete = false; + mRestoreContentEditableCount = false; + mUtilRange = nullptr; + mJoinOffset = 0; + mNewBlock = nullptr; + mRangeItem = new nsRangeStore(); // populate mCachedStyles mCachedStyles[0] = StyleCache(nsEditProperty::b, EmptyString(), EmptyString()); mCachedStyles[1] = StyleCache(nsEditProperty::i, EmptyString(), EmptyString()); @@ -199,7 +208,6 @@ mDocChangeRange(nullptr) mCachedStyles[16] = StyleCache(nsEditProperty::cssBackgroundColor, EmptyString(), EmptyString()); mCachedStyles[17] = StyleCache(nsEditProperty::sub, EmptyString(), EmptyString()); mCachedStyles[18] = StyleCache(nsEditProperty::sup, EmptyString(), EmptyString()); - mRangeItem = new nsRangeStore(); } nsHTMLEditRules::~nsHTMLEditRules() @@ -229,9 +237,11 @@ NS_IMPL_QUERY_INTERFACE_INHERITED1(nsHTMLEditRules, nsTextEditRules, nsIEditActi NS_IMETHODIMP nsHTMLEditRules::Init(nsPlaintextEditor *aEditor) { + InitFields(); + mHTMLEditor = static_cast<nsHTMLEditor*>(aEditor); nsresult res; - + // call through to base class Init res = nsTextEditRules::Init(aEditor); NS_ENSURE_SUCCESS(res, res); diff --git a/editor/libeditor/html/nsHTMLEditRules.h b/editor/libeditor/html/nsHTMLEditRules.h index 28bf20c..5d12c4d 100644 --- a/editor/libeditor/html/nsHTMLEditRules.h +++ b/editor/libeditor/html/nsHTMLEditRules.h @@ -125,6 +125,8 @@ protected: kBlockEnd }; + void InitFields(); + // nsHTMLEditRules implementation methods nsresult WillInsert(nsISelection *aSelection, bool *aCancel); nsresult WillInsertText( EditAction aAction, diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp index 2bc2ce6..9ed79d5 100644 --- a/editor/libeditor/html/nsHTMLEditor.cpp +++ b/editor/libeditor/html/nsHTMLEditor.cpp @@ -485,9 +485,10 @@ nsHTMLEditor::SetFlags(uint32_t aFlags) NS_IMETHODIMP nsHTMLEditor::InitRules() { - MOZ_ASSERT(!mRules); - // instantiate the rules for the html editor - mRules = new nsHTMLEditRules(); + if (!mRules) { + // instantiate the rules for the html editor + mRules = new nsHTMLEditRules(); + } return mRules->Init(static_cast<nsPlaintextEditor*>(this)); } diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp index 39db37c..f5e7053 100644 --- a/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/editor/libeditor/text/nsPlaintextEditor.cpp @@ -121,7 +121,6 @@ NS_IMETHODIMP nsPlaintextEditor::Init(nsIDOMDocument *aDoc, nsresult res = NS_OK, rulesRes = NS_OK; if (mRules) { mRules->DetachEditor(); - mRules = nullptr; } if (1) @@ -315,9 +314,10 @@ nsPlaintextEditor::UpdateMetaCharset(nsIDOMDocument* aDocument, NS_IMETHODIMP nsPlaintextEditor::InitRules() { - MOZ_ASSERT(!mRules); - // instantiate the rules for this text editor - mRules = new nsTextEditRules(); + if (!mRules) { + // instantiate the rules for this text editor + mRules = new nsTextEditRules(); + } return mRules->Init(this); } diff --git a/editor/libeditor/text/nsTextEditRules.cpp b/editor/libeditor/text/nsTextEditRules.cpp index aaba83d..d3852b7 100644 --- a/editor/libeditor/text/nsTextEditRules.cpp +++ b/editor/libeditor/text/nsTextEditRules.cpp @@ -56,17 +56,28 @@ using namespace mozilla; ********************************************************/ nsTextEditRules::nsTextEditRules() -: mEditor(nullptr) -, mPasswordText() -, mPasswordIMEText() -, mPasswordIMEIndex(0) -, mActionNesting(0) -, mLockRulesSniffing(false) -, mDidExplicitlySetInterline(false) -, mTheAction(EditAction::none) -, mLastStart(0) -, mLastLength(0) { + InitFields(); +} + +void +nsTextEditRules::InitFields() +{ + mEditor = nullptr; + mPasswordText.Truncate(); + mPasswordIMEText.Truncate(); + mPasswordIMEIndex = 0; + mBogusNode = nullptr; + mCachedSelectionNode = nullptr; + mCachedSelectionOffset = 0; + mActionNesting = 0; + mLockRulesSniffing = false; + mDidExplicitlySetInterline = false; + mDeleteBidiImmediately = false; + mTheAction = EditAction::none; + mTimer = nullptr; + mLastStart = 0; + mLastLength = 0; } nsTextEditRules::~nsTextEditRules() @@ -101,6 +112,8 @@ nsTextEditRules::Init(nsPlaintextEditor *aEditor) { if (!aEditor) { return NS_ERROR_NULL_POINTER; } + InitFields(); + mEditor = aEditor; // we hold a non-refcounted reference back to our editor nsCOMPtr<nsISelection> selection; mEditor->GetSelection(getter_AddRefs(selection)); diff --git a/editor/libeditor/text/nsTextEditRules.h b/editor/libeditor/text/nsTextEditRules.h index 4dfed8a..3db6463 100644 --- a/editor/libeditor/text/nsTextEditRules.h +++ b/editor/libeditor/text/nsTextEditRules.h @@ -99,6 +99,8 @@ public: protected: + void InitFields(); + // nsTextEditRules implementation methods nsresult WillInsertText( EditAction aAction, mozilla::Selection* aSelection,

1 0

[tor-browser/esr24] Bug 996715 - Remove the code that bails when determining if the second instruction in a chunk is a branch. r=dougc, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 8612874aed5c628ab7dbd8f2c381f829a11c7bef Author: Marty Rosenberg <mrosenberg(a)mozilla.com> Date: Tue May 27 09:40:35 2014 -0400 Bug 996715 - Remove the code that bails when determining if the second instruction in a chunk is a branch. r=dougc, a=lmandel --- js/src/jit/shared/IonAssemblerBufferWithConstantPools.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/src/jit/shared/IonAssemblerBufferWithConstantPools.h b/js/src/jit/shared/IonAssemblerBufferWithConstantPools.h index ec0886c..eed3ffd 100644 --- a/js/src/jit/shared/IonAssemblerBufferWithConstantPools.h +++ b/js/src/jit/shared/IonAssemblerBufferWithConstantPools.h @@ -216,8 +216,6 @@ struct BufferSliceTail : public BufferSlice<SliceSize> { isBranch[idx >> 3] |= 1 << (idx & 0x7); } bool isNextBranch() { - if (this->nodeSize == InstBaseSize) - return false; int idx = this->nodeSize / InstBaseSize; return (isBranch[idx >> 3] >> (idx & 0x7)) & 1; }

1 0

[tor-browser/esr24] Bug 1005552 - Fuss around with marquee some more. r=bz, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f726940eaa87e81d588f8dda08a57823b1e993bb Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Wed May 28 12:43:07 2014 -0700 Bug 1005552 - Fuss around with marquee some more. r=bz, a=abillings --- layout/style/xbl-marquee/xbl-marquee.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/style/xbl-marquee/xbl-marquee.xml b/layout/style/xbl-marquee/xbl-marquee.xml index 2a883ac..fdd97af 100644 --- a/layout/style/xbl-marquee/xbl-marquee.xml +++ b/layout/style/xbl-marquee/xbl-marquee.xml @@ -264,7 +264,7 @@ // // NB: Make sure to wrap the constructor in parentheses to // deal with the weird precedence of |new| in JS. - this["_on" + aName] = new (XPCNativeWrapper.unwrap(window).Function)("event", aValue); + this["_on" + aName] = function(e) { window.setTimeout((new (XPCNativeWrapper.unwrap(window).Function)("event", aValue)).bind(this, e), 0); }; } catch(e) { return false;

1 0