Commit Graph

5261 Commits

Author SHA1 Message Date
James Willcox
e9da75e581 Back out bug 1097116 2014-11-21 09:47:03 -06:00
James Willcox
7d1813c44b Bug 1097116 - Fix readback for EGLImageImage r=jgilbert 2014-11-21 09:28:21 -06:00
James Willcox
76052a1209 Bug 1097116 - Copy the decoded SurfaceTexture into an EGLImage to allow accurate presentation r=jgilbert 2014-11-21 09:28:20 -06:00
James Willcox
45a7d7ad68 Bug 1097116 - Add fencing and better lifetime management for EGLImage Images r=jgilbert 2014-11-21 09:28:19 -06:00
Boris Chiou
4b888d9c25 Bug 1096139 - Create websocket dynamically after we enable Layerscope. r=dglastonbury
We have to create the websocket if it doesn't exist after enabling
Layerscope. Therefore, we don't have to reboot the device anymore.

1. Remove the Init and DeInit in CreateCompositor and DestroyCompositor
   to prevent some unwanted deInits on the browser. (Our browser often
   calls DestroyCompositor)
2. Initize websocket only when we need it.
2014-11-20 02:00:00 +01:00
Milan Sreckovic
c64009526e Bug 1097655 - Guard against invalid shadow manager. r=sotaro 2014-11-19 15:22:03 -05:00
Wes Kocher
898d3ed7b8 Merge fx-team to m-c a=merge 2014-11-20 17:55:52 -08:00
Benoit Girard
0d3235245b Bug 1098495 - Part 2: Run the layer tree invalidation code on windows. r=mstange ON A CLOSED TREE
--HG--
extra : rebase_source : 1e98356dabedb557ad786dbd49679206e24cf09e
2014-11-20 15:10:18 -05:00
Benoit Girard
7db266a8bc Bug 1098495 - Retain a container's intermediate surface's content. r=mattwoodrow
--HG--
extra : rebase_source : cdb691c1127445eeeb2e4fda5a0ef4f2223703fc
2014-11-18 17:33:36 -05:00
Nicolas Silva
9cc5370293 Bug 1101552 - Remove the double-buffered ImageClient. r=sotaro 2014-11-20 19:49:51 +01:00
Nicolas Silva
096edd5eaf Bug 1086670 - Add some gfxCriticalError logs around DrawTarget creation. r=Bas 2014-11-20 15:48:07 +01:00
Carsten "Tomcat" Book
89e7e647c2 Merge mozilla-central to fx-team 2014-11-20 12:22:05 +01:00
David Anderson
b2e46c1fab Add inactive subframes to the dispatch-to-content region. (bug 1082594, r=tn,kats) 2014-11-19 20:24:15 -08:00
Kearwood (Kip) Gilbert
118a58666e Bug 1086723 - Enable asynchronous update of mask layer transforms. r=kats
- Layer::ComputeEffectiveTransformForMaskLayer now computes a delta transform
  for the mask layer's effective transform using the masked layer's shadow
  transform and base transform.  This delta is applied to the effective
  transform of the mask layer, with the same effect as if it were also
  transformed by the APZ.
2014-11-14 15:33:00 +01:00
Benoit Girard
345e116691 Bug 1087530 - Part 2: Set OGL Scissor during mClearOnBind. r=jmuizel 2014-11-19 15:30:25 -05:00
Benoit Girard
a52fc33128 Bug 1101650 - Fix mClearOnBind logic. r=jmuizel 2014-11-19 15:29:23 -05:00
Kartikaya Gupta
53936f3254 Bug 1100140 - When a scrollable layer is marked as fixed-position, don't treat it as fixed relative to itself. r=botond 2014-11-19 13:41:48 -05:00
Milan Sreckovic
1ba7431253 Bug 1095925: Propagate the error up the chain. r=jmuizelaar 2014-11-14 16:11:02 -05:00
Milan Sreckovic
79fb503b37 Bug 1074952 - Part 6. Fully qualify the appropriate logs in the logging macros, otherwise we can't call these from other namespaces. An example in non-gfx/2d where it would not have worked without this change. r=botond 2014-11-18 10:51:39 -05:00
Jeff Muizelaar
ad57218e47 Bug 1101160. D3D11: Make switch statement better. r=bas
This is the order one would expect.

