Commit Graph

29326 Commits

Author SHA1 Message Date
Thomas Wisniewski
051c21928e Bug 843579 - Unprefix -moz-any-link. r=bz
--HG--
extra : rebase_source : d5ad8227cc118491f130e1fef01829c594cc9477
2016-07-19 23:13:13 -04:00
Brad Lassey
b34fdcf7fe Bug 1286292 - Fix graphene build for windows. r=fabrice 2016-07-12 11:37:45 -04:00
Justin Wood
27f34d80f1 Bug 1223385 - use in-tree compare-locales in Makefiles, r=gps
Also fix that the default merge dir in the mach command creates a directory
that's the merge make target, and thus keeps that make target from actually
running.

MozReview-Commit-ID: HWZBPxWuHSy

--HG--
extra : rebase_source : a39157ad9eb99f3eef5d149d003e62a235f92fc1
2016-07-08 11:59:27 -04:00
Thomas Zimmermann
c54aafbf95 Bug 1286199: Update sources.xml after bugs 1280600 and 1285831 landed, r=lissyx
MozReview-Commit-ID: APY3abhDcns
2016-07-12 13:02:42 +02:00
Thomas Zimmermann
a610242b37 Bug 1280600: Merge Android and b2g branches in build scripts where possible, r=glandium
B2g now has 'OS_TARGET' set to 'Android'. This patch merges Android
and Gonk branches in the build scripts where possible.

MozReview-Commit-ID: 9hKA0Gc62Xc
2016-07-11 15:16:56 +02:00
Yoshi Huang
e24cc195d9 Bug 1274893 - remove -forbid- list from SafeBrowsing. r=francois 2016-07-11 16:11:32 +08:00
Chris Peterson
2b3b60f7b1 Bug 1277155 - Part 1: Remove snprintf() polyfills for VS2013 in Sprintf.h and #defines. r=froydnj r=mhowell 2016-06-27 20:45:03 -07:00
Gregory Szorc
f21ec324a6 Merge mozilla-central to mozilla-inbound 2016-07-06 18:30:58 -07:00
Gregory Szorc
021d3fdfc7 Merge mozilla-central to mozilla-inbound 2016-07-06 18:26:17 -07:00
Kartikaya Gupta
538a46e316 Bug 1251038 - Enable APZ by default in all.js. r=botond
The only platform for which this change is *not* a no-op is Mulet. Last time
I checked Mulet worked fine with APZ enabled but there were a few test failures.
Now I don't believe it's running in automation anyhwere so that shouldn't be
an issue. If it is, they can re-disable APZ easily enough if needed.

MozReview-Commit-ID: 5xKUuTOnubM
2016-07-06 15:19:32 -04:00
Alexandre Lissy
7da816954a Bug 1284447 - Cleanup Gecko and mozharness configs r=jlund,wcosta
MozReview-Commit-ID: 6R7vet77cyk

--HG--
extra : rebase_source : 2c990957531bf0389e85b1aa1683b3f8ea0f7198
2016-07-05 13:10:08 +02:00
Alexandre Lissy
af5fac74cc Bug 1284455 - Kill KillSwitch API r=me
MozReview-Commit-ID: H3gY78tc1zw

--HG--
extra : rebase_source : 703a9c189ae5f01d62533d338fea9202d3b47986
2016-05-06 11:49:41 +02:00
Fabrice Desré
f855149768 Bug 1284455 - Remove the System Messages API, Gecko part r=me
MozReview-Commit-ID: 1mhzddSLkuu

--HG--
extra : rebase_source : f230538d50f7c944825e1833c97ee0f56ecb86f8
2016-04-20 19:04:13 +02:00
Fabrice Desré
f3a986a379 Bug 1284455 - Remove the Web Activities API r=me
MozReview-Commit-ID: 5SNGsRU4m9V

--HG--
extra : rebase_source : ccc6860481faa17b4b52571ae4fa6d9f2fc749de
2016-04-20 19:02:44 +02:00
Alexandre Lissy
5b4dec4f62 Bug 1281607 - Add Mulet Linux debug builds to try r=wcosta
MozReview-Commit-ID: JEnzR7xI1nP

