- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 1018234 - Reference count fontFaces. r=jfkthame, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1d07beef613496ed0768603fc401c4b1444400e6 Author: James Kitchener <jkitch.bug(a)gmail.com> Date: Wed Jun 25 10:12:31 2014 +0100 Bug 1018234 - Reference count fontFaces. r=jfkthame, a=sledru --- gfx/thebes/gfxDWriteFontList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp index bef515f..8df648f 100644 --- a/gfx/thebes/gfxDWriteFontList.cpp +++ b/gfx/thebes/gfxDWriteFontList.cpp @@ -350,7 +350,7 @@ public: } private: - IDWriteFontFace *mFontFace; + nsRefPtr<IDWriteFontFace> mFontFace; void *mContext; };

1 0

[tor-browser/esr24] Bug 1033340 - remove use of API not present on ESR 24. a=morebustage, bag=brownpaper.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 89c62704f293dc6ec816b936c634046c2c11bc5f Author: Gervase Markham <gerv(a)gerv.net> Date: Thu Jul 3 17:25:58 2014 +0100 Bug 1033340 - remove use of API not present on ESR 24. a=morebustage, bag=brownpaper. --- netwerk/test/unit/test_psl.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/netwerk/test/unit/test_psl.js b/netwerk/test/unit/test_psl.js index 251ffa6..91124ea 100644 --- a/netwerk/test/unit/test_psl.js +++ b/netwerk/test/unit/test_psl.js @@ -4,8 +4,6 @@ var etld = Cc["@mozilla.org/network/effective-tld-service;1"] var idna = Cc["@mozilla.org/network/idn-service;1"] .getService(Ci.nsIIDNService); -var Cr = Components.results; - function run_test() { var file = do_get_file("data/test_psl.txt"); @@ -23,8 +21,8 @@ function checkPublicSuffix(host, expectedSuffix) var actualSuffix = null; try { actualSuffix = etld.getBaseDomainFromHost(host); - } catch (e if e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS || - e.result == Cr.NS_ERROR_ILLEGAL_VALUE) { + } catch (e if e.name == "NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS" || + e.name == "NS_ERROR_ILLEGAL_VALUE") { } // The EffectiveTLDService always gives back punycoded labels. // The test suite wants to get back what it put in.

1 0

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

29 Aug '14

commit 949aaf809a1756d39b87dc5d2a483246ce301a86 Author: ffxbld <none@none> Date: Sat Jun 28 03:10:27 2014 -0700 No bug, Automated blocklist update from host b-linux64-ix-0011 - a=blocklist-update --- browser/app/blocklist.xml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 87367d7..225701e 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="1403216209000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1403823002000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -193,6 +193,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i77" id="{fa277cfc-1d75-4949-a1f9-4ac8e41b2dfd}"> + <versionRange minVersion="0" maxVersion="*"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i40" id="{28387537-e3f9-4ed7-860c-11e69af4a8a0}"> <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1"> </versionRange> @@ -244,10 +250,12 @@ <prefs> </prefs> </emItem> - <emItem blockID="i77" id="{fa277cfc-1d75-4949-a1f9-4ac8e41b2dfd}"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i630" id="webbooster(a)iminent.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> + <pref>browser.startup.homepage</pref> + <pref>browser.search.defaultenginename</pref> </prefs> </emItem> <emItem blockID="i174" id="info(a)thebflix.com"> @@ -571,6 +579,14 @@ <prefs> </prefs> </emItem> + <emItem blockID="i628" id="ffxtlbr(a)iminent.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + <pref>browser.startup.homepage</pref> + <pref>browser.search.defaultenginename</pref> + </prefs> + </emItem> <emItem blockID="i228" id="crossriderapp5060(a)crossrider.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange>

1 0

[tor-browser/esr24] Bug 1033340 - port forward PSL test changes also, to try and get rid of xpcshell PSL bustage. a=bustage.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 994856d33e0338cb0378eeca454a6bca428acef7 Author: Gervase Markham <gerv(a)gerv.net> Date: Thu Jul 3 15:22:34 2014 +0100 Bug 1033340 - port forward PSL test changes also, to try and get rid of xpcshell PSL bustage. a=bustage. --- netwerk/test/unit/data/test_psl.txt | 32 ++++++++++++++++++++++++++------ netwerk/test/unit/test_psl.js | 20 ++++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/netwerk/test/unit/data/test_psl.txt b/netwerk/test/unit/data/test_psl.txt index 5a75831..35c8ccf 100644 --- a/netwerk/test/unit/data/test_psl.txt +++ b/netwerk/test/unit/data/test_psl.txt @@ -60,12 +60,12 @@ checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp'); checkPublicSuffix('city.kobe.jp', 'city.kobe.jp'); checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp'); // TLD with a wildcard rule and exceptions. -checkPublicSuffix('om', null); -checkPublicSuffix('test.om', null); -checkPublicSuffix('b.test.om', 'b.test.om'); -checkPublicSuffix('a.b.test.om', 'b.test.om'); -checkPublicSuffix('songfest.om', 'songfest.om'); -checkPublicSuffix('www.songfest.om', 'songfest.om'); +checkPublicSuffix('ck', null); +checkPublicSuffix('test.ck', null); +checkPublicSuffix('b.test.ck', 'b.test.ck'); +checkPublicSuffix('a.b.test.ck', 'b.test.ck'); +checkPublicSuffix('www.ck', 'www.ck'); +checkPublicSuffix('www.www.ck', 'www.ck'); // US K12. checkPublicSuffix('us', null); checkPublicSuffix('test.us', 'test.us'); @@ -76,3 +76,23 @@ checkPublicSuffix('www.test.ak.us', 'test.ak.us'); checkPublicSuffix('k12.ak.us', null); checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us'); checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us'); +// IDN labels. +checkPublicSuffix('食狮.com.cn', '食狮.com.cn'); +checkPublicSuffix('食狮.公司.cn', '食狮.公司.cn'); +checkPublicSuffix('www.食狮.公司.cn', '食狮.公司.cn'); +checkPublicSuffix('shishi.公司.cn', 'shishi.公司.cn'); +checkPublicSuffix('公司.cn', null); +checkPublicSuffix('食狮.中国', '食狮.中国'); +checkPublicSuffix('www.食狮.中国', '食狮.中国'); +checkPublicSuffix('shishi.中国', 'shishi.中国'); +checkPublicSuffix('中国', null); +// Same as above, but punycoded. +checkPublicSuffix('xn--85x722f.com.cn', 'xn--85x722f.com.cn'); +checkPublicSuffix('xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn'); +checkPublicSuffix('www.xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn'); +checkPublicSuffix('shishi.xn--55qx5d.cn', 'shishi.xn--55qx5d.cn'); +checkPublicSuffix('xn--55qx5d.cn', null); +checkPublicSuffix('xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s'); +checkPublicSuffix('www.xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s'); +checkPublicSuffix('shishi.xn--fiqs8s', 'shishi.xn--fiqs8s'); +checkPublicSuffix('xn--fiqs8s', null); diff --git a/netwerk/test/unit/test_psl.js b/netwerk/test/unit/test_psl.js index 446fe4c..251ffa6 100644 --- a/netwerk/test/unit/test_psl.js +++ b/netwerk/test/unit/test_psl.js @@ -1,9 +1,11 @@ -const Cc = Components.classes; -const Ci = Components.interfaces; - var etld = Cc["@mozilla.org/network/effective-tld-service;1"] .getService(Ci.nsIEffectiveTLDService); +var idna = Cc["@mozilla.org/network/idn-service;1"] + .getService(Ci.nsIIDNService); + +var Cr = Components.results; + function run_test() { var file = do_get_file("data/test_psl.txt"); @@ -13,7 +15,7 @@ function run_test() var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"] .getService(Ci.mozIJSSubScriptLoader); var srvScope = {}; - scriptLoader.loadSubScript(uri.spec, srvScope); + scriptLoader.loadSubScript(uri.spec, srvScope, "utf-8"); } function checkPublicSuffix(host, expectedSuffix) @@ -21,8 +23,14 @@ function checkPublicSuffix(host, expectedSuffix) var actualSuffix = null; try { actualSuffix = etld.getBaseDomainFromHost(host); - } catch (e if e.name == "NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS" || - e.name == "NS_ERROR_ILLEGAL_VALUE") { + } catch (e if e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS || + e.result == Cr.NS_ERROR_ILLEGAL_VALUE) { + } + // The EffectiveTLDService always gives back punycoded labels. + // The test suite wants to get back what it put in. + if (actualSuffix !== null && expectedSuffix !== null && + /(^|\.)xn--/.test(actualSuffix) && !/(^|\.)xn--/.test(expectedSuffix)) { + actualSuffix = idna.convertACEtoUTF8(actualSuffix); } do_check_eq(actualSuffix, expectedSuffix); }

