Bug 1097271 - remove unused ptr variable from nsClassHashtable::RemoveAndForget; r=mccr8
Bug 1088235: Use DrawBitmap when we can. r=jrmuizel
Bug 1096913: Remove the simple cache entry when replacing the cache entry. r=mwu

This solves the issue since *mRequest may be different for the replacing entry, causing the simple cache entry never to be removed from NotifyExpired or replaced. And the simple cache to grow indefinitely.
Bug 1091916 - simplify the interrupt/jitStackLimit situation (r=bhackett)

--HG--
extra : rebase_source : 44ac5dbc77174414f4596aa7c318fdaa23b8e292
Bug 1086619 - Combine all mixed content blocker mochitests in one directory (r=tanvi,jst)

--HG--
rename : dom/base/test/bug803225_test_mailto.html => dom/base/test/mixedcontentblocker/bug803225_test_mailto.html
rename : dom/base/test/file_mixed_content_frameNavigation.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html
rename : dom/base/test/file_mixed_content_frameNavigation_blankTarget.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html
rename : dom/base/test/file_mixed_content_frameNavigation_grandchild.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html
rename : dom/base/test/file_mixed_content_frameNavigation_innermost.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html
rename : dom/base/test/file_mixed_content_frameNavigation_secure.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html
rename : dom/base/test/file_mixed_content_frameNavigation_secure_grandchild.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html
rename : dom/base/test/file_mixed_content_main.html => dom/base/test/mixedcontentblocker/file_mixed_content_main.html
rename : dom/base/test/file_mixed_content_main_bug803225.html => dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html
rename : dom/base/test/file_mixed_content_main_bug803225_websocket_wsh.py => dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py
rename : dom/base/test/file_mixed_content_server.sjs => dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs
rename : dom/base/test/test_mixed_content_blocker.html => dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html
rename : dom/base/test/test_mixed_content_blocker_bug803225.html => dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html
rename : dom/base/test/test_mixed_content_blocker_frameNavigation.html => dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html
Bug 1089912: Part 1, move csp into dom/security (r=sstamm,jst)

--HG--
rename : dom/base/nsIContentSecurityPolicy.idl => dom/interfaces/security/nsIContentSecurityPolicy.idl
rename : dom/base/nsCSPContext.cpp => dom/security/nsCSPContext.cpp
rename : dom/base/nsCSPContext.h => dom/security/nsCSPContext.h
rename : dom/base/nsCSPParser.cpp => dom/security/nsCSPParser.cpp
rename : dom/base/nsCSPParser.h => dom/security/nsCSPParser.h
rename : dom/base/nsCSPService.cpp => dom/security/nsCSPService.cpp
rename : dom/base/nsCSPService.h => dom/security/nsCSPService.h
rename : dom/base/nsCSPUtils.cpp => dom/security/nsCSPUtils.cpp
rename : dom/base/nsCSPUtils.h => dom/security/nsCSPUtils.h
Bug 1089912: Part 2, move mixedcontentblocker into dom/security (r=tanvi,jst)

--HG--
rename : dom/base/nsMixedContentBlocker.cpp => dom/security/nsMixedContentBlocker.cpp
rename : dom/base/nsMixedContentBlocker.h => dom/security/nsMixedContentBlocker.h
Bug 1075182 - Package and load ClearKey Content Decryption Module at startup - r=Unfocused
Bug 1094495 - Disable C4480 in security/pkix. r=keeler
Bug 1089328 - Race condition in WebSocket when Workers are terminated. r=smaug
Bug 1030667 - Don't pass 0 to realloc in ArrayBufferBuilder::setCapacity. r=sfink
Bug 1087178 - OdinMonkey: explain why 'not stored in cache' (r=bbouvier,janv)

--HG--
extra : rebase_source : d37893913a09d5a5b339e4ae4ee42f873d449d1e
Bug 1096530 - Make sure we notify our listener if we were canceled before we redirected. r=mcmanus
Bug 1088457 - Make nsChannelClassifier deal properly with e10s. r=mmc/sworkman
bug 1092163 - Allow e10s to be enabled with tracking protection. r=blassey
Bug 1087182 - Only send Prefer:Safe header if Web Filtering is on (Windows-only) r=dougt
Bug 1087541 - Make RuleNodeWithReplacement handle animations and transitions like RulesMatching codepath does.  r=birtles

I originally wrote this to see if it would fix bug 1086937, but it
didn't.

Note that this conflicts a bit with the patch in bug 1085769; whoever
lands second will have some merging (though it shouldn't be difficult).

The updating of the style rule is needed as part of the animation-only
style update, but it shouldn't be in the general restyling code, so it
has moved there.
Bug 1096526 - Don't look for a structured formatter for buffering_on/buffering_off. r=jmaher
Bug 1096624 - Use a SegmentedArray in nsCycleCollector::CollectWhite. r=smaug.

This patch does the following.

- Moves the logic for computing the ideal capacity for a SegmentedArray out of
  SnowWhiteKiller into its own class, SegmentedArrayCapacity.

- Replaces the nsTArray in CollectWhite(), which can be very large and is
  complicit in ~1% of OOM crashes, with a SegmentedArray.

--HG--
extra : rebase_source : 732743311a08fcc3dfe43a1b308846b93d30e6ed
Bug 1088457 followup -- fix b2g's build. CLOSED TREE