--HG--
extra : rebase_source : a303aa5863b910a0631187afee7b632e8e8823e9
2016-04-08 14:18:21 +02:00
Alexandre Lissy
50ef7e7c50 Bug 1283983 - Use frameworks/native b2g fork for Nexus 5 L r=me
MozReview-Commit-ID: 2S4Dp0jIKvc

--HG--
extra : rebase_source : ba1d0c1eed0c34b142ee83ff91269d941ada41ae
2016-07-02 15:08:23 +02:00
Carsten "Tomcat" Book
dd236a229d Backed out changeset 2989436eb134 (bug 1283983) on developers request 2016-07-04 09:20:46 +02:00
Alexandre Lissy
5927942979 Bug 1283983 - Use frameworks/native b2g fork for Nexus 5 L r=me
MozReview-Commit-ID: 7kKbAhorNJw

--HG--
extra : rebase_source : 393d43b2a2a3e6d45ac288fa7fcf7a9de18c4e65
2016-07-02 15:08:23 +02:00
Benjamin Dahse
2400e065d1 Bug 988831 - support memory mapped files in Windows. r=ehoogeveen
--HG--
extra : rebase_source : faf8d37b0d4d517b8a859b3fa57f8cd7f914de8f
2016-06-30 14:32:13 +02:00
Alexandre Lissy
2eb2535e97 Bug 1282226 - Kill secrets from phone-builder image and fix aries/hammerhead r=wcosta
MozReview-Commit-ID: LOZHgih2TrM

--HG--
extra : rebase_source : e17d08683891ca5c74bb8b3930d0aa5e62121c4f
2016-06-28 19:46:40 +02:00
Andrea Marchesini
880aca8671 Bug 1281793 - Remove some non-used telemetry IDs - part 1 - expired keys in nsBrowserApp, r=gfritzsche 2016-06-28 19:29:09 +02:00
Carsten "Tomcat" Book
206dc72425 Backed out changeset e1001d232f8a (bug 1281793) for bustage on a CLOSED TREE 2016-06-28 17:05:04 +02:00
Andrea Marchesini
1a91dfc4d0 Bug 1281793 - Remove some non-used telemetry IDs - part 1 - expired keys in nsBrowserApp, r=gfritzsche 2016-06-28 16:44:42 +02:00
Carsten "Tomcat" Book
261fe13dcd merge mozilla-inbound to mozilla-central a=merge 2016-06-28 16:09:05 +02:00
Thomas Nguyen
ffba687a20 Bug 1025965 - Rename browser.safebrowsing.enabled to browser.safebrowsing.phishing.enabled. r=francios
MozReview-Commit-ID: 3TMs6MPtWsC
2016-05-09 14:44:08 +08:00
Brian Grinstead
1adf4b4140 Bug 1278368 - Remove the error console. r=dolske
MozReview-Commit-ID: AIw6zqVjJFx

--HG--
extra : transplant_source : V%9C%F2%B6L%1D%22%D8%85%9Ep%AA%2B%CD%19%23%D2c%96%EE
2016-06-23 17:46:58 -07:00
Thomas Zimmermann
5d152949dc Bug 1276927: Build B2G with Android build scripts where possible, r=glandium
This patch adds support for configuring Gonk/B2G with Android-specific
build scripts. This removes duplicated code and simplifies maintenance
of B2G.

The B2G builds will now use libc++ for Gecko; instead of the obsolete
STLport. A side-effect of this patch is the removal of any compile-time
dependency on B2G's bionic library.

