Bug 1088071, part 2 - Move the nsRenderingContext::DrawString code to nsLayoutUtils::DrawUniDirString. r=jfkthame
Bug 1018658 - Convert XPathNSResolver to WebIDL bindings, support passing a node to CreateExpression. r=bz.

--HG--
extra : rebase_source : 347e0145d5caf1cc525bfed70af2ad81a57b2a06
Bug 1072817 - Minor adjustments (primarily for method-ordering) as a followup to making accessing the [[Prototype]] of a revoked proxy not crash.  Also add another test.  r=trivial

--HG--
extra : rebase_source : e09255d48ef02ce3f2760a8116ea52f5c0d457a3
Bug 1052139 - Implement the ability to prevent modifying an extensible object's [[Prototype]].  r=efaust, r=bholley

--HG--
extra : rebase_source : 58fdb9c3b30d4a46984fae6d546fc7ef94dc3d20
Bug 1085566 - Make the preventExtensions hook return succeeded/failed rather than always indicate failure by reporting an error.  r=efaust

--HG--
extra : rebase_source : 3b61c22efe8b5b2b3135b11556b6b329479d3dcd
Bug 1052139 - Reorder the preventExtensions trap just after the [[Prototype]]-access traps.  r=code-motion

--HG--
extra : rebase_source : 18f69552bad6922c1b602cbf81d6961883e4d5b8
bug 1083085 - update where getHSTSPreloadList.js and genHPKPStaticPins.js think Chromium's lists are r=mmc DONTBUILD NPOTB
Bug 902761 - Stop storing certs used for MAR verification in EXE resource files. r=rstrong
Bug 902761 - Build configuration for turning .der files into .h files. r=rstrong
Bug 1086678 - Provide a default value for subsuite, r=jmaher
Bug 1012917 - SetApplyConversion before channel diversion r=reuben
Bug 1012917 - Send HttpBaseChannel::mApplyConversion with ChannelDiverter constructor in IPDL r=mayhemer
Bug 1084496 - Update whitelist for screensharing r=jesup
Bug 1085566 - Add a test for making the preventExtensions trap indicate success via outparam.  r=test
Bug 1042135 - Change three-state DNT back to two state and update text.  (r=dolske,jst,mcmanus)

--HG--
extra : rebase_source : 2cc113eb167b83ded586b36380bb444a827f0084
Bug 1084321 - Remove b2g app meta viewport work-around. r=kats
Bug 1042135 - Change three-state DNT back to two state and update text.  (r=dolske,jst,mcmanus)

--HG--
extra : rebase_source : 52556477cba80e87651ce7c84a531a2de500d21a
Bug 1087799, part 1 - Loosen the invariant in nsCycleCollector::FinishAnyCurrentCollection(). r=smaug

If an Unlink() method ends up running JS, it can cause a GC, which will make us reenter the CC,
which will not do anything because we're already in a CC. Therefore, FinishAnyCurrentCollection()
won't finish the CC. This is safe because the CC only touches things it actually holds alive via
the Root() method.
Bug 1087799, part 2 - Rename count to numWhiteNodes in nsCycleCollector::CollectWhite(). r=smaug
Bug 1087799, part 3 - Do not include any JS things in the list of white nodes. r=smaug

Root() does not actually root JS things, so if some other class's Unlink() method ends
up calling the GC, whiteNodes will end up containing dead pointers. (This is safe right
now because the Unlink and Unroot methods do not do anything to JS things.) It is less
error prone to simply never store those pointers.

Also, add some asserts to enforce that we never call any of the white-object methods
for JS things.