Commit Graph

466324 Commits

Author SHA1 Message Date
Ryan VanderMeulen
fadd2e59b8 Bug 1256037 - Update pdf.js to version 1.4.135. r=bdahl 2016-03-12 16:49:23 -05:00
Ryan VanderMeulen
da1885e860 Merge inbound to m-c. a=merge 2016-03-12 15:23:38 -05:00
Tooru Fujisawa
45cd59b8ba Backed out changeset ec80e2d4ccce (bug 933257) for mochitest-other failure and maybe some more. CLOSED TREE 2016-03-13 04:56:05 +09:00
Tooru Fujisawa
446ace4833 Backed out changeset 3025ae7a3445 (bug 933257) 2016-03-13 04:55:02 +09:00
Tooru Fujisawa
97223b0e78 Backed out changeset 2f7c7d7ddacc (bug 933257) 2016-03-13 04:55:00 +09:00
Tooru Fujisawa
f381128fb0 Backed out changeset e4a133efcb4d (bug 933257) 2016-03-13 04:54:57 +09:00
Tooru Fujisawa
a226741004 Backed out changeset c2df769e60ac (bug 933257) 2016-03-13 04:54:55 +09:00
Tooru Fujisawa
fb771b2697 Backed out changeset 2e20366dcaf7 (bug 933257) 2016-03-13 04:54:53 +09:00
Tooru Fujisawa
3dace94ad5 Backed out changeset 0bc00f6c24fd (bug 933257) 2016-03-13 04:54:50 +09:00
Tooru Fujisawa
4841dccbe2 Backed out changeset 96b3d993fc53 (bug 933257) 2016-03-13 04:54:48 +09:00
Tooru Fujisawa
bd78be93c2 Backed out changeset 69061c0ec32b (bug 933257) 2016-03-13 04:54:45 +09:00
Tooru Fujisawa
de1deaffd6 Backed out changeset b6ca6b5832d8 (bug 933257) 2016-03-13 04:54:42 +09:00
Tooru Fujisawa
340e6bbf57 Backed out changeset b2624519692f (bug 891107) 2016-03-13 04:54:33 +09:00
Tooru Fujisawa
632b50ecff Backed out changeset 13e045fff28d (bug 891107) 2016-03-13 04:54:30 +09:00
Tooru Fujisawa
65844d91b7 Backed out changeset 8fe18f2b8aa9 (bug 891107) 2016-03-13 04:54:27 +09:00
Tooru Fujisawa
a653c25c72 Backed out changeset ebd8c98e2329 (bug 891107) 2016-03-13 04:54:25 +09:00
Tooru Fujisawa
9824a5f19e Backed out changeset c47e7505bd94 (bug 891107) 2016-03-13 04:54:23 +09:00
Tooru Fujisawa
ed7fa27091 Backed out changeset f223b115ad37 (bug 891107) 2016-03-13 04:54:20 +09:00
Tooru Fujisawa
da7b7e3756 Backed out changeset 07d1058b745e (bug 891107) 2016-03-13 04:54:18 +09:00
Tooru Fujisawa
6e4d9110ce Backed out changeset c1bb74893286 (bug 891107) 2016-03-13 04:54:16 +09:00
Luke Wagner
d0ceed77d2 Bug 1254893 - Change 'Experimental' to 'Temporary' in string and DONTBUILD (r=me)
MozReview-Commit-ID: 6xQocmUEuCA
2016-03-12 13:42:58 -06:00
Tooru Fujisawa
e8c2a0e6f5 Backed out changeset 905e3a9f7557 (bug 1153978) for xpcshell test failure. CLOSED TREE
--HG--
extra : amend_source : b8e2e8de5140313da0e2f52c4d9d46e4b609b6cd
2016-03-13 04:27:02 +09:00
Tooru Fujisawa
20ae44e9a0 Backed out changeset 08ee8e76c703 (bug 1153978) 2016-03-13 04:26:57 +09:00
Tooru Fujisawa
37c3f4b22d Backed out changeset 8db1ac84d30e (bug 1153978) 2016-03-13 04:26:42 +09:00
Ryan VanderMeulen
211f928654 Merge fx-team to m-c. a=merge 2016-03-12 12:59:34 -05:00
ffxbld
7e46a33af1 No bug, Automated HPKP preload list update from host bld-linux64-spot-304 - a=hpkp-update 2016-03-12 04:40:14 -08:00
ffxbld
0391ff34f5 No bug, Automated HSTS preload list update from host bld-linux64-spot-304 - a=hsts-update 2016-03-12 04:40:12 -08:00
Ryan VanderMeulen
00d56902ad No bug - Fix busted merge conflict resolution on a CLOSED TREE. 2016-03-11 11:12:25 -05:00
Carsten "Tomcat" Book
e070379821 merge mozilla-inbound to mozilla-central a=merge 2016-03-11 16:50:43 +01:00
Carsten "Tomcat" Book
80bad564c7 merge fx-team to mozilla-central a=merge 2016-03-11 11:51:28 +01:00
Carsten "Tomcat" Book
19704bef52 Backed out changeset 554ded299ccb (bug 1255692) for permanent failures in test_no_token.html 2016-03-11 10:24:34 +01:00
Mike Hommey
0995f72a3a Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj
Our STL wrappers do various different things, one of which is including
mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h,
which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which
circles back to our STL wrapper.

But of the things our STL wrappers do, including mozalloc.h is not one
that is necessary for cstdlib. So skip including mozalloc.h in our
cstdlib wrapper.