MozReview-Commit-ID: 7V6BmC7jlrs
2016-06-16 08:43:51 +01:00
Andrea Marchesini
c7264cb3ac Bug 1269162 - part 3 - Move XHR code into dom/xhr, r=smaug
--HG--
rename : dom/workers/XMLHttpRequestUploadWorker.cpp => dom/xhr/XMLHttpRequestUploadWorker.cpp
rename : dom/workers/XMLHttpRequestUploadWorker.h => dom/xhr/XMLHttpRequestUploadWorker.h
rename : dom/workers/XMLHttpRequestWorker.cpp => dom/xhr/XMLHttpRequestWorker.cpp
rename : dom/workers/XMLHttpRequestWorker.h => dom/xhr/XMLHttpRequestWorker.h
rename : dom/base/nsIXMLHttpRequest.idl => dom/xhr/nsIXMLHttpRequest.idl
rename : dom/base/nsXMLHttpRequest.cpp => dom/xhr/nsXMLHttpRequest.cpp
rename : dom/base/nsXMLHttpRequest.h => dom/xhr/nsXMLHttpRequest.h
rename : dom/base/test/echo.sjs => dom/xhr/tests/echo.sjs
rename : dom/base/test/file_XHRDocURI.html => dom/xhr/tests/file_XHRDocURI.html
rename : dom/base/test/file_XHRDocURI.html^headers^ => dom/xhr/tests/file_XHRDocURI.html^headers^
rename : dom/base/test/file_XHRDocURI.sjs => dom/xhr/tests/file_XHRDocURI.sjs
rename : dom/base/test/file_XHRDocURI.text => dom/xhr/tests/file_XHRDocURI.text
rename : dom/base/test/file_XHRDocURI.text^headers^ => dom/xhr/tests/file_XHRDocURI.text^headers^
rename : dom/base/test/file_XHRDocURI.xml => dom/xhr/tests/file_XHRDocURI.xml
rename : dom/base/test/file_XHRDocURI.xml^headers^ => dom/xhr/tests/file_XHRDocURI.xml^headers^
rename : dom/base/test/file_XHRResponseURL.js => dom/xhr/tests/file_XHRResponseURL.js
rename : dom/base/test/file_XHRResponseURL.sjs => dom/xhr/tests/file_XHRResponseURL.sjs
rename : dom/base/test/file_XHRResponseURL.text => dom/xhr/tests/file_XHRResponseURL.text
rename : dom/base/test/file_XHRResponseURL.text^headers^ => dom/xhr/tests/file_XHRResponseURL.text^headers^
rename : dom/base/test/file_XHRResponseURL_nocors.text => dom/xhr/tests/file_XHRResponseURL_nocors.text
rename : dom/base/test/file_XHRSendData.sjs => dom/xhr/tests/file_XHRSendData.sjs
rename : dom/base/test/file_XHRSendData_doc.xml => dom/xhr/tests/file_XHRSendData_doc.xml
rename : dom/base/test/file_XHRSendData_doc.xml^headers^ => dom/xhr/tests/file_XHRSendData_doc.xml^headers^
rename : dom/base/test/file_XHR_anon.sjs => dom/xhr/tests/file_XHR_anon.sjs
rename : dom/base/test/file_XHR_binary1.bin => dom/xhr/tests/file_XHR_binary1.bin
rename : dom/base/test/file_XHR_binary1.bin^headers^ => dom/xhr/tests/file_XHR_binary1.bin^headers^
rename : dom/base/test/file_XHR_binary2.bin => dom/xhr/tests/file_XHR_binary2.bin
rename : dom/base/test/file_XHR_fail1.txt => dom/xhr/tests/file_XHR_fail1.txt
rename : dom/base/test/file_XHR_fail1.txt^headers^ => dom/xhr/tests/file_XHR_fail1.txt^headers^
rename : dom/base/test/file_XHR_fail1b.txt => dom/xhr/tests/file_XHR_fail1b.txt
rename : dom/base/test/file_XHR_header.sjs => dom/xhr/tests/file_XHR_header.sjs
rename : dom/base/test/file_XHR_pass1.xml => dom/xhr/tests/file_XHR_pass1.xml
rename : dom/base/test/file_XHR_pass2.txt => dom/xhr/tests/file_XHR_pass2.txt
rename : dom/base/test/file_XHR_pass3.txt => dom/xhr/tests/file_XHR_pass3.txt
rename : dom/base/test/file_XHR_pass3.txt^headers^ => dom/xhr/tests/file_XHR_pass3.txt^headers^
rename : dom/base/test/file_XHR_system_redirect.html => dom/xhr/tests/file_XHR_system_redirect.html
rename : dom/base/test/file_XHR_system_redirect.html^headers^ => dom/xhr/tests/file_XHR_system_redirect.html^headers^
rename : dom/base/test/file_XHR_timeout.sjs => dom/xhr/tests/file_XHR_timeout.sjs
rename : dom/base/test/file_html_in_xhr.html => dom/xhr/tests/file_html_in_xhr.html
rename : dom/base/test/file_html_in_xhr.sjs => dom/xhr/tests/file_html_in_xhr.sjs
rename : dom/base/test/file_html_in_xhr2.html => dom/xhr/tests/file_html_in_xhr2.html
rename : dom/base/test/file_html_in_xhr3.html => dom/xhr/tests/file_html_in_xhr3.html
rename : dom/base/test/progressserver.sjs => dom/xhr/tests/progressserver.sjs
rename : dom/workers/test/relativeLoad_import.js => dom/xhr/tests/relativeLoad_import.js
rename : dom/workers/test/relativeLoad_worker.js => dom/xhr/tests/relativeLoad_worker.js
rename : dom/workers/test/relativeLoad_worker2.js => dom/xhr/tests/relativeLoad_worker2.js
rename : dom/base/test/responseIdentical.sjs => dom/xhr/tests/responseIdentical.sjs
rename : dom/workers/test/subdir/relativeLoad_sub_import.js => dom/xhr/tests/subdir/relativeLoad_sub_import.js
rename : dom/workers/test/subdir/relativeLoad_sub_worker.js => dom/xhr/tests/subdir/relativeLoad_sub_worker.js
rename : dom/workers/test/subdir/relativeLoad_sub_worker2.js => dom/xhr/tests/subdir/relativeLoad_sub_worker2.js
rename : dom/workers/test/terminateSyncXHR_worker.js => dom/xhr/tests/terminateSyncXHR_worker.js
rename : dom/base/test/test_XHR.html => dom/xhr/tests/test_XHR.html
rename : dom/base/test/test_XHRDocURI.html => dom/xhr/tests/test_XHRDocURI.html
rename : dom/base/test/test_XHRResponseURL.html => dom/xhr/tests/test_XHRResponseURL.html
rename : dom/base/test/test_XHRSendData.html => dom/xhr/tests/test_XHRSendData.html
rename : dom/base/test/test_XHR_anon.html => dom/xhr/tests/test_XHR_anon.html
rename : dom/base/test/test_XHR_header.html => dom/xhr/tests/test_XHR_header.html
rename : dom/base/test/test_XHR_onuploadprogress.html => dom/xhr/tests/test_XHR_onuploadprogress.html
rename : dom/base/test/test_XHR_parameters.html => dom/xhr/tests/test_XHR_parameters.html
rename : dom/base/test/test_XHR_system.html => dom/xhr/tests/test_XHR_system.html
rename : dom/base/test/test_XHR_timeout.html => dom/xhr/tests/test_XHR_timeout.html
rename : dom/base/test/test_XHR_timeout.js => dom/xhr/tests/test_XHR_timeout.js
rename : dom/base/test/test_html_in_xhr.html => dom/xhr/tests/test_html_in_xhr.html
rename : dom/workers/test/test_relativeLoad.html => dom/xhr/tests/test_relativeLoad.html
rename : dom/base/test/test_sync_xhr_timer.xhtml => dom/xhr/tests/test_sync_xhr_timer.xhtml
rename : dom/workers/test/test_terminateSyncXHR.html => dom/xhr/tests/test_worker_terminateSyncXHR.html
rename : dom/workers/test/test_xhr.html => dom/xhr/tests/test_worker_xhr.html
rename : dom/workers/test/test_xhr2.html => dom/xhr/tests/test_worker_xhr2.html
rename : dom/workers/test/test_xhrAbort.html => dom/xhr/tests/test_worker_xhrAbort.html
rename : dom/workers/test/test_xhr_3rdparty.html => dom/xhr/tests/test_worker_xhr_3rdparty.html
rename : dom/workers/test/test_xhr_cors_redirect.html => dom/xhr/tests/test_worker_xhr_cors_redirect.html
rename : dom/workers/test/test_xhr_headers.html => dom/xhr/tests/test_worker_xhr_headers.html
rename : dom/workers/test/test_xhr_implicit_cancel.html => dom/xhr/tests/test_worker_xhr_implicit_cancel.html
rename : dom/workers/test/test_xhr_parameters.html => dom/xhr/tests/test_worker_xhr_parameters.html
rename : dom/workers/test/test_xhr_parameters.js => dom/xhr/tests/test_worker_xhr_parameters.js
rename : dom/workers/test/test_xhr_responseURL.html => dom/xhr/tests/test_worker_xhr_responseURL.html
rename : dom/workers/test/test_xhr_system.html => dom/xhr/tests/test_worker_xhr_system.html
rename : dom/workers/test/test_xhr_system.js => dom/xhr/tests/test_worker_xhr_system.js
rename : dom/workers/test/test_xhr_timeout.html => dom/xhr/tests/test_worker_xhr_timeout.html
rename : dom/base/test/test_xhr_abort_after_load.html => dom/xhr/tests/test_xhr_abort_after_load.html
rename : dom/base/test/test_xhr_forbidden_headers.html => dom/xhr/tests/test_xhr_forbidden_headers.html
rename : dom/base/test/test_xhr_overridemimetype_throws_on_invalid_state.html => dom/xhr/tests/test_xhr_overridemimetype_throws_on_invalid_state.html
rename : dom/base/test/test_xhr_progressevents.html => dom/xhr/tests/test_xhr_progressevents.html
rename : dom/base/test/test_xhr_send.html => dom/xhr/tests/test_xhr_send.html
rename : dom/base/test/test_xhr_send_readystate.html => dom/xhr/tests/test_xhr_send_readystate.html
rename : dom/base/test/test_xhr_withCredentials.html => dom/xhr/tests/test_xhr_withCredentials.html
rename : dom/workers/test/file_getcookie.sjs => dom/xhr/tests/worker_file_getcookie.sjs
rename : dom/workers/test/terminateSyncXHR_frame.html => dom/xhr/tests/worker_terminateSyncXHR_frame.html
rename : dom/workers/test/testXHR.txt => dom/xhr/tests/worker_testXHR.txt
rename : dom/workers/test/xhr_cors_redirect.js => dom/xhr/tests/worker_xhr_cors_redirect.js
rename : dom/workers/test/xhr_cors_redirect.sjs => dom/xhr/tests/worker_xhr_cors_redirect.sjs
rename : dom/workers/test/xhr_headers_server.sjs => dom/xhr/tests/worker_xhr_headers_server.sjs
rename : dom/workers/test/xhr_headers_worker.js => dom/xhr/tests/worker_xhr_headers_worker.js
rename : dom/workers/test/xhr2_worker.js => dom/xhr/tests/xhr2_worker.js
rename : dom/workers/test/xhrAbort_worker.js => dom/xhr/tests/xhrAbort_worker.js
rename : dom/workers/test/xhr_implicit_cancel_worker.js => dom/xhr/tests/xhr_implicit_cancel_worker.js
rename : dom/workers/test/xhr_worker.js => dom/xhr/tests/xhr_worker.js
2016-06-27 19:13:40 +02:00
Jan Varga
2d1e6d62c8 Bug 1246828 - Part 4: Rename profile-before-change2 to profile-before-change-qm and profile-before-change3 to profile-before-change-telemetry; r=asuth 2016-06-15 11:49:04 +01:00
Jan Varga
b85865d615 Bug 1246828 - Part 1: Add an additional notification profile-before-change3 and update telemetry sending code to use it; r=asuth 2016-06-15 11:48:39 +01:00
Sebastian Hengst
d41fba2a76 Backed out changeset f6f4144c4dbc (bug 1276927) 2016-06-15 12:23:48 +02:00
Thomas Zimmermann
c63293b2ca Bug 1276927: Build B2G with Android build scripts where possible, r=glandium
This patch adds support for configuring Gonk/B2G with Android-specific
build scripts. This removes duplicated code and simplifies maintenance
of B2G.

