72ea59b550
merge fx-team to mozilla-central a=merge
2014-10-30 14:49:31 +01:00
a758e037c4
merge mozilla-inbound to mozilla-central a=merge
2014-10-30 14:45:37 +01:00
0ac0cb07ec
Bug 1078455 - "UITour: Add ability to highlight Dev. Tools and WebIDE toolbar buttons" [r=MattN+bmo]
2014-10-30 13:35:25 +00:00
73be65ad46
Bug 1064415 - Tabs tray/grid/panel interactions and visual design (r=lucasr)
2014-10-30 13:27:08 +00:00
e3d9112808
Bug 1060315 - Intermittent browser_devices_get_user_media.js | video/audio global indicator attribute as expected - Got , expected true, r=Gijs.
...
--HG--
extra : rebase_source : 587d6dc98b07d1dbfc663d85f07c8d35518b673f
2014-10-30 13:48:31 +01:00
7abbe11005
Bug 1087674 - Handle XHR abort()/timeout and certificate errors more gracefully in GMPInstallmanager. r=gfritzsche
...
Prior to this patch, a Man in the Middle (MITM) attack on SSL could cause GMPInstallManager to fail during the check for updates, which in turn would cause a crash during shutdown. This was observed in the wild by users of recent versions of Avast, which performs such attacks on SSL as part of its "HTTPS scanning" feature. With this patch, errors are handled more gracefully. The attack still prevents any update (including the install of OpenH264) but at least it does not cause a crash anymore.
2014-10-30 11:27:02 +01:00
2d01de8a32
Disable cut and paste tests on e10s due to intermittent failures, see bug 1091561 for re-enabling them.
2014-10-30 12:07:21 +00:00
ccaa05cb3e
Bug 1091107 - Visual refinements in the tab strip (r=mcomella)
2014-10-30 10:26:24 +00:00
0b9e5d6e50
Bug 1090364 - Enable fading edges in tab strip (r=mcomella)
2014-10-30 10:26:23 +00:00
ca0c07d45b
Bug 1090364 - Add fading edge support to TwoWayView (r=mcomella)
2014-10-30 10:26:23 +00:00
d73e85faba
Bug 1055601 - Don't flicker about:home URL when new tab is created (r=mcomella)
2014-10-30 10:26:23 +00:00
591742b5ce
Bug 1090494, part 4 - Add AppendRectToPath() and MakePathForRect() helpers to Moz2D's PathHelpers.h. r=mattwoodrow
2014-10-30 09:34:10 +00:00
f47a832163
Bug 1090494, part 3 - Remove the old unused variants of AppendRoundedRectToPath and MakePathForRoundedRect. r=mattwoodrow
2014-10-30 09:34:10 +00:00
6b502f624e
Bug 1090494, part 2 - Convert the consumers of AppendRoundedRectToPath and MakePathForRoundedRect to use the new RectCornerRadii API. r=mattwoodrow
2014-10-30 09:34:10 +00:00
ecfd6db484
Bug 1090494, part 1 - Add a RectCornerRadii struct to Moz2D's PathHelpers.h and add variants of AppendRoundedRectToPath and MakePathForRoundedRect that use it. r=mattwoodrow
2014-10-30 09:34:09 +00:00
0cde139d10
Bug 1091471 - update Clobber for Bug 1091118 Android Build problems
2014-10-30 10:23:32 +01:00
053e9ca254
Bug 1090983 - Invoke UpdateReadyState() after invoking SetState(). r=cpearce
...
Otherwise, UpdateReadyState() will think that nothing has changed.
2014-10-30 09:16:02 +01:00
6edbf7f7c7
Backed out changeset 1aa71eb718f7 (bug 1090627) for b2g Reftest - 8 test failures
2014-10-30 08:43:28 +01:00
baf9350f38
Fixup for bug 1077148: SmokeDMD needs mozglue linkage. r=me
2014-10-30 16:33:30 +09:00
be60bcd7fd
Bumping manifests a=b2g-bump
2014-10-29 23:01:57 -07:00
df1c752552
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4763231f664a
Author: Yi-Fan Liao <yliao@mozilla.com>
Desc: Merge pull request #25319 from begeeben/1074622_scaffold_the_tv_browser
Bug 1074622 - [Stingray] Scaffold the TV browser, r=:timdream, :rexboy, :evelyn
========
https://hg.mozilla.org/integration/gaia-central/rev/63fa2dc0d777
Author: Yi-Fan Liao <begeeben@gmail.com>
Desc: Bug 1074622 - [Stingray] Scaffold the TV browser
* Restructure HTML structure and style for TV browser UI.
* Draft modules for TV browser.
* add tv_apps/browser in build/config/tv/apps-engineering.list
========
https://hg.mozilla.org/integration/gaia-central/rev/93991bb8ff31
Author: Yi-Fan Liao <begeeben@gmail.com>
Desc: Bug 1074622 - [Stingray] Scaffold the TV browser
* Clone apps/browser to tv_apps/browser.
2014-10-29 22:55:47 -07:00
da59e89c30
Bug 1091118 part 2 - Do not use the top-level cache file for freetype2 subconfigure. r=gps
...
We modify the environment before running freetype2 configure. When it uses
the same cache file, it stores knowledge about that environment in the cache
file. The cache file is then reused to configure in js/src, with yet again a
different environment, which makes subconfigure.py clear the cache because
of the differences.
The configure in js/src is however invoked with the same environment as the
main configure was invoked with (mostly), so without freetype2 on the way,
reusing the cache for it works as expected. In fact, it works better with the
cache because of things coming from mozconfig that are not exported.
With freetype2 on the way, as mentioned above, the cache is cleared. Without
the cache, js/src/configure does new detections with a possibly different
environment, and stores that in the cache. Until the next build, which then
uses that different cache for the top-level configure.
This results in subtle differences in the HOST_CC/HOST_CXX variables on
android builds because those variables are not exported from mozconfig,
depending on PATH, what the builder was building before, and if the build
is a clobber.
Avoiding the freetype2 subconfigure writing its environment variables change
to the top-level cache makes the cache never invalidate for js/src.
2014-10-30 14:35:01 +09:00
90964173af
Bug 1091118 part 1 - Remove $topsrcdir/gcc/bin from PATH on android builds. r=gps
...
$topsrcdir/gcc/bin was mistakenly added in bug 971841, but is not provided by
anything the tooltool manifest for android builds pulls. It however is a path
that /may/ exist in the source tree when the slave ran a linux build before.
When it does exist, the meaning of non-path-prefixed commands change,
influencing what particular compiler is used in some cases.
2014-10-30 14:34:54 +09:00
5fae528038
Bumping manifests a=b2g-bump
2014-10-29 21:57:35 -07:00
35a5b94b4f
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/50dfd8b9dafb
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #25566 from snowmantw/bug1086215
Bug 1086215 - [LockScreen] Resume the animation delay of Bug 1069879 aft...
========
https://hg.mozilla.org/integration/gaia-central/rev/907502272224
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1086215 - [LockScreen] Resume the animation delay of Bug 1069879 after Bug 1079706 landed
========
https://hg.mozilla.org/integration/gaia-central/rev/f7cdd151d662
Author: Evan Tseng <itoyxd@gmail.com>
Desc: Merge pull request #25535 from evanxd/bug-1089564
Bug 1089564 - Always keep latest time range in week view when come back from other screens r=millermedeiros
========
https://hg.mozilla.org/integration/gaia-central/rev/cad4924a05d6
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 1089564 - Always keep latest time range in week view when come back from other screens
2014-10-29 21:55:49 -07:00
1a00512e5a
Bumping manifests a=b2g-bump
2014-10-29 21:31:58 -07:00
0b2fa81adf
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e8700aae333b
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #25571 from AnirudhGP/bug-1083301-fix
Bug 1083301 - Added ) and " as end symbols to trigger auto-correction.
r=rudylu
========
https://hg.mozilla.org/integration/gaia-central/rev/a5fc48128714
Author: Anirudh GP <anirudh.gp@gmail.com>
Desc: Bug 1083301 - Added ) and " as end symbols to trigger auto-correction.
2014-10-29 21:25:49 -07:00
ca43871a79
Bumping manifests a=b2g-bump
2014-10-29 17:01:59 -07:00
837e219f61
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8a69414eaca6
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #25420 from gaye/bug-821604" for Gu test failures
This reverts commit 3b98c6a903e79ea16a51832fa4be23f817ab5829, reversing
changes made to 4ee0a68bc71b00808313b21ebd7c3b6a60e98d14.
2014-10-29 16:55:49 -07:00
04d69e6857
Bug 1090627 - Disable some failing reftests for e10s (r=mattwoodrow)
2014-10-29 15:18:12 -07:00
d174842059
Add missing recurse.mk change from bug 1077148 part 1 after a bad merge. r=gps
...
--HG--
extra : amend_source : a6c285a79d2ca0b76a6896ae4478564de009c8b6
2014-10-30 13:51:01 +09:00
47c853314f
Bug 1077148 part 4 - Add and use new moz.build templates for Gecko programs and libraries. r=gps
...
There are, sadly, many combinations of linkage in use throughout the tree.
The main differentiator, though, is between program/libraries related to
Gecko or not. Kind of. Some need mozglue, some don't. Some need dependent
linkage, some standalone.
Anyways, these new templates remove the need to manually define the
right dependencies against xpcomglue, nspr, mozalloc and mozglue
in most cases.
Places that build programs and were resetting MOZ_GLUE_PROGRAM_LDFLAGS
or that build libraries and were resetting MOZ_GLUE_LDFLAGS can now
just not use those Gecko-specific templates.
2014-10-30 13:06:12 +09:00
0cd72b4901
Bug 1077148 part 3 - Do not link PrimitiveTest, SimpleTypeLib, TestAUSHelper, TestAUSReadStrings and screentopng against mozglue on Linux. r=gps
...
There is no reason these should be linked to mozglue on Linux only. This
makes the intent clearer for the related changes in part 4.
2014-10-30 13:06:04 +09:00
7646c7f0cc
Bug 1077148 part 2 - Remove hack to avoid sqlite being linked against mozglue on mac. r=gps
...
This hack has actually not been actively used since sqlite, nss and nspr are
all folded together, because no shared library is actually linked in
db/sqlite3/src.
2014-10-30 13:05:56 +09:00
44b304224a
Bug 1077148 part 1 - Define mozcrt in moz.build. r=gps
...
--HG--
rename : mozglue/build/Makefile.in => mozglue/crt/Makefile.in
rename : mozglue/build/fixcrt.py => mozglue/crt/fixcrt.py
2014-10-30 13:05:50 +09:00
e9387c4b71
Bug 1048044 - Use exponential growth when growing an nsTArray. r=froydnj.
...
--HG--
extra : rebase_source : 7587eb25686f5273b9b77a8b38c6cc40ce5fc25b
2014-10-29 20:34:33 -07:00
0e5350ab35
Bug 997908 - crash in ReleaseSliceNow(unsigned int, void*) accessing memory at 0x5a5a5a5a5a5a5a5a, test patch. r=nfroyd
2014-10-29 21:50:29 -05:00
0758ec4767
Bug 1090764 - Fix typo in AbstractFramePtr::numFormalArgs. (r=efaust)
2014-10-29 19:41:43 -07:00
3911713b43
Bug 1089761 - Fix initializing lexicals to throw on touch on CallObject. (r=jandem,Waldo)
2014-10-29 19:41:42 -07:00
6440005c47
Bug 1071482 - Add more logging to help debug rare intermittent failures. r=edwin
2014-10-30 15:05:49 +13:00
98c95a3171
Bumping manifests a=b2g-bump
2014-10-29 15:17:03 -07:00
604f42bcf2
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/cff0262dcdc3
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #25215 from albertopq/1073032-add-tests
Bug 1073032 - Adding integration tests to the ambient indicator r=etienne
========
https://hg.mozilla.org/integration/gaia-central/rev/c201e6b4a900
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1073032 - Adding integration tests to the ambient indicator
2014-10-29 15:10:49 -07:00
65dc0e7c9a
Bumping manifests a=b2g-bump
2014-10-29 14:57:35 -07:00
0bf2ab53b0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c1e90942f710
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #25632 from albertopq/1091069-regression-1087042
Bug 1091069 - Restoring the progress bar on the browser r=kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/a3df84b30f5b
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1091069 - Restoring the progress bar on the browser
2014-10-29 14:55:46 -07:00
8e75afef8a
Bumping manifests a=b2g-bump
2014-10-29 14:47:34 -07:00
96c2eaba1c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/967feac6ca44
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #25457 from ADLR-es/confirm-if-no-contacts
Bug 1072180 - [GAIA][Contacts]if No Contacts on Gmail, while import sele...
========
https://hg.mozilla.org/integration/gaia-central/rev/7fd12efcb43a
Author: Adrián de la Rosa <hola@adlr.es>
Desc: Bug 1072180 - [GAIA][Contacts]if No Contacts on Gmail, while import select all and deselect all are enabled
2014-10-29 14:40:36 -07:00
b278f8c9e3
Merge m-c to b2g-inbound. a=merge
2014-10-29 16:53:59 -04:00
6de5c1cb7e
Merge inbound to m-c. a=merge
2014-10-29 16:49:04 -04:00
2c7e58684b
Bumping manifests a=b2g-bump
2014-10-29 13:44:01 -07:00
36ff75b50f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/793e654c6929
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #25629 from jimporter/ringtones-exclusive
Bug 1091137https://hg.mozilla.org/integration/gaia-central/rev/f3da44c0516c
Author: Jim <jporter@mozilla.com>
Desc: Bug 1091137
2014-10-29 13:43:46 -07:00
Carsten "Tomcat" Book
Michael Ratcliffe
Martyn Haigh
Florian Quèze
David Rajchenbach-Teller
Gijs Kruitbosch
Lucas Rocha
Jonathan Watt
Bobby Holley
Mike Hommey
B2G Bumper Bot
Bill McCloskey
Nicholas Nethercote
Steven Michaud
Shu-yu Guo
Chris Pearce
Ryan VanderMeulen