Commit Graph

176614 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
f5443911b3 merge b2g-inbound to mozilla-central 2014-04-03 12:48:14 +02:00
Carsten "Tomcat" Book
70292f3a24 merge fx-team to mozilla-central 2014-04-03 12:46:58 +02:00
Carsten "Tomcat" Book
85c25341ba merge mozilla-inbound to mozilla-central 2014-04-03 12:45:02 +02:00
Phil Ringnalda
090ed1b84f Back out 81dd398600c4 (bug 850336) for linux bc2 leaks-until-shutdown 2014-04-02 23:17:37 -07:00
B2G Bumper Bot
7546f38c68 Bumping manifests a=b2g-bump 2014-04-02 23:06:18 -07:00
Cameron McCormack
290e93fc7d Bug 957833 - Enable CSS Variables by default in release builds. r=dbaron 2014-04-03 17:05:28 +11:00
Nicolas Silva
9e32afc054 Bug 989904 - Remove the remaining deprecated textures code. r=mattwoodrow 2014-04-03 14:04:04 +08:00
B2G Bumper Bot
032fbfb192 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ee69e9abde3e
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #17930 from davidflanagan/bug990630

Bug 990630: extract the EXIF preview metadata that media frame needs r=jdarcangelo

========

https://hg.mozilla.org/integration/gaia-central/rev/d24179d3a963
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 990630: extract the EXIF preview metadata that media frame needs

don't parse EXIF again when creating thumbnail

Diego's README changes

update tests
2014-04-02 23:01:11 -07:00
Brian Birtles
917d2e24b6 Bug 880596 part 9 - Fix comment about mFlushCount; r=dbaron
Two comments in AnimationCommon.h refer to 'mFlushCount' which was presumably
the old name for mAnimationGeneration. Also, one comment says
nsCSSFrameConstructor tracks this. This patch adjusts the comments to refer
to mAnimationGeneration and RestyleManager.

(The reference to nsTransitionManager::UpdateAllThrottleStyles() is still valid
since there is useful documentation accompanying that method despite the fact
that the relevant code is mostly contained in AnimationCommon.h since bug
914847. Eventually we will unify the structures of transitions and
animations to the the point that we can replace the
IMPL_UPDATE_ALL_THROTTLED_STYLES_INTERNAL macro in AnimationCommon.h with an
actual method. At that point we can move the documentation accompanying
nsTransitionManager::UpdateAllThrottleStyles and its references to
AnimationCommon.)
2014-04-03 14:57:28 +09:00
Brian Birtles
ae6e60dda5 Bug 880596 part 8 - Rename ElementAnimation to StyleAnimation; r=dbaron
We need a basic representation of animations from which we can derive subclasses
to represent specific cases such as transitions. For now we will retrofit
ElementAnimation for that purpose hence renaming it to StyleAnimation.

This patch removes the "using namespace mozilla::layers" line from
AnimationCommon.cpp since the unified build system concatenates several files
together before compiling making using declarations like this leak into other
files potentially creating ambiguities. Previously, when we were calling
ElementAnimation, 'Animation', there were ambiguities between
mozilla::layers::Animation and this new 'Animation' class. In general, it is
probably a good idea to limit the scope of these using declarations so I've kept
that change.
2014-04-03 14:57:28 +09:00
Brian Birtles
095840cb6d Bug 880596 part 7 - Move ElementAnimation to AnimationCommon; r=dbaron
This patch relocates ElementAnimation from nsAnimationManager.{h,cpp} to
AnimationCommon.{h,cpp} and in the process moves it into the mozilla::css
namespace.
2014-04-03 14:57:28 +09:00
Brian Birtles
c4ffbc205d Bug 880596 part 6 - Factor out common method for adding animations and transitions to a layer; r=dbaron
The loops for adding animations and transitions to a layer in
nsDisplayList::AddAnimationsAndTransitionsToLayer are now identical and so can
be factored out into a common method.