--HG--
extra : rebase_source : 299b3814983d42908c2507028bb1c16c64b0f25f
2014-11-18 15:49:39 -05:00
Markus Stange
fee32b29b7 Bug 1097776 - Don't leak the SkBitmapDevice. r=jrmuizel 2014-11-18 17:22:01 -05:00
Markus Stange
4bfc882827 Bug 1097776 - Use Skia for unaccelerated rendering of 3D transforms. r=jrmuizel 2014-11-18 17:21:45 -05:00
Mason Chang
e356eb5ca2 Bug 552020. Part 2. Enable Vsync Profiler Markers across platforms. r=benwa 2014-11-18 13:28:42 -08:00
Wes Kocher
1270a44f4d Backed out changeset 0092a5e1467d (bug 1097776) for reftest failures and leaks 2014-11-18 11:00:08 -08:00
Markus Stange
0882643bae Bug 1097776 - Use Skia for unaccelerated rendering of 3D transforms. r=jrmuizel 2014-11-18 11:36:17 -05:00
Benoit Girard
a50adb60a6 Bug 1087530 - Retain container's intermediate surfaces for up to one frame. r=jmuizelaar 2014-11-03 17:27:32 -05:00
Jeff Muizelaar
f7a15a92d7 Bug 1073036. Fix an assertion string that I forgot about.
--HG--
extra : rebase_source : 9c52d35673e7a28d2c982a070e28b18792cc1a98
2014-11-18 10:33:36 -05:00
Jeff Muizelaar
4b0029fdf7 Bug 1073036. layers: Track program state more carefully to avoid setting unnecessarily. r=nical
This introduces some infrastructure to start tracking the program state more carefully. Currently
it only tracks the program because UseProgram was showing up the most in profiles, but more
state could also be added as needed.

--HG--
extra : rebase_source : 289ab867ef63032f7604a6cbe6d0230fd0a9411a
2014-11-10 14:34:06 -05:00
David Anderson
ec1f0caf28 Add APZ handling for desktop scroll wheel events. (bug 1086162 part 1, r=kats) 2014-11-17 20:56:18 -08:00
Botond Ballo
2bc3fddde6 Bug 1093298 - Ignore calls to AsyncPanZoomAnimation::Sample() with a negative time duration. r=kats 2014-11-17 13:18:16 -05:00
Jeff Muizelaar
6514be6291 Bug 1088414. Backout "Use a single synchronized texture for d3d11"
https://hg.mozilla.org/mozilla-central/rev/e2efedec2d60
2014-11-17 14:20:05 -05:00
Nicolas Silva
df35228518 Bug 1098000 - Track the number of compositable references to TextureHost and only unbind gralloc textures after the last ref goes away. r=sotaro 2014-11-17 11:06:25 +01:00
David Anderson
bebf0f726f Don't overscroll during a fling unless overscrolling is enabled. (bug 1099442, r=botond) 2014-11-14 16:19:00 -08:00
Matt Woodrow
a543eacc24 Bug 1088414. Use a single synchronized texture for d3d11. r=bas,f=jrmuizel
Calling AcquireSync on textures created with
D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX appears to be really slow, this really
bites us with the number of textures involved when tiling.

I've also tested using ID3D11Query to check when work is completed, this also
appears to be pretty slow.

This instead just uses a single texture with a keyedmutex, and makes sure we
draw to it last and lock it first. It's pretty hacky, but seems to work really
well so far.

