Commit Graph

466439 Commits

Author SHA1 Message Date
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
Matthew Noorenberghe
70da2ea8f6 Bug 1251139 - Follow-up to properly rebase over bug 1153128. r=me
on a CLOSED TREE

MozReview-Commit-ID: 35xb0uBoOrf
2016-03-09 14:53:52 -08:00
B2G Bumper Bot
75a984a531 Bumping manifests a=b2g-bump 2016-03-09 09:50:55 -08:00
B2G Bumper Bot
176a5e469c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8bec48f18dee
Author: Sean Lee <weilonge@gmail.com>
Desc: Merge pull request #34027 from weilonge/seanlee/TVSettings/master/Bug1242314

Bug 1242314 - Implement key navigation feature in Settings app for supporting TV form-factor.

========

https://hg.mozilla.org/integration/gaia-central/rev/1608b764cbb9
Author: Sean Lee <weilonge@gmail.com>
Desc: Bug 1242314 - Implement key navigation feature in Settings app for supporting TV form-factor..
2016-03-09 09:49:15 -08:00
B2G Bumper Bot
b615781c69 Bumping manifests a=b2g-bump 2016-03-09 08:51:01 -08:00
B2G Bumper Bot
5471aeed5b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c224ca1f7e0e
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #34141 from albertopq/1254154-lockscreen-intermittent

Bug 1254154 - Lockscreen intermittent test failure r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/38761682fe64
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1254154 - Lockscreen intermittent test failure
2016-03-09 08:49:23 -08:00
Gregor Wagner
8c33ab6483 Merge m-c -> b-i
--HG--
rename : js/src/configure.in => js/src/old-configure.in
rename : configure.in => old-configure.in
2016-03-09 16:59:48 +01:00
Jonathan Kew
0114592c75 Bug 1249496 - Don't apply dpi-based scaling for window titlebar dimensions when on a secondary display, because windows doesn't scale it. r=emk 2016-03-09 10:55:35 +00:00
Carsten "Tomcat" Book
1ca11b97af merge mozilla-inbound to mozilla-central a=merge 2016-03-09 11:46:43 +01:00
Carsten "Tomcat" Book
269ed01cd3 merge fx-team to mozilla-central a=merge 2016-03-09 11:44:55 +01:00
B2G Bumper Bot
3fe0d09f56 Bumping manifests a=b2g-bump 2016-03-09 00:47:07 -08:00
B2G Bumper Bot
369467705f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1aaca8e8e985
Author: Yi-Fan Liao <yliao@mozilla.com>
Desc: Merge pull request #34112 from begeeben/1250821_refine_tv_browser

Bug 1250821 - Refine TV browser style and layout, r=dhuang

========

https://hg.mozilla.org/integration/gaia-central/rev/ddb51fcdf801
Author: yifan <yliao@mozilla.com>
Desc: Bug 1250821 - Refine TV browser style and layout
2016-03-09 00:45:26 -08:00
Jordan Santell
bf88202287 Bug 1251033 - Part 3 - Fix unmerged chunk from eb9b84702b2c. a=philor 2016-03-08 21:58:47 -08:00
Jean-Yves Avenard
b9f36401b9 Bug 1230265 - Mark constructor as explicit; r=me
ON A CLOSED TREE.

MozReview-Commit-ID: 1jCfP6OzCfH
2016-03-09 16:40:55 +11:00
Daisuke Akatsuka
2d2c72ccbf Bug 1237173 - Part3: Throw TypeError if duration is NaN, negative value or not 'auto' string. r=birtles, r=smaug 2016-03-09 14:01:45 +09:00
Daisuke Akatsuka
cb51780a6e Bug 1237173 - Part2: Change type of duration to Maybe<StickyTimeDuration>. r=birtles 2016-03-09 14:14:20 +09:00
ffxbld
2855108b28 No bug, Automated blocklist update from host bld-linux64-spot-223 - a=blocklist-update 2016-03-08 19:41:40 -08:00
ffxbld
3e380e6fa3 No bug, Automated HPKP preload list update from host bld-linux64-spot-223 - a=hpkp-update 2016-03-08 19:41:38 -08:00
ffxbld
a560947174 No bug, Automated HSTS preload list update from host bld-linux64-spot-223 - a=hsts-update 2016-03-08 19:41:36 -08:00
B2G Bumper Bot
e6b6eedf75 Bumping manifests a=b2g-bump 2016-03-08 19:16:59 -08:00
B2G Bumper Bot
50e24e79bb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e0f9cf7153a9
Author: Zibi Braniecki <zibi@braniecki.net>
Desc: Merge pull request #34147 from zbraniecki/1254533-fix-missing-keys-in-keyboard