Since it is not possible to implicitly convert from
nsTArray<ElementPropertyTransition> to nsTArray<ElementAnimation> despite
ElementPropertyTransition being a subclass of ElementAnimation a templated
method is used. In the future, as animations and transitions share more and more
code, we should be able to remove the need for templates.
2014-04-03 14:57:28 +09:00
Brian Birtles
e4bdcd3cfb Bug 880596 part 5 - Make ElementAnimation::HasAnimationOfProperty no longer virtual; r=dbaron
ElementAnimation::HasAnimationOfProperty doesn't seem to be overridden anywhere.
I suspect it was a copy-paste mistake because the methods of the same name on
ElementAnimations, ElementTransitions, and CommonElementAnimationData are
virtual.
2014-04-03 14:57:28 +09:00
Brian Birtles
217cb32ecc Bug 880596 part 4 - Reuse ElementAnimation::HasAnimationOfProperty; r=dbaron
Now that ElementTransitionProperty inherits from ElementAnimation,
ElementTransitions::HasAnimationOfProperty can re-use
ElementAnimation::HasAnimationOfProperty in its definition of
ElementTransitions::HasAnimationOfProperty.

Similarly, in nsDisplayList::AddAnimationsAndTransitionsToLayer we can use this
method rather than drilling down to the appropriate segment by hand.
2014-04-03 14:57:27 +09:00
Brian Birtles
e503422f93 Bug 880596 part 3 - Remove ElementPropertyTransition::IsRunningAt and mIsRunningOnCompositor; r=dbaron
Both ElementPropertyTransition and ElementAnimation specify an IsRunningAt
method which have the same purpose but with two subtle differences:

a) ElementPropertyTransition::IsRunningAt checks if the transition is a removed
sentinel and if so returns false. This patch adds a check for a null start time
to IsRunningAt since I think in future we will want to allow null times in
various places to represent, for example, animations that are not connected to
a timeline. (However, ultimately we will probably not allow start times on
*animations* to be null, only on their associated player.)

Should we later use a different mechanism for marking sentinel transitions (e.g.
a boolean flag) this method should still be correct as it checks if aTime is
inside the transition interval before returning true.

b) ElementPropertyTransition::IsRunningAt returns false if the transition is in
the delay phase, that is, waiting to start. This patch changes this behavior so
that transitions are considered running even if they are in the delay phase.
This brings their behavior into line with animations and removes the need for
the ElementPropertyTransition::mIsRunningOnCompositor since it is only used to
determine when a transition in the delay phase has begun.

ElementAnimation::IsRunningAt also handles pause state and iterations but this
logic should still be correct for transitions which, in this area, only use
a subset of the functionality of animations since their pause state is always
playing and their iteration count is 1.
2014-04-03 14:57:27 +09:00
Brian Birtles
5e2f8ede42 Bug 880596 part 2 - Make ElementPropertyTransition inherit from ElementAnimation; r=dbaron
As part of moving towards more shared data structures for animation, this patch
makes ElementPropertyTransition inherit from ElementAnimation. At the same time
we switch from storing the target property, start/end values, start time, delay,
and timing function on the transition to the corresponding location in
ElementAnimation.

Since nsDisplayList::AddAnimationsAndTransitionsToLayer was already doing this
conversion in order to create animations to pass to the compositor thread, we
can remove the conversion code from there and just use the ElementAnimation data
structures as-is.

A number of assertions are added to verify that transitions are set up as
expected (namely, they have only a single property-animation with a single
segment). As we move to more generic handling of animations and transitions
these assertions should disappear.
2014-04-03 14:57:27 +09:00
Brian Birtles
19e2304b94 Bug 880596 part 1 - Separate delay from start time for transitions; r=dbaron
As a first step towards making CSS animations and CSS transitions use the same
data structures, this patch aligns their behavior with regards to start time and
delay handling.

Previously, ElementAnimation objects maintained separate mStartTime and mDelay
members whilst ElementPropertyTransition objects maintained a single mStartTime
property that incorporated the delay. This patch adds an mDelay member to
ElementPropertyTransition and stores the delay and start time separately.
Calculations involving ElementPropertyTransition::mStartTime are adjusted to
incorporate mDelay.
2014-04-03 14:57:27 +09:00
L. David Baron
4d2197bf3c Bug 975397 - Call TrackImage when constructing a new nsStyleBorder. r=heycam
I confirmed that the crashtest crashes in the harness without the patch.