--HG--
extra : rebase_source : bf5f56751f993e507fcd1e5c386fb1fc9a3f73af
2014-10-22 15:37:00 +13:00
Ryan VanderMeulen
57225618ce Backed out changesets a99bd0b3b075, a7fb851f823a, and 9fc2d99376cd (bug 552020) for non-unified bustage and OSX 10.6 tsvgr crashes.
CLOSED TREE
2014-11-14 15:57:35 -05:00
Mason Chang
a2d6748143 Bug 552020. Part 2. Enable Vsync Profiler Markers across platforms. r=benwa 2014-11-14 08:31:04 -08:00
Kartikaya Gupta
2d6a90bc16 Bug 1090398 - Require APZC target confirmation before input blocks are ready for handling. r=botond
For proper hit-testing we need to deal with situations where the initial touch
input falls on a dispatch-to-content region of an APZC, and the main thread
later tells us that it actually hit another APZC. This patch allows input blocks
to have an "unconfirmed" APZC target for the initially-found target that can
then be replaced with a different target. Input blocks without a confirmed
target are not ready for processing.
2014-11-14 07:40:15 -05:00
Kartikaya Gupta
c863f93511 Bug 1090398 - Distinguish the various outcomes of APZ hit testing more explicitly. r=botond
Previously we output of APZ hit testing was an APZC instance and an "in
overscroll" flag. Now we need to also distinguish between the hit region and the
dispatch-to-content region for an APZC, so this patch introduces an enum that
makes this more explicit.
2014-11-14 07:40:15 -05:00
Kartikaya Gupta
f04a46f6fa Bug 1090398 - Workaround for scrollinfo layers not yet having event regions set up correctly. r=botond
Until bug 1082594 is fixed, the area occupied by inactive scrollable subframes
don't get added to their layer's dispatch-to-content region. Therefore the APZ
code doesn't know what area corresponds to the subframe, even though it knows
there is a subframe because of the scrollinfo layer. This change inserts a small
workaround to deal with the scrollinfo layers specially, so that the composition
bounds from the scrollinfo layer is used to obtain the area. Once bug 1082594
is fixed this can probably be removed.
2014-11-14 07:40:15 -05:00
Kartikaya Gupta
ef3e0582eb Bug 1090398 - Small refactoring that adds ParentLayerPixel::ToUntyped. r=botond 2014-11-14 07:40:14 -05:00
Kartikaya Gupta
394a46d78d Bug 1090398 - Add support for using the layer event regions for hit testing. r=botond
When the event-regions are provided by layout, use them to populate the APZ-side
hit testing regions. The existing code is still used when event-regions are not
provided by layout.
2014-11-14 07:40:14 -05:00
Kartikaya Gupta
6a591da0b8 Bug 1090398 - Use EventRegions objects instead of nsIntRegions for tracking APZ hit-test areas. r=botond
This simply swaps out the existing nsIntRegion used in APZ hit-testing for
an EventRegion object. The dispatch-to-content region inside the EventRegions
is kept empty, and there are no functional changes here.
2014-11-14 07:40:14 -05:00
Carsten "Tomcat" Book
0627ebf5ec Backed out changeset 80f873bf8adc (bug 1036682) for test bustage 2014-11-14 12:32:47 +01:00
Nicolas Silva
6322eded61 Bug 1036682 - Check that the ipdl connection is not lost before sending messages. r=bjacob 2014-11-14 11:25:16 +01:00
Carsten "Tomcat" Book
9a3e3d4bb8 Backed out changeset 48667a14f94d (bug 1092360) for test bustage / crashes on a CLOSED TREE 2014-11-14 08:14:22 +01:00
Benoit Girard
c0cfe730fd Bug 1092360 - Avoid redundant framebuffer switches. r=jrmuizel 2014-11-12 17:39:17 -05:00
Matt Woodrow
1cf5fa276f Bug 1097441 - Followup bustage fix on a CLOSED TREE 2014-11-14 17:30:02 +13:00
Matt Woodrow
b3a148dcdd Bug 1097441 - Initialize mSize on BufferTextureHost. r=nical 2014-11-13 10:44:42 +13:00
Nicholas Nethercote
bdbe90d931 Bug 1098185 - Initialize some more fields in ShadowLayerForwarder when Valgrind is enabled. r=mattwoodrow.
--HG--
extra : rebase_source : 0063948d7a657421005535c8faad68e69b1a5fcf
2014-11-13 01:15:25 -08:00
Jeff Muizelaar
3b935d0a21 Bug 1089364. Avoid trying to resize the swap chain to a negative size. r=bas
This was causing GetBuffer to return DXGI_ERROR_INVALID_CALL

--HG--
extra : rebase_source : 49e62fd5dda1e28268218cffca4ea1ce7af1b6ea
2014-11-13 10:10:48 -05:00
Jeff Muizelaar
ae06ab96a4 Bug 1097877. Move GLBlitTextureImageHelper from gfx/gl to gfx/layers/opengl. r=nical
The only user is in layers/opengl. This is needed to do better state tracking
in the compositor.