Additionally, some C++ sources (in media/mtransport) are including
headers in an extern "C" block, which end up including stdlib.h, which
ends up including cstdlib because really, this is all C++, and our
wrapper pre-includes <new> for mozalloc.h, which fails because templates
don't work inside extern "C". So, don't pre-include <new> when we're not
including mozalloc.h.
2016-03-11 17:33:11 +09:00
Mike Hommey
188ea9bab3 Bug 1245076 - Include cmath instead of math.h in Collider.cpp. r=jfkthame
The combination of math.h being included and unified sources made abs()
in UtfCodec.h mean something different, failing the build with
libstdc++6 headers.
2016-03-11 17:33:11 +09:00
Yoshi Huang
59e4bf3989 Bug 1255685 - SessionStorage.jsm should use origin attributes from docshell. r=sicking 2016-03-11 11:45:09 +08:00
Ryan VanderMeulen
5e122b6f0a Backed out changesets 5115d7a4ff78 and 21e02fc102b4 (bug 1255265) for test_notifications_popup.html timeouts.
--HG--
rename : toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger.js => toolkit/components/passwordmgr/test/test_notifications.html
2016-03-10 22:28:52 -05:00
Joel Maher
c2f5092ca2 Bug 1242682 - Separate dom/media into its own subsuite. r=gbrown, a=tomcat
MozReview-Commit-ID: ERgFe60aJF8
2016-03-10 11:03:52 -08:00
Seth Fowler
c963068948 Bug 1255362 - Null-check GetContainer() before using it in image-related ConfigureLayer() methods. r=mstange a=Tomcat 2016-03-11 15:12:07 +08:00
Marco Bonardo
a224888879 Bug 1255061 - [e10s] convert test_bug_411966.html to mochitest-browser. r=adw
MozReview-Commit-ID: 5QCYC6uljKa

--HG--
extra : rebase_source : 4dff5486bb2a0d141436e044804d2483231ba689
2016-03-10 16:19:23 +01:00
Jan Odvarko
26702a93c8 Bug 1252807 - Fix eslint warnings in the Net panel. r=pbro 2016-03-10 15:28:44 +01:00
Jan Odvarko
e9b03dfbcf Bug 1252807 - Fix eslint warnings in the Net panel. r=pbro 2016-03-10 15:25:15 +01:00
Carsten "Tomcat" Book
1c95c143d4 merge mozilla-inbound to mozilla-central a=merge 2016-03-10 11:51:35 +01:00
Carsten "Tomcat" Book
cfe08ac185 merge fx-team to mozilla-central a=merge 2016-03-10 11:44:54 +01:00
Kris Maglione
0a673acdf3 Bug 1220154: Follow-up: Fix ESLint error in test. r=me
MozReview-Commit-ID: 77kjFc6jvTH
2016-03-09 17:59:15 -08:00
Hiroyuki Ikezoe
0e6b05c3b8 Bug 1254840 - Use longer animation duration to avoid intermittent failures on slow platforms. r=dholbert
MozReview-Commit-ID: FXrO0yI7Irt

--HG--
extra : rebase_source : dc9a4b629d9cb34821e0ba2ae2108454a9781805
2016-03-10 09:36:04 +09:00
Brian Grinstead
004c46bd8f Bug 1214439 - requestLongerTimeout for browser_dbg_split-console-keypress.js due to linux e10s timeouts;r=me
MozReview-Commit-ID: DnkHLe6lFSA
2016-03-09 16:26:30 -08:00
Matthew Noorenberghe
e01f4c4edd Bug 1251151 - Make test_autofill_password-only.html work for e10s. r=dolske
MozReview-Commit-ID: Atwqt9mp6Da

--HG--
rename : toolkit/components/passwordmgr/test/test_autofill_password-only.html => toolkit/components/passwordmgr/test/mochitest/test_autofill_password-only.html
extra : amend_source : aaf81c75cc91b4855f5a5ea10e2a276e56cfd06e
2016-03-09 15:36:17 -08:00
Matthew Noorenberghe
dd41ede7e4 Bug 1251098 - pwmgr: Enable test_recipe_login_fields.html in e10s. r=dolske
MozReview-Commit-ID: G0446CyBc4D

--HG--
rename : toolkit/components/passwordmgr/test/mochitest.ini => toolkit/components/passwordmgr/test/mochitest/mochitest.ini
rename : toolkit/components/passwordmgr/test/test_recipe_login_fields.html => toolkit/components/passwordmgr/test/mochitest/test_recipe_login_fields.html
2016-03-09 15:32:14 -08:00
Matthew Noorenberghe
b0a3337efd Bug 1251092 - Move password manager mochitest-chrome tests to a chrome subdirectory. r=dolske
MozReview-Commit-ID: JHIaCJLjdBt

--HG--
rename : toolkit/components/passwordmgr/test/chrome.ini => toolkit/components/passwordmgr/test/chrome/chrome.ini
rename : toolkit/components/passwordmgr/test/test_formless_autofill.html => toolkit/components/passwordmgr/test/chrome/test_formless_autofill.html
rename : toolkit/components/passwordmgr/test/test_formless_submit.html => toolkit/components/passwordmgr/test/chrome/test_formless_submit.html
rename : toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html => toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html
2016-03-09 15:29:05 -08:00
Matthew Noorenberghe
4916b4f8c6 Bug 1251092 - Cleanup function comments and undeclared variable in pwmgr_common.js. r=dolske
MozReview-Commit-ID: 5YFPrr584aD
2016-03-09 15:29:00 -08:00
Matthew Noorenberghe
4a12dde69b Bug 1251092 - Fix inconsistent indentation in pwmgr_common.js. r=dolske
MozReview-Commit-ID: 7SMcyyjt1QS
2016-03-09 15:28:55 -08:00