--HG--
rename : layout/reftests/backgrounds/blue-32x32.png => layout/style/crashtests/blue-32x32.png
2014-04-02 22:56:19 -07:00
Phil Ringnalda
4625abfb46 Merge m-c to b-i 2014-04-02 21:26:24 -07:00
Phil Ringnalda
8affba3c3b Merge m-c to f-t 2014-04-02 21:25:05 -07:00
B2G Bumper Bot
6d45558474 Bumping manifests a=b2g-bump 2014-04-02 21:06:10 -07:00
B2G Bumper Bot
4df1ef900f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e6c4a9eb4ba5
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17683 from gasolin/issue--971538

Bug 971538 - [System2] Instantiable PermissionManager, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/2d960ba50df5
Author: gasolin <gasolin@gmail.com>
Desc: Bug 971538 - [System2] Instantiable PermissionManager

- rename currentPermission to permissionType
2014-04-02 21:01:08 -07:00
B2G Bumper Bot
5c2da68bf5 Bumping manifests a=b2g-bump 2014-04-02 20:08:22 -07:00
B2G Bumper Bot
68b422baea Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2f5576bf01a6
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #17092 from hfiguiere/bug980972

Bug 980972 - assert if we actually timeout. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/413d2958dbe0
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 980972 - Report a ScriptTimeout the error and have the test deal with it. r=julienw
2014-04-02 20:08:11 -07:00
Wes Kocher
a13adb397a Merge m-c to b2g-inbound 2014-04-02 19:55:38 -07:00
B2G Bumper Bot
94350376c0 Bumping manifests a=b2g-bump 2014-04-02 19:46:03 -07:00
B2G Bumper Bot
be7edbe357 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e2352010e271
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #17926 from justindarc/bug987609

Bug 987609 - [Camera][Madai][UX] Gallery/preview Image number should be ...

========

https://hg.mozilla.org/integration/gaia-central/rev/a26aeba93555
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 987609 - [Camera][Madai][UX] Gallery/preview Image number should be visible when swiping
2014-04-02 19:41:12 -07:00
Seth Fowler
c849c6ff88 Bug 967985 - Don't retarget OnDataAvailable when not storing source data. r=tn
--HG--
extra : rebase_source : d3048bf3d949650f01ae97786cb5ca2d54aa3087
2014-04-02 19:20:25 -07:00
Daniel Holbert
cb44c1df9a Bug 991407: Remove unused class gfxFontNameList. r=jdaggett 2014-04-02 21:37:37 -07:00
Masayuki Nakano
852403f45d Bug 990855 part.2 Remove dom/events from local includes of moz.build files r=smaug 2014-04-03 13:18:38 +09:00
Masayuki Nakano
b6e410dfc1 Bug 990855 part.1 Export TextComposition.h as mozilla/TextComposition.h r=smaug 2014-04-03 13:18:37 +09:00
Masayuki Nakano
e431113dee Bug 989214 Rename nsPaintRequest to mozilla::dom::PaintRequest r=smaug
--HG--
rename : dom/events/nsPaintRequest.cpp => dom/events/PaintRequest.cpp
rename : dom/events/nsPaintRequest.h => dom/events/PaintRequest.h
2014-04-03 13:18:37 +09:00
Masayuki Nakano
5c4524957a Bug 989212 Rename nsEventStates to mozilla::EventStates r=smaug
--HG--
rename : dom/events/nsEventStates.h => dom/events/EventStates.h
2014-04-03 13:18:36 +09:00
John Daggett
4c46bd8cd9 Bug 975460 - remove use of CGCopyFontTable in async font loader which didn't solve the crash problem on 10.6. r=smichaud,mkato 2014-04-03 13:13:14 +09:00
John Daggett
4aaab3c453 Bug 975460 - disable async font loader on OSX 10.6. r=smichaud,mkato 2014-04-03 13:13:11 +09:00
Wes Kocher
af719fd52b Merge m-c to inbound on a CLOSED TREE 2014-04-02 19:54:15 -07:00
Wes Kocher
ac5de79fba Merge b2g-inbound to m-c 2014-04-02 19:06:17 -07:00
Wes Kocher
6ea54b24b3 Merge inbound to m-c 2014-04-02 18:56:43 -07:00
Wes Kocher
b626270dcd Backed out 3 changesets (bug 977126) for b2g build bustage on a CLOSED TREE
Backed out changeset 88a167e0ca30 (bug 977126)
Backed out changeset a3df7451c35c (bug 977126)
Backed out changeset bab702b3df10 (bug 977126)
2014-04-02 18:34:20 -07:00
Michael Wu
f7b1f52134 Bug 985017 - [2/2] Cache a gfxImageSurface for the drawing path, r=seth 2014-04-02 21:32:54 -04:00
Michael Wu
c62e4a0856 Bug 985017 - [1/2] Support null VolatileBufferPtrs, r=glandium 2014-04-02 21:32:54 -04:00
B2G Bumper Bot
56918a3d5b Bumping manifests a=b2g-bump 2014-04-02 18:27:40 -07:00
B2G Bumper Bot
6f221f8477 Bumping gaia.json for 10 gaia revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/7dbabbc473f4
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #17841 from snowmantw/issue972791-nfc-background-missing

