Ed Morley
bd22dac370
Merge backout; CLOSED TREE
2014-03-07 15:53:02 +00:00
Ed Morley
0ddf702725
Backed out changeset f94ee00aa4d6 (bug 974197) for causing gaia-ui-test failures
2014-03-07 15:45:59 +00:00
Ed Morley
e442875fbc
Backed out changeset 14313e0ce5fd (bug 952927) for xpcshell failures; CLOSED TREE
2014-03-07 15:18:14 +00:00
Ed Morley
0c73be3c99
Backed out changeset f74bf7d090ee (bug 952927)
2014-03-07 15:17:55 +00:00
Ed Morley
4c2035c362
Backed out changeset 07e1893cb0f9 (bug 952927)
2014-03-07 15:17:51 +00:00
Ed Morley
8a1510ce60
Merge mozilla-central and inbound; CLOSED TREE
...
--HG--
extra : amend_source : af326b0eb24cafb5212fab43dcecacc5ddf0ee60
2014-03-07 15:07:22 +00:00
Ed Morley
10aebf48c2
Backed out changeset dcec4c42cd18 (bug 757866) for bug 980835
2014-03-07 15:05:31 +00:00
Jonathan Watt
0fa06ee7c7
Bug 980885 - Fix more Moz2D D2D mapping code that fails to set/reset mIsMapped. r=Bas CLOSED TREE to fix orange
2014-03-07 14:55:16 +00:00
Carsten "Tomcat" Book
756c257f98
merge fx-team to mozilla-central
2014-03-07 13:06:05 +01:00
Carsten "Tomcat" Book
c346b6e437
merge b2g-inbound to mozilla-central
2014-03-07 12:49:50 +01:00
B2G Bumper Bot
4908c03a51
Bumping manifests a=b2g-bump
2014-03-07 00:46:11 -08:00
B2G Bumper Bot
c591fa5ff0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1ad040b490a7
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #16672 from ferjm/bug955945.coppa
Bug 955945 - Implement age verification screens for FxA Signup. r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/6c4a067d7285
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 955945 - Implement age verification screens for FxA Signup. r=alive
2014-03-07 00:40:23 -08:00
B2G Bumper Bot
37b135045c
Bumping manifests a=b2g-bump
2014-03-07 00:23:12 -08:00
B2G Bumper Bot
4a92de1436
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/dbcdbc8d9466
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #16970 from 6a68/bug-980608-fxa-test-client-autocorrect
Bug 980608 - Disable autocorrect in fxa-test-client r=ferjm
========
https://hg.mozilla.org/integration/gaia-central/rev/98ee1f81378b
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 980608 - Disable autocorrect in fxa-test-client r=ferjm
2014-03-07 00:15:30 -08:00
B2G Bumper Bot
ff6bada21f
Bumping manifests a=b2g-bump
2014-03-06 23:51:42 -08:00
B2G Bumper Bot
b77a8bae9b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b65a276cf3f2
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #16906 from crdlc/bug-970818
Bug 970818 - [Downloads Manager] Any message appears when the SD card is...
========
https://hg.mozilla.org/integration/gaia-central/rev/e502b8a717e1
Author: crdlc <crdlc@tid.es>
Desc: Bug 970818 - [Downloads Manager] Any message appears when the SD card is full
2014-03-06 23:50:23 -08:00
Andy Wingo
7e4993372d
Bug 980263 - Part 2: Avoid phi creation for values on stack at loops r=jandem
2014-03-07 08:44:41 +01:00
Andy Wingo
9361ddfd81
Bug 980263 - Part 1: Disable Ion OSR for loops nested in expressions r=jandem
2014-03-07 08:44:38 +01:00
Marco Bonardo
e3c76b6b27
Bug 967192 - Bookmarks restore and import should use OS.File - tests changes. r=mano
2014-03-07 08:41:50 +01:00
Marco Bonardo
71d5bb404a
Bug 967192 - Bookmarks restore and import should use OS.File. r=mano
2014-03-07 08:41:47 +01:00
B2G Bumper Bot
28345fa853
Bumping manifests a=b2g-bump
2014-03-06 22:26:19 -08:00
B2G Bumper Bot
69c7e42026
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/09b82983a3cb
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #16785 from EragonJ/bug-975760
Bug 975760 - [DSDS] the default SIM for Data is not remembered between r...
========
https://hg.mozilla.org/integration/gaia-central/rev/530515efae02
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 975760 - [DSDS] the default SIM for Data is not remembered between reboots
2014-03-06 22:20:22 -08:00
L. David Baron
5edf98e9eb
Bug 978712 - Prevent non-running transitions and animations (animations or transitions during their delay period, and animations after they finish) from repeatedly poking layer activity because we think we can run them on the compositor. r=heycam
...
This changes the behavior of the CanPerformOnCompositorThread methods of
both ElementAnimations and ElementTransitions to check that the
respective animations or transitions are actually running. This is ok
because:
- The main caller is nsLayoutUtils::HasAnimationsForCompositor, and all
of its callers pretty clearly want the more restricted behavior (they're
concerned with layer activity)
- The only other callers of these functions are
nsAnimationManager::FlushAnimations and
nsTransitionManager::FlushTransitions (determining when to do
throttling), nsAnimationManager::GetAnimationsForCompositor (whose
only caller,
nsDisplayListBuilder::AddAnimationsAndTransitionsToLayer, also checks
IsRunningAt). I think these also all want or are fine with having
the IsRunningAt check.
As to the actual changes:
- In the animation manager, I think it's a mistake that
ElementAnimation::IsRunningAt didn't already check
mIterationDuration, since we throw out animations with a bad
iteration-duration in ElementAnimations::EnsureStyleRuleFor. So this
makes that change as well.
- In the transition manager, IsRunningAt already checks
!IsRemovedSentinel().
I've confirmed in gdb on a device that this fixes the repeated
nsIFrame::SchedulePaint calls that were the symptom of this bug.
I believe this patch also makes it so that a short animation of a
property that can't be animated on the compositor doesn't prevent the
entire duration of the animation of a property that can from being
throttled (having the main thread style updates suppressed).
2014-03-06 22:08:57 -08:00
L. David Baron
359a10be0c
Bug 979748 - Simplify code based on already having checked the NS_FRAME_OUT_OF_FLOW bit. r=heycam
...
Since we've already returned if the NS_FRAME_OUT_OF_FLOW bit is not set,
and since FirstInFlow() is the same as this when GetPrevInFlow() is
null, this is a straightforward simplification of the code and should
not change behavior.
2014-03-06 22:08:57 -08:00
L. David Baron
bfbcf864da
Bug 979760 - Pull out a BeginTransaction call common to the start of all three branches of if/else logic. r=mattwoodrow
...
I don't see any particular reason for them to logically be in each
branch, and it seems the code was originally written with the
BeginTransaction in one place, but later had to be refactored into its
current form.
Note that this separates the comment from one of the EndEmptyTransaction
calls below it, but the comment was actually associated primarily with
the further EndEmptyTransaction call, and with the if above it, based on
the history pointing to
https://hg.mozilla.org/mozilla-central/rev/b4e9a17e7fe2
2014-03-06 22:08:57 -08:00
Mike Habicher
0c41a3a68c
Bug 980484 - make the zoom setting more robust, r=dhylands
2014-03-07 01:07:27 -05:00
Mike Habicher
bd1cc81444
Bug 965425 - expose ISO setting, r=dhylands,jst
2014-03-07 01:00:43 -05:00
B2G Bumper Bot
02b404787d
Bumping manifests a=b2g-bump
2014-03-06 21:56:38 -08:00
B2G Bumper Bot
dd85f3146b
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/09e4745e3b60
Author: Askeing Yen (fyen) <askeing@gmail.com>
Desc: Merge pull request #16162 from echangmoz/master
DS support in Settings -> data & cell; Settings -> SIM manager
========
https://hg.mozilla.org/integration/gaia-central/rev/2255ec675cb1
Author: Eric Chang <echang@mozilla.com>
Desc: Bug 972695 - [dsds] support Sim Manager in Settings on dsds phones
========
https://hg.mozilla.org/integration/gaia-central/rev/de10423400e1
Author: Eric Chang <echang@mozilla.com>
Desc: Bug 972695 - [dsds] support Sim Manager in Settings on dsds phone
2014-03-06 21:55:22 -08:00
Phil Ringnalda
5319ebeaed
Back out 965fe5b195ab (bug 962670) for leaking
2014-03-06 20:36:28 -08:00
Andrew McCreight
4b652ed544
Bug 979993 - Free the old input data in SetValueInternal. r=bz
2014-03-06 20:27:52 -08:00
Gijs Kruitbosch
6b86dcbe64
Bug 970404 - don't let users affect document colors for chrome images, r=bz
2014-03-06 23:02:59 -05:00
Joel Maher
6ad5bcf52e
Bug 979446 - disable dom/downloads tests on B2G. r=RyanVM
2014-03-07 09:32:21 -05:00
Simone Carletti
9d44eab62b
Bug 980844 - Add mp.br to PSL. r=gerv
2014-03-07 09:08:03 -05:00
Jed Davis
9d5e6f96b6
Bug 979590 - Enable MOZ_CONTENT_SANDBOX_REPORTER by default. r=kang
2014-03-07 09:08:00 -05:00
Karl Dubost
1720b7472b
Bug 978658 - Remove UA override for domains with lower rank. r=lmandel
2014-03-07 09:06:31 -05:00
Simone Carletti
7b5f1af251
Bug 980841 - Add desa.id to PSL. r=gerv
2014-03-07 09:00:53 -05:00
Simone Carletti
e0d4bb0792
Bug 980837 - Remove trailing spaces from PSL. r=gerv
2014-03-07 09:00:52 -05:00
Rik Cabanier
80e9bf65b1
Bug 979995 - Fix reference to non-existing element and re-enable test. r=surkov
2014-03-07 09:00:52 -05:00
B2G Bumper Bot
d032921b50
Bumping manifests a=b2g-bump
2014-03-06 19:31:25 -08:00
B2G Bumper Bot
ce0bb70558
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/002f334d7698
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #16973 from KevinGrandon/bug_980653_email_dialog_header_line_height
Bug 980653 - Layout issues in email recipient action menu
========
https://hg.mozilla.org/integration/gaia-central/rev/dd29af39d721
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 980653 - Layout issues in email recipient action menu r=asuth
2014-03-06 19:25:26 -08:00
Matt Woodrow
e1320c476a
Bug 974197 - Fire MozAfterPaint after the compositor has composited the frame. r=roc
2014-03-07 16:24:32 +13:00
Mark Capella
c8947c7243
Bug 978731 - Cursor position jumps around, dragging handles moves text, r=wesj
2014-03-06 22:14:22 -05:00
Bill McCloskey
09e1cf2ed6
Bug 980558 - Enable extraWarnings on safe JS context (r=bholley)
2014-03-06 18:48:16 -08:00
Wes Kocher
b5aceae5af
Backed out changeset 263b6c86c1be (bug 980558) for build bustage on a CLOSED TREE
2014-03-06 18:43:26 -08:00
Wes Kocher
de6e042169
Merge m-c to fx-team
2014-03-06 18:30:19 -08:00
Wes Kocher
12c685d1bd
Merge changes
2014-03-06 18:28:21 -08:00
Masayuki Nakano
e26150301a
Bug 962140 Collect more details of the queue status when we removed unexpected char message from the queue r=jimm
2014-03-07 11:27:49 +09:00
Wes Kocher
8f82874c66
Merge m-c to inbound
2014-03-06 18:27:43 -08:00
Bill McCloskey
4b67940dca
Bug 980558 - Enable extraWarnings on safe JS context (r=bholley)
2014-03-06 18:26:33 -08:00