--HG--
rename : gfx/gl/GLBlitTextureImageHelper.cpp => gfx/layers/opengl/GLBlitTextureImageHelper.cpp
rename : gfx/gl/GLBlitTextureImageHelper.h => gfx/layers/opengl/GLBlitTextureImageHelper.h
extra : rebase_source : bba00cbfac9253ca933721659dadbda2bfbe65c5
2014-11-10 14:49:05 -05:00
James Willcox
a11a769191 Bug 1086693 - Part 6: Use generated bindings for AndroidMediaCodec and AndroidSurfaceTexture r=blassey,gcp 2014-11-13 12:47:24 -06:00
Benoit Girard
48140f14fe Bug 1094442 - Part 2: Adjust tile size to the stride of the gralloc buffers. r=kats
--HG--
extra : rebase_source : d3386ee007d6429b81aa6d3ffe6c518fb67c7d6a
2014-11-12 17:55:13 -05:00
Benoit Girard
8a1c4934f8 Bug 1094442 - Part 1: Refactor how tile w/h is queried r=kats
--HG--
extra : rebase_source : 70ef00318a718e2ce3149955d2908615d6125cf3
2014-11-12 17:54:29 -05:00
Sotaro Ikeda
4a33624da4 Bug 1091777 - Add TextureClient recycling to CairoImag r=nical 2014-11-13 07:53:49 -08:00
Botond Ballo
27647aabec Bug 1055741 - Unify the 'local Screen' and 'ParentLayer' coordinate systems. r=kats 2014-11-10 14:35:11 -05:00
Botond Ballo
2124b8b94c Bug 1076163 - Clean up the resolution-related fields and methods in FrameMetrics. r=kats 2014-10-20 17:12:35 -04:00
Botond Ballo
08963b106d Bug 1076163 - Basic APZ support for css-driven resolution. r=kats,tn
This makes APZ behave nicely with most uses of a css transform:scale.

Summary of changes:
  - FrameMetrics::mCumulativeResolution now includes the css-driven resolution
    in addition to the pres-shell resolution.
  - Displayports are now stored in Screen pixels rather than Layer pixels.
    This is what we want anyways (as we'd like the displayport size to remain
    constant as a fraction of the screen size), but it was necessary to make
    this change as part of this patch because continuing to store them in
    Layer pixels in the presence of a css-driven resolution would have
    required a bunch of infrastructure to implement correctly.

Remaining work:
  - Layout painting a scrollable layer at a resolution different from the
    scale induced by the css transform causes problems. These will go away
    with bug 1076192.
  - Different resolutions on the x and y axes are not supported. This is
    tracked by bug 1039967.
2014-10-24 15:49:38 -04:00
Douglas Crosher
563e91e13c Bug 1021367 - Assertion failure in GetShaderConfigFor. r=nical 2014-06-09 20:10:28 +10:00
Carsten "Tomcat" Book
f8a9a0cf8d Backed out changeset fbb9dc943109 (bug 1076163) for Android 4.0 Crashes on a CLOSED TREE 2014-11-13 11:47:57 +01:00
Carsten "Tomcat" Book
b4345a9bb4 Backed out changeset 71fe4233208a (bug 1076163) 2014-11-13 11:47:35 +01:00
Carsten "Tomcat" Book
5b163a6b8b Backed out changeset a96930f1e26b (bug 1055741) 2014-11-13 11:47:31 +01:00
Botond Ballo
c54c9d42eb Bug 1055741 - Unify the 'local Screen' and 'ParentLayer' coordinate systems. r=kats
--HG--
extra : rebase_source : af7323668fb54079e121755660da2121bec3d76b
2014-11-10 14:35:11 -05:00
Botond Ballo
2105a1529d Bug 1076163 - Clean up the resolution-related fields and methods in FrameMetrics. r=kats 2014-10-20 17:12:35 -04:00
Botond Ballo
df8b0f8a7a Bug 1076163 - Basic APZ support for css-driven resolution. r=kats,tn
This makes APZ behave nicely with most uses of a css transform:scale.

Summary of changes:
  - FrameMetrics::mCumulativeResolution now includes the css-driven resolution
    in addition to the pres-shell resolution.
  - Displayports are now stored in Screen pixels rather than Layer pixels.
    This is what we want anyways (as we'd like the displayport size to remain
    constant as a fraction of the screen size), but it was necessary to make
    this change as part of this patch because continuing to store them in
    Layer pixels in the presence of a css-driven resolution would have
    required a bunch of infrastructure to implement correctly.

Remaining work:
  - Layout painting a scrollable layer at a resolution different from the
    scale induced by the css transform causes problems. These will go away
    with bug 1076192.
  - Different resolutions on the x and y axes are not supported. This is
    tracked by bug 1039967.