The B2G builds will now use libc++ for Gecko; instead of the obsolete
STLport. A side-effect of this patch is the removal of any compile-time
dependency on B2G's bionic library.

MozReview-Commit-ID: 7V6BmC7jlrs
2016-06-15 10:59:49 +01:00
Mike Hommey
c5caa62fdf Bug 1278456 - Add the tooltool GCC library directory to LD_LIBRARY_PATH on Linux builds. r=mshal
Build slaves on automation are based on Centos 6, which doesn't have a
recent enough version of libstdc++ for our new requirements. But since
we're building with a recent GCC or clang with its own libstdc++, we do
have such a libstdc++ available somewhere, and the compiler picks it
when invoking the linker.

Problems start happening when we execute some of the built programs
during the build, like host tools (e.g. nsinstall), or target programs
(xpcshell, during packaging). In that case, we need the compiler's
libstdc++ to be used. Which required adding the GCC or clang library
directory to LD_LIBRARY_PATH.

Unconveniently enough, the clang 3.5 tooltool package we're using for
ASAN builds until we can update to at least 3.8 (bug 1278718) doesn't
contain libstdc++.so. So for those builds, pull the GCC package from
tooltool as well, and pick libstdc++ from there.
2016-06-12 18:52:15 +09:00
Jonathan Watt
b15368cfcb Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
Mike Hommey
4725fcb648 Bug 1271574 - Purposefully leak the XUL_APP_FILE string passed to putenv. r=bsmedberg
Before bug 552864, the string was created with PR_smprintf, and
PR_SetEnv'ed (which, under the hood, just calls putenv). PR_smprintf was
allocating the string on the heap. Now, it's allocated on the stack, and
still putenv'ed.