Bug 972791 - [NFC] landscape NFC shrinking UI background has some issue

========

https://hg.mozilla.org/integration/gaia-central/rev/1e1efe180584
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 972791 - [NFC] landscape NFC shrinking UI background has some issue

========

https://hg.mozilla.org/integration/gaia-central/rev/15d4ace57db6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17662 from KevinGrandon/bug_984113_shared_integration_jshint

Bug 984113 - JSHint fixes for shared/test/integration/

========

https://hg.mozilla.org/integration/gaia-central/rev/9625b7e76102
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 984113 - JSHint fixes for shared/test/integration/ r=julienw,djf

========

https://hg.mozilla.org/integration/gaia-central/rev/d4372fa08c3e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17866 from KevinGrandon/bug_970688_settings_deviceid

Bug 970688 - Use mozSettings for Web Results deviceId parameter

========

https://hg.mozilla.org/integration/gaia-central/rev/1403385f78c4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 970688 - Use mozSettings for Web Results deviceId parameter r=amirn

========

https://hg.mozilla.org/integration/gaia-central/rev/79364ddd5f2a
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #17929 from asutherland/email-html-search-fix

Bug 882917 - [email] "Body" search of HTML messages regressed by worker thread migration. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/7a94849e6860
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 882917 - [email] "Body" search of HTML messages regressed by worker thread migration. r=mcav

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/297

========

https://hg.mozilla.org/integration/gaia-central/rev/94e957b116d0
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #17927 from asutherland/email-search-updates

Bug 838843 - [email] email search does not update as headers are modified or deleted, allows user to still see and fail to display deleted messages. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/031ef2424954
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 838843 - [email] email search does not update as headers are modified or deleted, allows user to still see and fail to display deleted messages. r=mcav

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/296
2014-04-02 18:26:13 -07:00
B2G Bumper Bot
0dcedbf60b Bumping manifests a=b2g-bump 2014-04-02 15:11:12 -07:00
B2G Bumper Bot
3dca205253 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/98fd9bf9c257
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #17918 from dmarcos/bug988632

Bug 988632 - [Camera][Madai] More frequent instances of "Picture not sav...

========

https://hg.mozilla.org/integration/gaia-central/rev/964de2213053
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 988632 - [Camera][Madai] More frequent instances of "Picture not saved" when tapping shutter button
2014-04-02 15:06:09 -07:00
B2G Bumper Bot
115efa9bb9 Bumping manifests a=b2g-bump 2014-04-02 14:56:17 -07:00
B2G Bumper Bot
77107b217b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f638a583d026
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17894 from wilsonpage/bug/987071

Bug 987071 - [Camera] The screen doesn't going to sleep in the preview gallery

========

https://hg.mozilla.org/integration/gaia-central/rev/46b68f91d013
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 987071 - [Camera] The screen doesn't going to sleep in the preview gallery
2014-04-02 14:51:05 -07:00
B2G Bumper Bot
dc637881ec Bumping manifests a=b2g-bump 2014-04-02 14:46:19 -07:00
B2G Bumper Bot
4a1dc35dab Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c0bfdc67ba2e
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17899 from rnowm/990960

Bug 990960 - [Browser] [regression] selected tab has blue border r=bfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/c0c0677cb95b
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 990960 - [Browser] [regression] selected tab has blue border
2014-04-02 14:41:09 -07:00
Randell Jesup
3c5f8d49a1 Backed out 965c62289427:cb894b5d342f for perma-orange on b2g emulator M10 r=backout 2014-04-02 17:11:12 -04:00