2014-10-24 15:49:38 -04:00
Ryan VanderMeulen
289fc4870b Backed out changeset 92295f515d2d (bug 1091777) for bustage. 2014-11-12 21:09:40 -05:00
Sotaro Ikeda
34dd2a5f5b Bug 1091777 - Add TextureClient recycling to CairoImag r=nical 2014-11-12 17:47:10 -08:00
Sotaro Ikeda
c82676630f Bug 1095639 - Re-enable acquire fence delivery on gonk r=nical 2014-11-12 07:55:31 -08:00
Kartikaya Gupta
7f62901778 Bug 1091296 - When applying the APZ transform on a layer, make sure not to clobber any existing OMTA transform. r=mattwoodrow
--HG--
extra : rebase_source : 9662fbdea917d63a1205660979cbb5c6f861ba02
2014-11-11 10:54:02 -05:00
Kartikaya Gupta
5f8e28d976 Bug 1091296 - Remove the redundant code for clearing async transforms per frame of composition. r=mattwoodrow
We already reset the shadow transform to the layer transform in
SetShadowProperties() before compositing every frame, so this is redundant.

--HG--
extra : rebase_source : bef51e6a918ffaab134a4b53fb6f2ec6c45d9d6d
2014-11-11 10:53:57 -05:00
Kartikaya Gupta
59e09f0613 Bug 1091296 - Refactor the pre- and post-scale cancellation code into a helper method. r=mattwoodrow
--HG--
extra : rebase_source : c06309a16a13673eb59bb98c9dfd4d5c4846aad5
2014-11-11 10:53:44 -05:00
Brian Birtles
50be117679 Bug 1095315 - Fix the order of applying pending updates and getting the effective transform in BasicLayerManager; r=mattwoodrow 2014-11-11 11:01:28 +09:00
Kartikaya Gupta
985540ecef Bug 1072093 - Support progressive-paint on OS X 10.7 or later. r=BenWa 2014-11-07 14:17:14 -05:00
Kartikaya Gupta
0d8a3614cc Bug 1093686 - Add some debug logging code for PositionedEventTargeting.cpp. r=roc 2014-11-06 08:05:51 -05:00
Milan Sreckovic
2d3468d332 Bug 1092262 - Doxygen docs for APZ prefs. r=kats 2014-11-05 11:04:32 -05:00
Andrew Osmond
8e71e7800f Bug 1077301 - Ensure EGL images are released when destroying the texture. r=nical 2014-11-05 08:17:00 +01:00
Sotaro Ikeda
b299248ef3 Bug 1093728 - Add AddTextureClient() to CanvasClientSharedSurface::Update() r=nical 2014-11-05 08:15:48 -08:00
Robert O'Callahan
628c45fc97 Bug 1080205. Part 2: Add test. r=tn
--HG--
extra : rebase_source : 9f8a41ae255e132e572fdb5012f851554fde69d9
2014-10-30 16:33:55 +13:00
Robert O'Callahan
bd30ce7c71 Bug 1083635. Part 5: ClientLayerManager::BeginTransactionWithTarget should assert if we're not going to take a snapshot. r=mattwoodrow
--HG--
extra : rebase_source : 07cea353735743670cc82031bcbe738932f56829
2014-10-21 10:32:10 +13:00
Benoit Girard
0470baff84 Bug 1089380 - Remove ClipRectInLayersCoordinates. r=mattwoodrow
--HG--
extra : rebase_source : d20c08c804f45f2a6baee9063d0e73bf755054ae
2014-10-31 16:34:30 -04:00
Phil Ringnalda
810325008f Back out 293c48ec288c (bug 1086642) for Android and OS X 10.8 ONLY NOT SEEN ON 10.6 bustage
CLOSED TREE
2014-11-03 20:44:19 -08:00
Matt Woodrow
8b2961342c Bug 1086642 - Simplify invalid reigon by area. r=jrmuizel 2014-11-04 15:12:06 +13:00
Benoit Girard
4cb4693be0 Backout 60fe2b1ab1ba for split-opacity-layers-1.html reftest failure.
--HG--
extra : rebase_source : 83a753f924f85b90e2d5ad07877dc3ebdbc1b8df
2014-11-03 13:37:54 -05:00
Benoit Girard
16fdd79d33 Bug 1089380 - Remove ClipRectInLayersCoordinates. r=mattwoodrow
--HG--
extra : rebase_source : 6793ed284fa8190c0d4e43e189ca4eb2d020d4f0
2014-10-31 16:34:30 -04:00
Jacek Caban
4129770618 Bug 1092130 - Fixed build errors found by mingw after bug 1076698 landed (-Werror=missing-braces errors). r=cpearce 2014-11-03 10:28:52 +01:00
Bas Schouten
9859be600a Bug 1064864. Ensure the copying bounds are sane. r=jrmuizel
This prevents things from going really bad on some drivers.