putenv kind of takes ownership of the strings it's being passed, so
stack allocated strings are dangerous to use. It looks like we've been
fairly lucky that it worked, presumably because compilers would keep the
stack frame with the variable, but that's not guaranteed to happen, and
in some case, doesn't.

So we strdup the string and purposefully leak it instead, which matches
what happened before bug 552864, and is the only "sane" way to use
putenv.

--HG--
extra : rebase_source : e39349f90f5346b591e20696c0c3c7fdb26c3cfb
2016-06-02 08:44:16 +09:00
Kit Cambridge
a9df8d4d3f Bug 1278851 - Enable service worker notifications everywhere except for non-release B2G. r=baku
MozReview-Commit-ID: InG420vpNtA

--HG--
extra : rebase_source : 0523697466cb8f438b1af129c5d74a1b0c8df499
2016-06-07 14:25:59 -07:00
Andrzej Hunt
89a79fadfa Bug 1258549 - Upgrade b2g support links r=margaret
MozReview-Commit-ID: 5ETAw9W8wY6

--HG--
extra : rebase_source : a2fd8143f259271e779afec7bc7e61baf1fb56ba
extra : histedit_source : bf5b04ad192da533420807de4b0d3d85db1e22c6
2016-06-03 11:09:56 -07:00
Shih-Chiang Chien
0581ac410b Bug 1277197 - fix JS error in PresentationRequestUIGlue for 2-UAs device. r=kuoe0. 2016-06-01 21:12:21 +08:00
Alastor Wu
fa47d77e11 Bug 1257738 - part1 : implement the audio competing mechanism.
MozReview-Commit-ID: GZw7P0kbhOa
2016-06-01 10:21:13 +08:00
Steve Fink
75e3654bc5 Bug 1259850 - Update sixgill to ignore exception cleanup and properly qualify some type names
MozReview-Commit-ID: 7WSYmLAVb7M