1 0

[tor-browser/esr24] Bug 1012694 - IonMonkey (ARM): Use the second scratch register to avoid clobbering the scratch register. r=dougc, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 8acbe105e17e37d23712925261926f04363f7b22 Author: Douglas Crosher <dtc-moz(a)scieneer.com> Date: Tue Jun 17 11:47:45 2014 +1000 Bug 1012694 - IonMonkey (ARM): Use the second scratch register to avoid clobbering the scratch register. r=dougc, a=abillings --- js/src/jit/arm/MacroAssembler-arm.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/js/src/jit/arm/MacroAssembler-arm.h b/js/src/jit/arm/MacroAssembler-arm.h index 04d68af..7bc0da0 100644 --- a/js/src/jit/arm/MacroAssembler-arm.h +++ b/js/src/jit/arm/MacroAssembler-arm.h @@ -763,8 +763,9 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM if (lhs.getTag() == Operand::OP2) { branch32(cond, lhs.toReg(), rhs, label); } else { - ma_ldr(lhs, ScratchRegister); - branch32(cond, ScratchRegister, rhs, label); + // branch32 will use ScratchRegister. + ma_ldr(lhs, secondScratchReg_); + branch32(cond, secondScratchReg_, rhs, label); } } void branch32(Condition cond, const Address &lhs, Register rhs, Label *label) { @@ -772,8 +773,9 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM branch32(cond, ScratchRegister, rhs, label); } void branch32(Condition cond, const Address &lhs, Imm32 rhs, Label *label) { - load32(lhs, ScratchRegister); - branch32(cond, ScratchRegister, rhs, label); + // branch32 will use ScratchRegister. + load32(lhs, secondScratchReg_); + branch32(cond, secondScratchReg_, rhs, label); } void branchPtr(Condition cond, const Address &lhs, Register rhs, Label *label) { branch32(cond, lhs, rhs, label); @@ -856,8 +858,9 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM ma_b(label, cond); } void branchTest32(Condition cond, const Address &address, Imm32 imm, Label *label) { - ma_ldr(Operand(address.base, address.offset), ScratchRegister); - branchTest32(cond, ScratchRegister, imm, label); + // branchTest32 will use ScratchRegister. + load32(address, secondScratchReg_); + branchTest32(cond, secondScratchReg_, imm, label); } void branchTestPtr(Condition cond, const Register &lhs, const Register &rhs, Label *label) { branchTest32(cond, lhs, rhs, label);

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 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] No bug, Automated HSTS preload list update from host b-linux64-ix-0003 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f2098e41efdcb4b261717475aad41d9307b91841 Author: ffxbld <none@none> Date: Sat Jun 21 03:13:20 2014 -0700 No bug, Automated HSTS preload list update from host b-linux64-ix-0003 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 8 ++++---- security/manager/boot/src/nsSTSPreloadList.inc | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 7d18d22..dbd20ab 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,7 +1,6 @@ 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: did not receive HSTS header anycoin.me: did not receive HSTS header api.lookout.com: could not connect to host api.mega.co.nz: could not connect to host @@ -11,7 +10,7 @@ app.lookout.com: could not connect to host appengine.google.com: did not receive HSTS header appseccalifornia.org: did not receive HSTS header bassh.net: did not receive HSTS header -bcrook.com: max-age too low: 86400 +bccx.com: could not connect to host betnet.fr: could not connect to host bigshinylock.minazo.net: could not connect to host blacklane.com: did not receive HSTS header @@ -47,6 +46,7 @@ errors.zenpayroll.com: could not connect to host espra.com: could not connect to host fatzebra.com.au: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header +getlantern.org: did not receive HSTS header glass.google.com: did not receive HSTS header gmail.com: did not receive HSTS header googlemail.com: did not receive HSTS header @@ -59,6 +59,7 @@ history.google.com: did not receive HSTS header hostedtalkgadget.google.com: did not receive HSTS header id.atlassian.com: did not receive HSTS header in.xero.com: max-age too low: 3600 +intercom.io: did not receive HSTS header iop.intuit.com: max-age too low: 86400 irccloud.com: did not receive HSTS header jitsi.org: did not receive HSTS header @@ -109,7 +110,7 @@ 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 -static.wepay.com: did not receive HSTS header +stocktrade.de: 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 @@ -117,7 +118,6 @@ talkgadget.google.com: did not receive HSTS header translate.googleapis.com: did not receive HSTS header uprotect.it: could not connect to host wallet.google.com: did not receive HSTS header -waveapps.com: no error webmail.mayfirst.org: did not receive HSTS header whonix.org: did not receive HSTS header www.cueup.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 2e204ef..8e1a1aa 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(1413626792852000); +const PRTime gPreloadListExpirationTime = INT64_C(1414231532587000); class nsSTSPreload { @@ -23,6 +23,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "activiti.alfresco.com", false }, { "adsfund.org", true }, { "aladdinschools.appspot.com", false }, + { "alpha.irccloud.com", false }, { "api.intercom.io", false }, { "api.simple.com", false }, { "api.xero.com", false }, @@ -32,6 +33,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "arivo.com.br", true }, { "bank.simple.com", false }, { "bccx.com", true }, + { "bcrook.com", false }, { "bitbucket.org", false }, { "blog.cyveillance.com", true }, { "blog.linode.com", false }, @@ -84,7 +86,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "forum.quantifiedself.com", true }, { "gernert-server.de", true }, { "getcloak.com", false }, - { "getlantern.org", false }, { "go.xero.com", false }, { "gocardless.com", true }, { "grc.com", false }, @@ -96,7 +97,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "id.mayfirst.org", false }, { "imouto.my", false }, { "inertianetworks.com", true }, - { "intercom.io", false }, { "itriskltd.com", true }, { "keeperapp.com", true }, { "keepersecurity.com", true }, @@ -182,7 +182,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "skydrive.live.com", false }, { "squareup.com", false }, { "stage.wepay.com", false }, - { "stocktrade.de", false }, + { "static.wepay.com", false }, { "stripe.com", true }, { "strongest-privacy.com", true }, { "subrosa.io", true }, @@ -224,6 +224,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.banking.co.at", false }, { "www.braintreepayments.com", false }, { "www.calyxinstitute.org", false }, + { "www.capitainetrain.com", false }, { "www.cyveillance.com", true }, { "www.dropcam.com", false }, { "www.entropia.de", false },

