Bug 1021368 - Implement ES6 NoSubstitutionTemplate (multiline strings). r=jorendorff. Thanks to André Bargull for tests and review.
Bug 1023464 - Add support for the --setpref argument to mach reftest. r=gps
Bug 1012639 - Fix OtherProcess sometimes being the current process handle. r=bent
Bug 1011569 - Remove PreferMemoryOverShmem in favour of IsSameProcess. r=nical
Bug 1011572 - Only do platform-sync on layer transactions when !IsSameProcess. r=nical

There's no need to do platform syncing when the compositor is in the same
process as the content thread, as they'll share a connection to the display
server.
Bug 1022812 - Link a debuggable version of NSS into media/mtransport. r=mt
Bug 1022003 - remove ObjectWrapper.jsm, r=bholley,gwagner

--HG--
extra : rebase_source : cdafaf22aaddbb04519a9bc1099b6a10f7b6c886
Bug 1023035 - Improve checking for whether we are on the main thread when triggering malloc GCs, r=billm.
Bug 1020629. DrawTargetSkia::CopySurface is broken with A8 surfaces. r=gw280

If we clear the surface before doing drawBitmap we end up with
the right results. This also adds some writePixels code
that we could try out later.

--HG--
rename : content/base/test/xcsp/chrome.ini => content/base/test/csp/chrome.ini
rename : content/base/test/xcsp/file_CSP.sjs => content/base/test/csp/file_CSP.sjs
rename : content/base/test/xcsp/file_CSP_evalscript_main.html => content/base/test/csp/file_CSP_evalscript_main.html
rename : content/base/test/xcsp/file_CSP_evalscript_main.html^headers^ => content/base/test/csp/file_CSP_evalscript_main.html^headers^
rename : content/base/test/xcsp/file_CSP_evalscript_main.js => content/base/test/csp/file_CSP_evalscript_main.js
rename : content/base/test/xcsp/file_CSP_evalscript_main_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html
rename : content/base/test/xcsp/file_CSP_evalscript_main_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html^headers^
rename : content/base/test/xcsp/file_CSP_evalscript_main_getCRMFRequest.js => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.js
rename : content/base/test/xcsp/file_CSP_evalscript_no_CSP_at_all.html => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html
rename : content/base/test/xcsp/file_CSP_evalscript_no_CSP_at_all.html^headers^ => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html^headers^
rename : content/base/test/xcsp/file_CSP_evalscript_no_CSP_at_all.js => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.js
rename : content/base/test/xcsp/file_CSP_frameancestors.sjs => content/base/test/csp/file_CSP_frameancestors.sjs
rename : content/base/test/xcsp/file_CSP_frameancestors_main.html => content/base/test/csp/file_CSP_frameancestors_main.html
rename : content/base/test/xcsp/file_CSP_frameancestors_main.js => content/base/test/csp/file_CSP_frameancestors_main.js
rename : content/base/test/xcsp/file_CSP_inlinescript_main.html => content/base/test/csp/file_CSP_inlinescript_main.html
rename : content/base/test/xcsp/file_CSP_inlinescript_main.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename : content/base/test/xcsp/file_CSP_inlinestyle_main.html => content/base/test/csp/file_CSP_inlinestyle_main.html
rename : content/base/test/xcsp/file_CSP_inlinestyle_main.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename : content/base/test/xcsp/file_CSP_main.html => content/base/test/csp/file_CSP_main.html
rename : content/base/test/xcsp/file_CSP_main.html^headers^ => content/base/test/csp/file_CSP_main.html^headers^
rename : content/base/test/xcsp/file_CSP_main.js => content/base/test/csp/file_CSP_main.js
rename : content/base/test/xcsp/file_csp_bug768029.html => content/base/test/csp/file_csp_bug768029.html
rename : content/base/test/xcsp/file_csp_bug768029.sjs => content/base/test/csp/file_csp_bug768029.sjs
rename : content/base/test/xcsp/file_csp_bug773891.html => content/base/test/csp/file_csp_bug773891.html
rename : content/base/test/xcsp/file_csp_bug773891.sjs => content/base/test/csp/file_csp_bug773891.sjs
rename : content/base/test/xcsp/file_csp_redirects_main.html => content/base/test/csp/file_csp_redirects_main.html
rename : content/base/test/xcsp/file_csp_redirects_page.sjs => content/base/test/csp/file_csp_redirects_page.sjs
rename : content/base/test/xcsp/file_csp_redirects_resource.sjs => content/base/test/csp/file_csp_redirects_resource.sjs
rename : content/base/test/xcsp/file_csp_report.sjs => content/base/test/csp/file_csp_report.sjs
rename : content/base/test/xcsp/file_multi_policy_injection_bypass.html => content/base/test/csp/file_multi_policy_injection_bypass.html
rename : content/base/test/xcsp/file_multi_policy_injection_bypass.html^headers^ => content/base/test/csp/file_multi_policy_injection_bypass.html^headers^
rename : content/base/test/xcsp/file_multi_policy_injection_bypass_2.html => content/base/test/csp/file_multi_policy_injection_bypass_2.html
rename : content/base/test/xcsp/file_multi_policy_injection_bypass_2.html^headers^ => content/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^
rename : content/base/test/xcsp/file_redirect_content.sjs => content/base/test/csp/file_redirect_content.sjs
rename : content/base/test/xcsp/file_redirect_report.sjs => content/base/test/csp/file_redirect_report.sjs
rename : content/base/test/xcsp/file_subframe_run_js_if_allowed.html => content/base/test/csp/file_subframe_run_js_if_allowed.html
rename : content/base/test/xcsp/file_subframe_run_js_if_allowed.html^headers^ => content/base/test/csp/file_subframe_run_js_if_allowed.html^headers^
rename : content/base/test/xcsp/mochitest.ini => content/base/test/csp/mochitest.ini
rename : content/base/test/xcsp/moz.build => content/base/test/csp/moz.build
rename : content/base/test/xcsp/test_301_redirect.html => content/base/test/csp/test_301_redirect.html
rename : content/base/test/xcsp/test_302_redirect.html => content/base/test/csp/test_302_redirect.html
rename : content/base/test/xcsp/test_303_redirect.html => content/base/test/csp/test_303_redirect.html
rename : content/base/test/xcsp/test_307_redirect.html => content/base/test/csp/test_307_redirect.html
rename : content/base/test/xcsp/test_CSP.html => content/base/test/csp/test_CSP.html
rename : content/base/test/xcsp/test_CSP_evalscript.html => content/base/test/csp/test_CSP_evalscript.html
rename : content/base/test/xcsp/test_CSP_evalscript_getCRMFRequest.html => content/base/test/csp/test_CSP_evalscript_getCRMFRequest.html
rename : content/base/test/xcsp/test_CSP_frameancestors.html => content/base/test/csp/test_CSP_frameancestors.html
rename : content/base/test/xcsp/test_CSP_inlinescript.html => content/base/test/csp/test_CSP_inlinescript.html
rename : content/base/test/xcsp/test_CSP_inlinestyle.html => content/base/test/csp/test_CSP_inlinestyle.html
rename : content/base/test/xcsp/test_csp_bug768029.html => content/base/test/csp/test_csp_bug768029.html
rename : content/base/test/xcsp/test_csp_bug773891.html => content/base/test/csp/test_csp_bug773891.html
rename : content/base/test/xcsp/test_csp_redirects.html => content/base/test/csp/test_csp_redirects.html
rename : content/base/test/xcsp/test_multi_policy_injection_bypass.html => content/base/test/csp/test_multi_policy_injection_bypass.html
rename : content/base/test/xcsp/test_subframe_run_js_if_allowed.html => content/base/test/csp/test_subframe_run_js_if_allowed.html
rename : js/src/parjs-benchmarks/obsolete/README.txt => js/src/parjs-benchmarks/README.txt
extra : rebase_source : 5dcfaa47c4e4305f2c2c4fdec46cf68e07fc9166
Bug 1023691. Support Data surfaces in DrawTargetSkia::CopySurface. r=mwoodrow

--HG--
extra : rebase_source : 99278192158953367d79c9b87470b69546d12d09
Bug 1017765 - Replace nsChannel with nsAsyncInputStream for FileReader API, r=bent
Bug 1000640 - Handle non-premult alpha in Layers. - r=mattwoodrow
Bug 1000640 - Death to whitespace. - r=mattwoodrow
Bug 1000640 - Update Gralloc and ANGLE ShSurf backends. - r=mattwoodrow
Bug 1000640 - Use new StreamTextureClient/Host with OMTC. - r=mattwoodrow
Bug 1000640 - Mark WinXP as failing color-alpha-test unpremultiplied reftests. - r=mattwoodrow
Bug 1000640 - Mark C/A 1.0/0.5 non-premult test as random, since it passes on Win7 Ru. - r=mattwoodrow CLOSED TREE
Back out wallpaper patch from bug 1007067 in favour of real fix from bug 1015128, r=mats
Mark line after a preformatted newline as dirty during bidi resolution. Bug 1015128, r=mats
Bug 467442 - take transforms into account for popup placement, r=bz,f=tnikkel

--HG--
extra : rebase_source : fd3acd246c9bee79feba59ac382048848b059866