Bug 1254533 - Remove L10nLoader from Keyboard app. r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/e6c43985ae8b
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1254533 - Remove L10nLoader from Keyboard app
2016-03-08 19:15:17 -08:00
Ting-Yu Chou
92314af9cb Bug 1249226 - Use weak reference to keep popup's previous focus to avoid leak. r=neil
MozReview-Commit-ID: 8VUexyKMbJr
2016-03-09 10:54:04 +08:00
Grigory Kruglov
02c22ae659 Bug 1249783 - Remove ability to disable suggested sites. r=margaret
MozReview-Commit-ID: 4BcJlWV0E9L

--HG--
extra : transplant_source : %A9ADy%1AZd%FA%83%80%CD%A8%DB%F7%0A%7D%AF%91%E8%97
2016-03-08 17:28:20 -08:00
Grigory Kruglov
082769bceb Bug 1255728 - Remove unused string. r=margaret
MozReview-Commit-ID: 5G1Id9w3Whn

--HG--
extra : transplant_source : %93%CCdg%CAGj%DA%D0c%0C%B3%27%1E%89%1E%C3%A1%07%DF
2016-03-11 00:37:19 -08:00
Tom Tromey
ca928d3839 Bug 1255827 - Put loader-defined globals in devtools/.eslintrc. r=jryans
MozReview-Commit-ID: BkNfuA4Dotj
2016-03-11 09:19:00 -05:00
simplyblue
01da15852e Bug 1253806 - [DevTools][Memory] label.label-by > span element does not have margin-inline-end. r=fitzgen 2016-03-11 12:14:46 +05:30
iawaknahc
feb31c8460 Bug 1148200 - Move isJSONable to sdk/lang/type. r=Mossop
MozReview-Commit-ID: 9DjvYFGl7rX

--HG--
extra : transplant_source : %E1z%C2%D5%83BAap%DF%9Bo%7D%94%E3%AB%AA%D1%11%0A
2016-03-09 16:37:34 +01:00
malayaleecoder
c10c9a9612 Bug 1252368 - Move resource files in layout/style/ into layout/style/res/ directory. r=nalexander
MozReview-Commit-ID: HdF06H2gJYY

--HG--
rename : layout/style/arrow-left.gif => layout/style/res/arrow-left.gif
rename : layout/style/arrow-right.gif => layout/style/res/arrow-right.gif
rename : layout/style/arrow.gif => layout/style/res/arrow.gif
rename : layout/style/arrowd-left.gif => layout/style/res/arrowd-left.gif
rename : layout/style/arrowd-right.gif => layout/style/res/arrowd-right.gif
rename : layout/style/arrowd.gif => layout/style/res/arrowd.gif
rename : layout/style/counterstyles.css => layout/style/res/counterstyles.css
rename : layout/style/forms.css => layout/style/res/forms.css
rename : layout/style/html.css => layout/style/res/html.css
rename : layout/style/noframes.css => layout/style/res/noframes.css
rename : layout/style/noscript.css => layout/style/res/noscript.css
rename : layout/style/number-control.css => layout/style/res/number-control.css
rename : layout/style/plaintext.css => layout/style/res/plaintext.css
rename : layout/style/quirk.css => layout/style/res/quirk.css
rename : layout/style/ua.css => layout/style/res/ua.css
rename : layout/style/viewsource.css => layout/style/res/viewsource.css
extra : rebase_source : c56048e17a72c75a456556ee2111841184a92edf
2016-03-11 00:57:34 +05:30
Nick Alexander
ec9bb5f508 Bug 1255855 - Make sample partner build actually build with the fennec-distribution-sample. r=me
DONTBUILD NPOTB

MozReview-Commit-ID: Lv8vUN4JSHP

--HG--
extra : rebase_source : bc436be87952007b018abdbb139db30e80c7fc76
2016-03-11 10:48:16 -08:00