1 0

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

29 Aug '14

commit 42156affb0a4125f15e48fdc2c119cf774843b46 Author: ffxbld <none@none> Date: Sat Jun 21 03:08:52 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-118 - a=blocklist-update --- browser/app/blocklist.xml | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 91763d3..87367d7 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="1402612020000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1403216209000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -89,6 +89,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i626" id="{20AD702C-661E-4534-8CE9-BA4EC9AD6ECC}"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i20" id="{AB2CE124-6272-4b12-94A9-7303C7397BD1}"> <versionRange minVersion="0.1" maxVersion="5.2.0.7164" severity="1"> </versionRange> @@ -304,10 +310,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i496" id="{ACAA314B-EEBA-48e4-AD47-84E31C44796C}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> - </versionRange> - <prefs> + <emItem blockID="i47" id="youtube(a)youtube2.com"> + <prefs> </prefs> </emItem> <emItem blockID="i360" id="ytd(a)mybrowserbar.com"> @@ -365,8 +369,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i584" id="{52b0f3db-f988-4788-b9dc-861d016f4487}"> - <versionRange minVersion="0" maxVersion="0.1.9999999" severity="1"> + <emItem blockID="i624" id="/^({b95faac1-a3d7-4d69-8943-ddd5a487d966}|{ecce0073-a837-45a2-95b9-600420505f7e}|{2713b394-286f-4d7c-89ea-4174eeab9f5a}|{da7a20cf-bef4-4342-ad78-0240fdf87055})$/"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -697,7 +701,7 @@ </prefs> </emItem> <emItem blockID="i620" id="{21EAF666-26B3-4A3C-ABD0-CA2F5A326744}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> <prefs> </prefs> @@ -714,6 +718,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i584" id="{52b0f3db-f988-4788-b9dc-861d016f4487}"> + <versionRange minVersion="0" maxVersion="0.1.9999999" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i370" id="happylyrics(a)hpyproductions.net"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1211,8 +1221,10 @@ <prefs> </prefs> </emItem> - <emItem blockID="i47" id="youtube(a)youtube2.com"> - <prefs> + <emItem blockID="i622" id="/^({ebd898f8-fcf6-4694-bc3b-eabc7271eeb1}|{46008e0d-47ac-4daa-a02a-5eb69044431a}|{213c8ed6-1d78-4d8f-8729-25006aa86a76}|{fa23121f-ee7c-4bd8-8c06-123d087282c5}|{19803860-b306-423c-bbb5-f60a7d82cde5})$/"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i518" id="/^({d6e79525-4524-4707-9b97-1d70df8e7e59}|{ddb4644d-1a37-4e6d-8b6e-8e35e2a8ea6c}|{e55007f4-80c5-418e-ac33-10c4d60db01e}|{e77d8ca6-3a60-4ae9-8461-53b22fa3125b}|{e89a62b7-248e-492f-9715-43bf8c507a2f}|{5ce3e0cb-aa83-45cb-a7da-a2684f05b8f3})$/"> @@ -1508,6 +1520,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i496" id="{ACAA314B-EEBA-48e4-AD47-84E31C44796C}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i67" id="youtube2(a)youtube2.com"> <versionRange minVersion="0" maxVersion="*"> </versionRange>

1 0