--HG--
extra : rebase_source : 44c937df8e1fe080577d8a00b924698f033daa39
extra : source : b641d01138ab54ec1f6b29232614b338b02d42f1
2016-05-04 18:36:23 -07:00
Wes Kocher
74c78019e7 Backed out 22 changesets (bug 1259850) for GC crashes in various tests CLOSED TREE
Backed out changeset ef5cdcca45d9 (bug 1259850)
Backed out changeset c95bdd426ced (bug 1259850)
Backed out changeset a73f74f718e7 (bug 1259850)
Backed out changeset 95107c3ad9cf (bug 1259850)
Backed out changeset 788ac18818c9 (bug 1259850)
Backed out changeset 19c13aa9b5ad (bug 1259850)
Backed out changeset 0b9dedcf7163 (bug 1259850)
Backed out changeset b641d01138ab (bug 1259850)
Backed out changeset aa434447a11b (bug 1259850)
Backed out changeset 4c7373c6c29e (bug 1259850)
Backed out changeset 457cb29cad55 (bug 1259850)
Backed out changeset 5762a8fba027 (bug 1259850)
Backed out changeset 129559d4ac62 (bug 1259850)
Backed out changeset d00b9c8a7984 (bug 1259850)
Backed out changeset 266befcb8acd (bug 1259850)
Backed out changeset c6615c7b0083 (bug 1259850)
Backed out changeset 196ac1f813f9 (bug 1259850)
Backed out changeset b6108a65dc38 (bug 1259850)
Backed out changeset 0d58f8529b86 (bug 1259850)
Backed out changeset a8d2730ada95 (bug 1259850)
Backed out changeset e8544b072ee6 (bug 1259850)
Backed out changeset 15de0d1d0b05 (bug 1259850)
2016-05-31 11:15:41 -07:00
Steve Fink
8e2cd9d734 Bug 1259850 - Update sixgill to ignore exception cleanup and properly qualify some type names
MozReview-Commit-ID: 7WSYmLAVb7M