--HG--
extra : rebase_source : c237cf3e6a6174696ebe6d41562a30c8cc0e564d
2014-11-01 14:02:20 -04:00
Kartikaya Gupta
0f7ac57254 Bug 1091283 - Ensure that pinch gesture events actually get processed. r=botond
Currently only pinch gesture events getting created in the GestureEventListener
code will make it to AsyncPanZoomController::HandleGestureEvent. Any pinch
gesture events that the widget code dispatches into the APZCTreeManager get
ignored, which shouldn't be happening. We don't have any production code that
exercises these code paths at the moment, but fixing it up also reduces the
APIs exposed into the testing code.
2014-10-31 15:29:36 -04:00
Botond Ballo
73e10e507a Bug 1066888 - Documentation tweaks for overscroll physics improvements. r=kats. DONTBUILD for doc changes
--HG--
extra : rebase_source : 08df59b26c6ce334c96c5ec5b635c940c8548f08
extra : amend_source : 7c1c0799b0fcc747134cad8b56a202f830b50ae3
2014-10-31 14:10:36 -04:00
Botond Ballo
11bd5dec9f Bug 1066888 - Overscroll physics improvements. r=kats
This patch unifies the physics governing the overscroll phase of a fling
with the snap-back animation. The unified physics are spring-based, like the
physics governing the snap-back animation before, except we allow for
oscillations.
2014-10-31 12:06:31 -04:00
Jeff Muizelaar
2666e4b426 Bug 1066312. Use IDXGIKeyedMutex for synchronization with D3D11 angle. r=jgilbert
This currently does nothing because the ANGLE we're using doesn't have keyed mutex
support.

--HG--
extra : rebase_source : 9ab74710c22c5330809206f1bb16677af5944bad
2014-10-31 10:57:32 -04:00
Nicolas Silva
a041b006fc Bug 1074382 - Add some gfxCriticalError logging in the initialization of D3D9. r=milan 2014-10-30 18:20:23 +01:00
Robert O'Callahan
4acddf2632 Bug 1073252. Fix bustage in part 4, in a CLOSED TREE 2014-10-31 22:40:15 +13:00
Robert O'Callahan
cd94ff127c Bug 1073252. Part 4: Flip hasAlpha to isOpaque for consistency. r=mattwoodrow
--HG--
extra : rebase_source : a553b4c36feb555b23cbe140a05df09f0dc2656d
2014-10-30 15:32:41 +13:00
Robert O'Callahan
09acbfb02f Bug 1073252. Part 2: Store opaque flag in LayerRenderState. r=nical
--HG--
extra : rebase_source : a0fefe94dd52a6f365c34bffcd806e094c62d76e
2014-10-30 15:32:41 +13:00
Robert O'Callahan
6cb3441fdc Bug 1073252. Part 1: Track opaqueness of gralloc TextureClient/Host. r=nical
--HG--
extra : rebase_source : de08e7a128bad27250cae94386e8ffea5fa26d6d
2014-10-30 15:32:40 +13:00
Mason Chang
fe2c3ae382 bug 1087048. Dispatch touch events after vsync aligned composites. r=benwa 2014-10-30 08:48:42 -07:00
Kartikaya Gupta
2ec9b16ffe Bug 1091049 - Follow-up to fix non-unified build error. r=me 2014-10-30 11:48:54 -04:00
Carsten "Tomcat" Book
e91fd8b26b Merge mozilla-central to b2g-inbound 2014-10-30 15:51:48 +01:00
Kartikaya Gupta
b514d384b4 Bug 1091049 - Add fling curving to accelerate fast flicks. r=botond 2014-10-30 10:38:10 -04:00
Kartikaya Gupta
5aedbae139 Bug 1091049 - Rename gComputedTimingFunction to gZoomAnimationFunction. r=botond 2014-10-30 10:38:09 -04:00