[tor-browser/esr24] Bug 913805 - Hold a lock on the RasterImage in ScaleRequest so that the srcFrame doesn't go away if we need to discard images to free up memory. r=seth, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f3f9e0f211c9c179f9f240eafd4bfcbfc903c3d4 Author: George Wright <george(a)mozilla.com> Date: Fri Jun 6 14:26:21 2014 -0400 Bug 913805 - Hold a lock on the RasterImage in ScaleRequest so that the srcFrame doesn't go away if we need to discard images to free up memory. r=seth, a=abillings --- image/src/RasterImage.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index 42d4232..fdd9654 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -208,6 +208,9 @@ public: bool success = false; if (!dstLocked) { + // We need to hold a lock onto the RasterImage object itself so that + // it (and its associated imgFrames) aren't marked as discardable. + bool imgLocked = NS_SUCCEEDED(image->LockImage()); bool srcLocked = NS_SUCCEEDED(srcFrame->LockImageData()); dstLocked = NS_SUCCEEDED(dstFrame->LockImageData()); @@ -216,7 +219,7 @@ public: success = srcLocked && NS_SUCCEEDED(srcFrame->GetSurface(getter_AddRefs(srcASurf))); success = success && dstLocked && NS_SUCCEEDED(dstFrame->GetSurface(getter_AddRefs(dstASurf))); - success = success && srcLocked && dstLocked && srcASurf && dstASurf; + success = success && imgLocked && srcLocked && dstLocked && srcASurf && dstASurf; if (success) { srcSurface = srcASurf->GetAsImageSurface(); @@ -254,6 +257,7 @@ public: bool success = false; if (dstLocked) { success = NS_SUCCEEDED(dstFrame->UnlockImageData()); + success = success && NS_SUCCEEDED(image->UnlockImage()); dstLocked = false; srcData = nullptr;

1 0

[tor-browser/esr24] Bug 1023618 - Always call FlushRendering in the reftest harness. r=roc, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 9192077d0d22be236936c29a4a87a7d2246869a8 Author: Seth Fowler <seth(a)mozilla.com> Date: Wed Jun 11 20:21:08 2014 -0700 Bug 1023618 - Always call FlushRendering in the reftest harness. r=roc, a=test-only --- layout/tools/reftest/reftest-content.js | 51 +++++++++++++++++-------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js index 09ee3e2..efadf82 100644 --- a/layout/tools/reftest/reftest-content.js +++ b/layout/tools/reftest/reftest-content.js @@ -268,43 +268,45 @@ const STATE_WAITING_FOR_SPELL_CHECKS = 2; const STATE_WAITING_TO_FINISH = 3; const STATE_COMPLETED = 4; -function WaitForTestEnd(contentRootElement, inPrintMode, spellCheckedElements) { - var stopAfterPaintReceived = false; - var currentDoc = content.document; - var state = STATE_WAITING_TO_FIRE_INVALIDATE_EVENT; - - function FlushRendering() { - var anyPendingPaintsGeneratedInDescendants = false; +function FlushRendering() { + var anyPendingPaintsGeneratedInDescendants = false; - function flushWindow(win) { - var utils = win.QueryInterface(CI.nsIInterfaceRequestor) - .getInterface(CI.nsIDOMWindowUtils); - var afterPaintWasPending = utils.isMozAfterPaintPending; + function flushWindow(win) { + var utils = win.QueryInterface(CI.nsIInterfaceRequestor) + .getInterface(CI.nsIDOMWindowUtils); + var afterPaintWasPending = utils.isMozAfterPaintPending; + if (win.document.documentElement) { try { // Flush pending restyles and reflows for this window win.document.documentElement.getBoundingClientRect(); } catch (e) { LogWarning("flushWindow failed: " + e + "\n"); } + } - if (!afterPaintWasPending && utils.isMozAfterPaintPending) { - LogInfo("FlushRendering generated paint for window " + win.location.href); - anyPendingPaintsGeneratedInDescendants = true; - } + if (!afterPaintWasPending && utils.isMozAfterPaintPending) { + LogInfo("FlushRendering generated paint for window " + win.location.href); + anyPendingPaintsGeneratedInDescendants = true; + } - for (var i = 0; i < win.frames.length; ++i) { - flushWindow(win.frames[i]); - } + for (var i = 0; i < win.frames.length; ++i) { + flushWindow(win.frames[i]); } + } - flushWindow(content); + flushWindow(content); - if (anyPendingPaintsGeneratedInDescendants && - !windowUtils().isMozAfterPaintPending) { - LogWarning("Internal error: descendant frame generated a MozAfterPaint event, but the root document doesn't have one!"); - } + if (anyPendingPaintsGeneratedInDescendants && + !windowUtils().isMozAfterPaintPending) { + LogWarning("Internal error: descendant frame generated a MozAfterPaint event, but the root document doesn't have one!"); } +} + +function WaitForTestEnd(contentRootElement, inPrintMode, spellCheckedElements) { + var stopAfterPaintReceived = false; + var currentDoc = content.document; + var state = STATE_WAITING_TO_FIRE_INVALIDATE_EVENT; function AfterPaintListener(event) { LogInfo("AfterPaintListener in " + event.target.document.location.href); @@ -541,6 +543,9 @@ function OnDocumentLoad(event) var contentRootElement = content.document ? content.document.documentElement : null; + // Flush the document in case it got modified in a load event handler. + FlushRendering(); + // Take a snapshot now. We need to do this before we check whether // we should wait, since this might trigger dispatching of // MozPaintWait events and make shouldWaitForExplicitPaintWaiters() true

1 0

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

29 Aug '14

commit 94b845556474e198effe7a2d6fe7e1bc0bd1f729 Author: Steven Michaud <smichaud(a)pobox.com> Date: Wed Jun 18 11:13:35 2014 -0500 Bug 995603 - Ensure mouse-enter/exit events are sent to plugins as appropriate. r=mstange a=abillings --- content/events/src/nsContentEventHandler.cpp | 25 ++++++-- content/events/src/nsContentEventHandler.h | 2 +- widget/cocoa/nsChildView.mm | 81 +++++++++----------------- widget/cocoa/nsCocoaWindow.h | 3 - widget/cocoa/nsCocoaWindow.mm | 30 ---------- 5 files changed, 48 insertions(+), 93 deletions(-) diff --git a/content/events/src/nsContentEventHandler.cpp b/content/events/src/nsContentEventHandler.cpp index 8b151cb..e989535 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 +nsContentEventHandler::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..9d99be9 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2790,6 +2790,34 @@ NSEvent* gLastDragMouseDownEvent = nil; return mIsPluginView; } +- (NSView *)hitTest:(NSPoint)aPoint +{ + NSView* target = [super hitTest:aPoint]; + NSWindow *window = [self window]; + if (window && (target == self) && [self isPluginView] && mGeckoChild) { + nsAutoRetainCocoaObject kungFuDeathGrip(self); + + NSPoint windowLoc = [[self superview] convertPoint:aPoint toView:nil]; + NSPoint screenLoc = [window convertBaseToScreen:windowLoc]; + screenLoc.y = nsCocoaUtils::FlippedScreenY(screenLoc.y); + nsIntPoint widgetLoc = mGeckoChild->CocoaPointsToDevPixels(screenLoc) - + mGeckoChild->WidgetToScreenOffset(); + + nsQueryContentEvent 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 +4941,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] Bug 1019684 - Appease the style checker gods. r=jandem, a=orange
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 64e0c800366410debf70f1a9cf9f7ccc6c2490f0 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue Jun 17 15:35:16 2014 -0400 Bug 1019684 - Appease the style checker gods. r=jandem, a=orange --- js/src/jit/arm/Assembler-arm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/jit/arm/Assembler-arm.h b/js/src/jit/arm/Assembler-arm.h index 1bc314a..e8a4442 100644 --- a/js/src/jit/arm/Assembler-arm.h +++ b/js/src/jit/arm/Assembler-arm.h @@ -11,6 +11,8 @@ #include "mozilla/MathAlgorithms.h" #include "mozilla/Util.h" +#include "jsprf.h" + #include "jit/shared/Assembler-shared.h" #include "assembler/assembler/AssemblerBufferWithConstantPool.h" #include "jit/CompactBuffer.h" @@ -18,8 +20,6 @@ #include "jit/arm/Architecture-arm.h" #include "jit/shared/IonAssemblerBufferWithConstantPools.h" -#include "jsprf.h" - namespace js { namespace jit {

1 0

[tor-browser/esr24] Bug 1019684 - Follow-up bustage fix. r=jandem, a=bustage
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 8aa5416d9797a6ebbf682780ea26882d08095284 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue Jun 17 13:15:22 2014 -0400 Bug 1019684 - Follow-up bustage fix. r=jandem, a=bustage --- js/src/jit/arm/Assembler-arm.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/js/src/jit/arm/Assembler-arm.h b/js/src/jit/arm/Assembler-arm.h index f33c2bc..1bc314a 100644 --- a/js/src/jit/arm/Assembler-arm.h +++ b/js/src/jit/arm/Assembler-arm.h @@ -18,6 +18,8 @@ #include "jit/arm/Architecture-arm.h" #include "jit/shared/IonAssemblerBufferWithConstantPools.h" +#include "jsprf.h" + namespace js { namespace jit { @@ -957,6 +959,15 @@ class VFPImm { } }; +inline void +AssemblerCrashAtUnhandlableOOM(const char *reason) +{ + char msgbuf[1024]; + JS_snprintf(msgbuf, sizeof(msgbuf), "[unhandlable oom] %s", reason); + MOZ_ReportAssertionFailure(msgbuf, __FILE__, __LINE__); + MOZ_CRASH(); +} + // A BOffImm is an immediate that is used for branches. Namely, it is the offset that will // be encoded in the branch instruction. This is the only sane way of constructing a branch. class BOffImm @@ -976,7 +987,7 @@ class BOffImm { JS_ASSERT((offset & 0x3) == 0); if (!isInRange(offset)) - CrashAtUnhandlableOOM("BOffImm"); + AssemblerCrashAtUnhandlableOOM("BOffImm"); } static bool isInRange(int offset) {

1 0

[tor-browser/esr24] Bug 919592 - Ionmonkey (ARM): Guard against branches being out of range and bail out of compilation if so. r=mjrosenb, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit a248a86571775fc8c25d29e90cf015cfc7b34358 Author: Douglas Crosher <dtc-moz(a)scieneer.com> Date: Fri Mar 21 14:27:31 2014 +1100 Bug 919592 - Ionmonkey (ARM): Guard against branches being out of range and bail out of compilation if so. r=mjrosenb, a=sledru --- js/src/jit/arm/Assembler-arm.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/js/src/jit/arm/Assembler-arm.cpp b/js/src/jit/arm/Assembler-arm.cpp index 57a3aa2..9969d22 100644 --- a/js/src/jit/arm/Assembler-arm.cpp +++ b/js/src/jit/arm/Assembler-arm.cpp @@ -1851,6 +1851,10 @@ Assembler::as_b(Label *l, Condition c, bool isPatchable) old = l->offset(); // This will currently throw an assertion if we couldn't actually // encode the offset of the branch. + if (!BOffImm::isInRange(old)) { + m_buffer.bail(); + return ret; + } ret = as_b(BOffImm(old), c, isPatchable); } else { old = LabelBase::INVALID_OFFSET; @@ -1910,6 +1914,10 @@ Assembler::as_bl(Label *l, Condition c) // This will currently throw an assertion if we couldn't actually // encode the offset of the branch. old = l->offset(); + if (!BOffImm::isInRange(old)) { + m_buffer.bail(); + return ret; + } ret = as_bl(BOffImm(old), c); } else { old = LabelBase::INVALID_OFFSET;

1 0

[tor-browser/esr24] Bug 1019684 - Turn an assert into a release mode crash instead. r=mjrosenb, a=dveditz
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b662bbc824cf22db8ca20521bf6eb12ca592da70 Author: Brian Hackett <bhackett1024(a)gmail.com> Date: Thu Jun 12 09:11:00 2014 -0400 Bug 1019684 - Turn an assert into a release mode crash instead. r=mjrosenb, a=dveditz --- js/src/jit/arm/Assembler-arm.cpp | 4 ++-- js/src/jit/arm/Assembler-arm.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/src/jit/arm/Assembler-arm.cpp b/js/src/jit/arm/Assembler-arm.cpp index 9969d22..9746521 100644 --- a/js/src/jit/arm/Assembler-arm.cpp +++ b/js/src/jit/arm/Assembler-arm.cpp @@ -1852,7 +1852,7 @@ Assembler::as_b(Label *l, Condition c, bool isPatchable) // This will currently throw an assertion if we couldn't actually // encode the offset of the branch. if (!BOffImm::isInRange(old)) { - m_buffer.bail(); + m_buffer.fail_bail(); return ret; } ret = as_b(BOffImm(old), c, isPatchable); @@ -1915,7 +1915,7 @@ Assembler::as_bl(Label *l, Condition c) // encode the offset of the branch. old = l->offset(); if (!BOffImm::isInRange(old)) { - m_buffer.bail(); + m_buffer.fail_bail(); return ret; } ret = as_bl(BOffImm(old), c); diff --git a/js/src/jit/arm/Assembler-arm.h b/js/src/jit/arm/Assembler-arm.h index 7af98dc..f33c2bc 100644 --- a/js/src/jit/arm/Assembler-arm.h +++ b/js/src/jit/arm/Assembler-arm.h @@ -975,7 +975,8 @@ class BOffImm : data ((offset - 8) >> 2 & 0x00ffffff) { JS_ASSERT((offset & 0x3) == 0); - JS_ASSERT(isInRange(offset)); + if (!isInRange(offset)) + CrashAtUnhandlableOOM("BOffImm"); } static bool isInRange(int offset) {

1 0

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

29 Aug '14

commit 980d4b6439ecb5d1044772302be6f3b564c86585 Author: ffxbld <none@none> Date: Sat Jun 14 03:12:44 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-1024 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 13 ++++++------- security/manager/boot/src/nsSTSPreloadList.inc | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index f04dcfb..7d18d22 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,22 +1,22 @@ 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 +alpha.irccloud.com: did not receive HSTS header 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 -appseccalifornia.org: could not connect to host +appseccalifornia.org: did not receive HSTS header bassh.net: did not receive HSTS header bcrook.com: max-age too low: 86400 betnet.fr: could not connect to host bigshinylock.minazo.net: could not connect to host blacklane.com: did not receive HSTS header braintreegateway.com: did not receive HSTS header +braintreepayments.com: did not receive HSTS header browserid.org: did not receive HSTS header business.medbank.com.mt: did not receive HSTS header carlolly.co.uk: did not receive HSTS header @@ -42,10 +42,10 @@ 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 +epoxate.com: did not receive HSTS header errors.zenpayroll.com: could not connect to host espra.com: could not connect to host fatzebra.com.au: did not receive HSTS header -fj.simple.com: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header glass.google.com: did not receive HSTS header gmail.com: did not receive HSTS header @@ -90,6 +90,7 @@ play.google.com: did not receive HSTS header prodpad.com: did not receive HSTS header profiles.google.com: did not receive HSTS header rapidresearch.me: did not receive HSTS header +riseup.net: did not receive HSTS header sah3.net: could not connect to host saturngames.co.uk: did not receive HSTS header script.google.com: did not receive HSTS header @@ -108,7 +109,6 @@ 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 @@ -117,8 +117,8 @@ talkgadget.google.com: did not receive HSTS header translate.googleapis.com: did not receive HSTS header uprotect.it: could not connect to host wallet.google.com: did not receive HSTS header +waveapps.com: no error 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 @@ -138,5 +138,4 @@ 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 d2f42c6..2e204ef 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(1412417180147000); +const PRTime gPreloadListExpirationTime = INT64_C(1413626792852000); class nsSTSPreload { @@ -23,13 +23,12 @@ static const nsSTSPreload kSTSPreloadList[] = { { "activiti.alfresco.com", false }, { "adsfund.org", true }, { "aladdinschools.appspot.com", false }, - { "alpha.irccloud.com", false }, { "api.intercom.io", false }, + { "api.simple.com", false }, { "api.xero.com", false }, { "app.manilla.com", true }, { "app.recurly.com", false }, { "app.yinxiang.com", false }, - { "appseccalifornia.org", true }, { "arivo.com.br", true }, { "bank.simple.com", false }, { "bccx.com", true }, @@ -39,7 +38,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "blog.lookout.com", false }, { "blog.torproject.org", false }, { "boxcryptor.com", true }, - { "braintreepayments.com", false }, { "bugzilla.mozilla.org", true }, { "business.lookout.com", false }, { "calyxinstitute.org", false }, @@ -73,7 +71,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "eff.org", true }, { "encircleapp.com", true }, { "entropia.de", false }, - { "epoxate.com", false }, { "errors.zenpayroll.com", false }, { "espra.com", true }, { "f-droid.org", true }, @@ -82,6 +79,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "faq.lookout.com", false }, { "feedbin.com", false }, { "fiken.no", true }, + { "fj.simple.com", false }, { "forum.linode.com", false }, { "forum.quantifiedself.com", true }, { "gernert-server.de", true }, @@ -96,6 +94,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "heha.co", true }, { "howrandom.org", true }, { "id.mayfirst.org", false }, + { "imouto.my", false }, { "inertianetworks.com", true }, { "intercom.io", false }, { "itriskltd.com", true }, @@ -132,6 +131,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mega.co.nz", false }, { "members.mayfirst.org", false }, { "members.nearlyfreespeech.net", false }, + { "miku.hatsune.my", true }, { "mnsure.org", true }, { "mobile.usaa.com", false }, { "mudcrab.us", true }, @@ -167,10 +167,11 @@ static const nsSTSPreload kSTSPreloadList[] = { { "pult.co", true }, { "pypi.python.org", true }, { "python.org", false }, - { "riseup.net", true }, + { "reviews.anime.my", true }, { "roddis.net", false }, { "romab.com", true }, { "roundcube.mayfirst.org", false }, + { "sakaki.anime.my", true }, { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, { "seifried.org", true }, @@ -180,6 +181,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "simple.com", false }, { "skydrive.live.com", false }, { "squareup.com", false }, + { "stage.wepay.com", false }, { "stocktrade.de", false }, { "stripe.com", true }, { "strongest-privacy.com", true }, @@ -194,14 +196,16 @@ static const nsSTSPreload kSTSPreloadList[] = { { "ubertt.org", true }, { "usaa.com", false }, { "vmoagents.com", false }, + { "vocaloid.my", true }, { "w-spotlight.appspot.com", true }, - { "waveapps.com", true }, + { "webcollect.org.uk", 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 }, + { "wepay.com", false }, { "wf-bigsky-master.appspot.com", true }, { "wf-demo-eu.appspot.com", true }, { "wf-demo-hrd.appspot.com", true }, @@ -245,6 +249,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.torproject.org", false }, { "www.twitter.com", false }, { "www.usaa.com", false }, + { "www.wepay.com", false }, { "www.zenpayroll.com", false }, { "xbrlsuccess.appspot.com", true }, { "zenpayroll.com", false },

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] Bug 991981 - Followup fix for ESR24 to properly init TypedArray structs using the provided obj in the constructor, rather than requiring Init to be called after construction. r=bz, a=bustage
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f7c724ad36208605421c24caac2ef8eef7b0860e Author: Jeff Walden <jwalden(a)mit.edu> Date: Mon Jun 2 17:45:05 2014 -0700 Bug 991981 - Followup fix for ESR24 to properly init TypedArray structs using the provided obj in the constructor, rather than requiring Init to be called after construction. r=bz, a=bustage --- dom/bindings/TypedArray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/bindings/TypedArray.h b/dom/bindings/TypedArray.h index c7c2bbd..62343c2 100644 --- a/dom/bindings/TypedArray.h +++ b/dom/bindings/TypedArray.h @@ -24,12 +24,12 @@ template<typename T, void GetLengthAndData(JSObject*, uint32_t*, T**)> struct TypedArray_base { TypedArray_base(JSObject* obj) - : mObj(obj), + : mObj(NULL), mData(NULL), mLength(0), mComputed(false) { - MOZ_ASSERT(obj != NULL); + Init(obj); } private:

1 0

[tor-browser/esr24] Bug 967354 - Fix incorrect usage of UpdateWebGLErrorAndClearGLError(); r=jgilbert, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 82ea333beb3423b8aaaca2998b111a6308ed197a Author: Dan Glastonbury <dglastonbury(a)mozilla.com> Date: Thu May 29 08:42:40 2014 +1000 Bug 967354 - Fix incorrect usage of UpdateWebGLErrorAndClearGLError(); r=jgilbert, a=lmandel --HG-- extra : histedit_source : ef735c5d9e83cddd2312f58fa41baf330a162f0f --- content/canvas/src/WebGLContext.cpp | 12 +++++---- content/canvas/src/WebGLContext.h | 4 +-- content/canvas/src/WebGLContextGL.cpp | 48 ++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 23 deletions(-) diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp index 323e2b4..91d8d99 100644 --- a/content/canvas/src/WebGLContext.cpp +++ b/content/canvas/src/WebGLContext.cpp @@ -1367,14 +1367,16 @@ WebGLContext::PresentScreenBuffer() return true; } -void +bool WebGLContext::DummyFramebufferOperation(const char *info) { WebGLenum status = CheckFramebufferStatus(LOCAL_GL_FRAMEBUFFER); - if (status == LOCAL_GL_FRAMEBUFFER_COMPLETE) - return; - else - return ErrorInvalidFramebufferOperation("%s: incomplete framebuffer", info); + if (status == LOCAL_GL_FRAMEBUFFER_COMPLETE) { + return true; + } else { + ErrorInvalidFramebufferOperation("%s: incomplete framebuffer", info); + return false; + } } // We use this timer for many things. Here are the things that it is activated for: diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h index 3c7054e..e8e55db 100644 --- a/content/canvas/src/WebGLContext.h +++ b/content/canvas/src/WebGLContext.h @@ -200,7 +200,7 @@ public: const char *ErrorName(GLenum error); bool IsTextureFormatCompressed(GLenum format); - void DummyFramebufferOperation(const char *info); + bool DummyFramebufferOperation(const char *info); WebGLTexture *activeBoundTextureForTarget(WebGLenum target) { return target == LOCAL_GL_TEXTURE_2D ? mBound2DTextures[mActiveTexture] @@ -970,7 +970,7 @@ protected: gfxImageSurface **imageOut, WebGLTexelFormat *format); - void CopyTexSubImage2D_base(WebGLenum target, + bool CopyTexSubImage2D_base(WebGLenum target, WebGLint level, WebGLenum internalformat, WebGLint xoffset, diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp index ec37391..6b4c77b 100644 --- a/content/canvas/src/WebGLContextGL.cpp +++ b/content/canvas/src/WebGLContextGL.cpp @@ -722,7 +722,7 @@ WebGLContext::ColorMask(WebGLboolean r, WebGLboolean g, WebGLboolean b, WebGLboo gl->fColorMask(r, g, b, a); } -void +bool WebGLContext::CopyTexSubImage2D_base(WebGLenum target, WebGLint level, WebGLenum internalformat, @@ -741,15 +741,17 @@ WebGLContext::CopyTexSubImage2D_base(WebGLenum target, const char *info = sub ? "copyTexSubImage2D" : "copyTexImage2D"; if (!ValidateLevelWidthHeightForTarget(target, level, width, height, info)) { - return; + return false; } MakeContextCurrent(); WebGLTexture *tex = activeBoundTextureForTarget(target); - if (!tex) - return ErrorInvalidOperation("%s: no texture is bound to this target"); + if (!tex) { + ErrorInvalidOperation("%s: no texture is bound to this target"); + return false; + } if (CanvasUtils::CheckSaneSubrectSize(x, y, width, height, framebufferWidth, framebufferHeight)) { if (sub) @@ -766,13 +768,15 @@ WebGLContext::CopyTexSubImage2D_base(WebGLenum target, uint32_t texelSize = 0; if (!ValidateTexFormatAndType(internalformat, LOCAL_GL_UNSIGNED_BYTE, -1, &texelSize, info)) - return; + return false; CheckedUint32 checked_neededByteLength = GetImageSize(height, width, texelSize, mPixelStoreUnpackAlignment); - if (!checked_neededByteLength.isValid()) - return ErrorInvalidOperation("%s: integer overflow computing the needed buffer size", info); + if (!checked_neededByteLength.isValid()) { + ErrorInvalidOperation("%s: integer overflow computing the needed buffer size", info); + return false; + } uint32_t bytesNeeded = checked_neededByteLength.value(); @@ -782,8 +786,10 @@ WebGLContext::CopyTexSubImage2D_base(WebGLenum target, // contents of a texture allocated with nullptr data. // Hopefully calloc will just mmap zero pages here. void *tempZeroData = calloc(1, bytesNeeded); - if (!tempZeroData) - return ErrorOutOfMemory("%s: could not allocate %d bytes (for zero fill)", info, bytesNeeded); + if (!tempZeroData) { + ErrorOutOfMemory("%s: could not allocate %d bytes (for zero fill)", info, bytesNeeded); + return false; + } // now initialize the texture as black @@ -820,6 +826,8 @@ WebGLContext::CopyTexSubImage2D_base(WebGLenum target, if (!sub) ReattachTextureToAnyFramebufferToWorkAroundBugs(tex, level); + + return true; } void @@ -917,15 +925,19 @@ WebGLContext::CopyTexImage2D(WebGLenum target, if (sizeMayChange) { UpdateWebGLErrorAndClearGLError(); - CopyTexSubImage2D_base(target, level, internalformat, 0, 0, x, y, width, height, false); + } + + bool ok = CopyTexSubImage2D_base(target, level, internalformat, 0, 0, x, y, width, height, false); + if (!ok) + return; + + if (sizeMayChange) { GLenum error = LOCAL_GL_NO_ERROR; UpdateWebGLErrorAndClearGLError(&error); if (error) { GenerateWarning("copyTexImage2D generated error %s", ErrorName(error)); return; } - } else { - CopyTexSubImage2D_base(target, level, internalformat, 0, 0, x, y, width, height, false); } tex->SetImageInfo(target, level, width, height, internalformat, type); @@ -1007,7 +1019,7 @@ WebGLContext::CopyTexSubImage2D(WebGLenum target, if (!mBoundFramebuffer->CheckAndInitializeRenderbuffers()) return ErrorInvalidFramebufferOperation("copyTexSubImage2D: incomplete framebuffer"); - return CopyTexSubImage2D_base(target, level, format, xoffset, yoffset, x, y, width, height, true); + CopyTexSubImage2D_base(target, level, format, xoffset, yoffset, x, y, width, height, true); } @@ -3405,8 +3417,10 @@ WebGLContext::ReadPixels(WebGLint x, WebGLint y, WebGLsizei width, // Now that the errors are out of the way, on to actually reading // If we won't be reading any pixels anyways, just skip the actual reading - if (width == 0 || height == 0) - return DummyFramebufferOperation("readPixels"); + if (width == 0 || height == 0) { + DummyFramebufferOperation("readPixels"); + return; + } if (CanvasUtils::CheckSaneSubrectSize(x, y, width, height, framebufferWidth, framebufferHeight)) { // the easy case: we're not reading out-of-range pixels @@ -3428,7 +3442,8 @@ WebGLContext::ReadPixels(WebGLint x, WebGLint y, WebGLsizei width, || y+height <= 0) { // we are completely outside of range, can exit now with buffer filled with zeros - return DummyFramebufferOperation("readPixels"); + DummyFramebufferOperation("readPixels"); + return; } // compute the parameters of the subrect we're actually going to call glReadPixels on @@ -4574,6 +4589,7 @@ WebGLContext::CompressedTexImage2D(WebGLenum target, WebGLint level, WebGLenum i return; } + MakeContextCurrent(); gl->fCompressedTexImage2D(target, level, internalformat, width, height, border, byteLength, view.Data()); tex->SetImageInfo(target, level, width, height, internalformat, LOCAL_GL_UNSIGNED_BYTE);

1 0

[tor-browser/esr24] Bug 1015636 - Check if PDF Viewer embed overlay has valid state. r=johns, a=dveditz
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 57d9a8971efde965d1313c6bbb7ab98cd5f4e44e Author: Yury Delendik <ydelendik(a)mozilla.com> Date: Fri May 30 18:03:05 2014 -0500 Bug 1015636 - Check if PDF Viewer embed overlay has valid state. r=johns, a=dveditz --- browser/extensions/pdfjs/components/PdfRedirector.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/extensions/pdfjs/components/PdfRedirector.js b/browser/extensions/pdfjs/components/PdfRedirector.js index 4a08ec2..2758ffe 100644 --- a/browser/extensions/pdfjs/components/PdfRedirector.js +++ b/browser/extensions/pdfjs/components/PdfRedirector.js @@ -60,6 +60,10 @@ function getObjectUrl(window) { } // Checking if overlay is a proper PlayPreview overlay. + if (element.displayedType !== element.TYPE_NULL || + element.pluginFallbackType !== element.PLUGIN_PLAY_PREVIEW) { + return null; // invalid plugin element overlay state + } for (var i = 0; i < element.children.length; i++) { if (element.children[i] === containerElement) { return null; // invalid plugin element overlay

1 0

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

29 Aug '14

commit 9fca388d6ff39694480dbb2f356fd6f3f97d190d Author: ffxbld <none@none> Date: Sat May 31 03:13:45 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-326 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 7 ++++--- security/manager/boot/src/nsSTSPreloadList.inc | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 831c969..f04dcfb 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -10,6 +10,7 @@ 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 +appseccalifornia.org: could not connect to host bassh.net: did not receive HSTS header bcrook.com: max-age too low: 86400 betnet.fr: could not connect to host @@ -24,10 +25,10 @@ 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 +crbug.com: 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 @@ -101,7 +102,7 @@ simon.butcher.name: max-age too low: 2629743 sites.google.com: did not receive HSTS header sol.io: could not connect to host souyar.de: could not connect to host -souyar.net: did not receive HSTS header +souyar.net: could not connect to host souyar.us: could not connect to host spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header @@ -115,7 +116,6 @@ 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 @@ -126,6 +126,7 @@ www.elanex.biz: did not receive HSTS header www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header www.greplin.com: could not connect to host +www.intercom.io: did not receive HSTS header www.jitsi.org: did not receive HSTS header www.lastpass.com: did not receive HSTS header www.ledgerscope.net: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 8266427..d2f42c6 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(1411812354538000); +const PRTime gPreloadListExpirationTime = INT64_C(1412417180147000); class nsSTSPreload { @@ -122,6 +122,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mailbox.org", false }, { "makeyourlaws.org", true }, { "manage.zenpayroll.com", false }, + { "manageprojects.com", true }, { "manager.linode.com", false }, { "matteomarescotti.name", true }, { "mattmccutchen.net", true }, @@ -187,11 +188,14 @@ static const nsSTSPreload kSTSPreloadList[] = { { "surkatty.org", true }, { "tent.io", true }, { "therapynotes.com", false }, + { "tinfoilsecurity.com", false }, { "torproject.org", false }, { "twitter.com", false }, { "ubertt.org", true }, + { "usaa.com", false }, { "vmoagents.com", false }, { "w-spotlight.appspot.com", true }, + { "waveapps.com", true }, { "webfilings-eu-mirror.appspot.com", true }, { "webfilings-eu.appspot.com", true }, { "webfilings-mirror-hrd.appspot.com", true }, @@ -225,7 +229,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.gov.uk", false }, { "www.grc.com", false }, { "www.heliosnet.com", true }, - { "www.intercom.io", false }, { "www.irccloud.com", false }, { "www.linode.com", false }, { "www.lookout.com", false }, @@ -238,6 +241,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.simbolo.co.uk", false }, { "www.simple.com", false }, { "www.therapynotes.com", false }, + { "www.tinfoilsecurity.com", false }, { "www.torproject.org", false }, { "www.twitter.com", false }, { "www.usaa.com", false },

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] No bug, Automated blocklist update from host bld-linux64-spot-050 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 44c7993368742ecc5b3c33c157f5fbc2490dda86 Author: ffxbld <none@none> Date: Sat Jun 14 03:08:31 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-050 - a=blocklist-update --- browser/app/blocklist.xml | 76 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 5 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 2039450..91763d3 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="1400782040000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1402612020000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -274,6 +274,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i596" id="{b99c8534-7800-48fa-bd71-519a46cdc7e1}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i140" id="mozillahmpg(a)mozilla.org"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -413,6 +419,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> + <versionRange minVersion="0" maxVersion="*"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i111" os="WINNT" id="{C3949AC2-4B17-43ee-B4F1-D26B9D42404D}"> <versionRange minVersion="0" maxVersion="15.0.5" severity="1"> </versionRange> @@ -579,8 +591,26 @@ <prefs> </prefs> </emItem> - <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i618" id="toolbar(a)ask.com"> + <versionRange minVersion="3.15.5" maxVersion="3.15.5.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.8" maxVersion="3.15.8.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.10" maxVersion="3.15.11.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.13" maxVersion="3.15.13.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.18" maxVersion="3.15.20.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.22" maxVersion="3.15.22.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.24" maxVersion="3.15.24.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.26" maxVersion="3.15.26.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.28" maxVersion="3.15.28.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.31" maxVersion="3.15.31.*" severity="1"> </versionRange> <prefs> </prefs> @@ -666,6 +696,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i620" id="{21EAF666-26B3-4A3C-ABD0-CA2F5A326744}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i552" id="jid0-O6MIff3eO5dIGf5Tcv8RsJDKxrs@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -872,6 +908,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i588" id="quick_start(a)gmail.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i340" id="chiang(a)programmer.net"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -926,6 +968,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i598" id="{29b136c9-938d-4d3d-8df8-d649d9b74d02}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i286" id="{58bd07eb-0ee0-4df0-8121-dc9b693373df}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -1278,8 +1326,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}"> - <versionRange minVersion="1.1b1" maxVersion="1.1b1"> + <emItem blockID="i586" id="jid1-0xtMKhXFEs4jIg@jetpack"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> <prefs> </prefs> @@ -1290,6 +1338,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}"> + <versionRange minVersion="1.1b1" maxVersion="1.1b1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i531" id="/^(4cb61367-efbf-4aa1-8e3a-7f776c9d5763@cdece6e9-b2ef-40a9-b178-291da9870c59\.com|0efc9c38-1ec7-49ed-8915-53a48b6b7600@e7f17679-2a42-4659-83c5-7ba961fdf75a\.com|6be3335b-ef79-4b0b-a0ba-b87afbc6f4ad@6bbb4d2e-e33e-4fa5-9b37-934f4fb50182\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1410,6 +1464,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i590" id="{94cd2cc3-083f-49ba-a218-4cda4b4829fd}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i544" id="/^(93abedcf-8e3a-4d02-b761-d1441e437c09@243f129d-aee2-42c2-bcd1-48858e1c22fd\.com|9acfc440-ac2d-417a-a64c-f6f14653b712@09f9a966-9258-4b12-af32-da29bdcc28c5\.com|58ad0086-1cfb-48bb-8ad2-33a8905572bc@5715d2be-69b9-4930-8f7e-64bdeb961cfd\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -2111,6 +2171,12 @@ <pluginItem blockID="p574"> <match name="filename" exp="NPDjVu\.plugin" /> <versionRange minVersion="0" maxVersion="6.1.1" severity="0" vulnerabilitystatus="1"></versionRange> </pluginItem> + <pluginItem blockID="p592"> + <match name="filename" exp="CiscoWebCommunicator\.plugin" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> + <pluginItem blockID="p594"> + <match name="filename" exp="npCiscoWebCommunicator\.dll" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> </pluginItems> <gfxItems>

1 0

[tor-browser/esr24] Bug 1018400 - Disable safebrowsing during reftests. r=ted, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1891f376f6ae966d86818b891ef8b6bc250600f5 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Fri May 30 16:21:47 2014 -0400 Bug 1018400 - Disable safebrowsing during reftests. r=ted, a=test-only --- js/src/tests/user.js | 2 ++ layout/tools/reftest/runreftest.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/js/src/tests/user.js b/js/src/tests/user.js index 8849221..694d4d0 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -27,3 +27,5 @@ 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); +user_pref("browser.safebrowsing.enabled", false); +user_pref("browser.safebrowsing.malware.enabled", false); diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 683b0a1..2bb3d11 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -74,6 +74,9 @@ class RefTest(object): # Ensure that telemetry is disabled, so we don't connect to the telemetry # server in the middle of the tests. prefsFile.write('user_pref("toolkit.telemetry.enabled", false);\n') + # Likewise for safebrowsing. + prefsFile.write('user_pref("browser.safebrowsing.enabled", false);\n') + prefsFile.write('user_pref("browser.safebrowsing.malware.enabled", false);\n') for v in options.extraPrefs: thispref = v.split("=")

1 0