--HG--
extra : rebase_source : adb56e3297546f013f669582aa452a5e16e758dd
2016-05-04 18:36:23 -07:00
Carsten "Tomcat" Book
c715836c7f merge mozilla-inbound to mozilla-central a=merge 2016-05-25 15:04:00 +02:00
Carsten "Tomcat" Book
3cab03a461 Merge mozilla-central to fx-team 2016-05-24 15:15:55 +02:00
Mathieu Leplatre
20c906a2ce Bug 1266235 - Move blocklist preferences to all.js. r=MattN
Related:

* https://bugzilla.mozilla.org/show_bug.cgi?id=1248557
* https://bugzilla.mozilla.org/show_bug.cgi?id=1259947

MozReview-Commit-ID: H2Eh1oqXeS1

--HG--
extra : rebase_source : 415c26880debea7f4d410abfdab0eb5b44a4e767
2016-04-29 13:17:09 +02:00
Patrick McManus
c0638a1abc Bug 1274729 - corrupted content string management r=dragana 2016-05-23 10:12:31 -04:00
Shih-Chiang Chien
c6b56100ad Bug 1228266 - rename TCPPresentationServer to PresentationControlService. r=junior.
MozReview-Commit-ID: 2kHZ0XUG2ew

--HG--
rename : dom/presentation/interfaces/nsITCPPresentationServer.idl => dom/presentation/interfaces/nsIPresentationControlService.idl
rename : dom/presentation/provider/TCPPresentationServer.js => dom/presentation/provider/PresentationControlService.js
extra : rebase_source : adc621d185c91e74c1abbef8cc2d519f5bbaed3a
2016-05-20 14:53:30 +08:00
Patrick McManus
30c9aa43b3 Bug 1223834 - Corrupted Content Error Description repeated twice. r=dragana
--HG--
extra : rebase_source : 0b4560aad03b234fe19fb9a93a6040b706332a14
2016-05-17 16:17:29 -04:00
Alexandre Lissy
b4420dcc85 Bug 1273126 - Fixing definition of MOZ_SERVICES_SYNC on B2G r=glandium
MozReview-Commit-ID: 1FniQxHUCKC

--HG--
extra : rebase_source : e64684de98c903502d133e1278cb87c19a2f20a2
2016-05-16 15:27:48 +02:00
Bob Owen
2447fbb7fa Bug 1035125 Part 1: Back out changeset 1910714b56c6 and associated subsequent changes. r=bsmedberg
The original changeset that is being backed out had comment:
Bug 1023941 - Part 5: Loader hook to redirect the missing import.

The changes made in bug 1023941 were to work around the fact that with VS2013, msvcr120.dll imports kernel32!GetLogicalProcessorInformation, which is not available on Windows XP SP2.
In VS2015, the GetLogicalProcessorInformation requirement has moved into concrt140.dll (concurrency runtime), which we don't use.
So, now that our build infra is building with VS2015, we can remove the hooking and static runtime linking required to get the VS2013 fix to work.

In addition we need to do that to be able us to link the Chromium sandbox code into firefox.exe and get it to build and run with both VS2015 and VS2013.

MozReview-Commit-ID: 1tlXaYJ8dHH

--HG--
extra : rebase_source : 49b216e34fc5c77af96df1f67ee44c46d5368bfe
2016-05-15 16:23:56 +01:00