Commit Graph

17446 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
f35ddfdd22 Merge mozilla-central to mozilla-inbound 2014-10-21 15:55:25 +02:00
James Willcox
85b58e3f27 Bug 1014614 - Fix readback of SurfaceTextureImage r=jgilbert
--HG--
extra : rebase_source : 3e2e7f7d993b5561c5d1c2ae50c4a49718a66324
2014-10-21 08:53:02 -05:00
James Willcox
d02dc369ff Bug 1014614 - Add GLBlitHelper::BlitImageToFramebuffer and support SurfaceTexture images r=jgilbert
--HG--
extra : rebase_source : e823897f3ff6593af7286432903618dc483877dd
2014-10-21 08:53:02 -05:00
James Willcox
9790bce151 Bug 1014614 - Support attach/detach of GLContext to AndroidSurfaceTexture r=jgilbert
--HG--
extra : rebase_source : f8ac8c505b5f9a4f307044b932aef50b99d38d4f
2014-10-21 08:53:01 -05:00
James Willcox
ddabd5424e Bug 1014614 - Do not try to use a temporary texture for SurfaceTexture r=jgilbert
--HG--
extra : rebase_source : 68e6f70fe1c1aa123c4a1e21b3d25b78bcff7ad1
2014-10-21 08:53:01 -05:00
James Willcox
070c8814c3 Bug 1014614 - Expose Android native window via AndroidNativeWindow wrapper r=blassey
--HG--
extra : rebase_source : e8fef05b2fdc3ef2b7c43a01655f2c7bf3789208
2014-10-21 08:53:00 -05:00
James Willcox
d1763714e0 Bug 1014614 - Expose more SurfaceTexture API in AndroidSurfaceTexture r=blassey
--HG--
extra : rebase_source : 863f769375474b486ca55d649e7ed332efbef6fe
2014-10-21 08:53:00 -05:00
James Willcox
a8cc145afb Bug 1014614 - Rename nsSurfaceTexture to AndroidSurfaceTexture r=jgilbert
--HG--
extra : rebase_source : 4f148d8a0c2f9ec2d939f9d9939dab897b435bef
2014-10-21 08:53:00 -05:00
Carsten "Tomcat" Book
05f05fd22c merge fx-team to mozilla-central a=merge 2014-10-21 15:38:16 +02:00
Wes Kocher
f764a700ad Merge m-c to fx-team a=merge 2014-10-20 19:01:55 -07:00
Wes Kocher
845000a7e4 Merge m-c to fx-team a=merge 2014-10-20 18:34:45 -07:00
Jonathan Watt
e3bd1068b9 Bug 1085167, part 2 - Get rid of nsRenderingContext's DeviceContext and any need for it to know about app-units-per-device-pixel. r=mattwoodrow
--HG--
extra : rebase_source : d8fb804f03a1cc4635d6acd7f66f5f21962de6d3
2014-10-20 10:55:49 +01:00
Jonathan Watt
251f92b10b Bug 1085165 - Get rid of the nsRenderingContext::SetColor() method. r=mattwoodrow
--HG--
extra : rebase_source : dc4604e04cae84b8dcbd2d9890191713555c8c7a
2014-10-20 10:55:49 +01:00
Jonathan Watt
884793d6d9 Bug 1085160 - Port the code that uses nsRenderingContext::IntersectClip() to Moz2D. r=mattwoodrow
--HG--
extra : rebase_source : 54226509a1b16efdc76f92f202cc2be07cf43ab4
2014-10-20 10:55:48 +01:00
Jonathan Watt
c972886b3e Bug 1085159 - Port the code that uses nsRenderingContext::DrawLine() to Moz2D. r=mattwoodrow
--HG--
extra : rebase_source : 70553292850517d695994c0a3422fab8ea0b760a
2014-10-20 10:55:48 +01:00
David Parks
5b3ab326b6 Bug 918634 - swapFrameLoader not implemented for e10s r=nical
Allow layers to change layermanager if using LayerManagerComposite.

--HG--
extra : rebase_source : f24fde110f91fff7e2ceb3ddcd4549077a15f3c6
2014-10-14 15:11:38 -07:00
Mason Chang
390d93ee3d Bug 1069037 - Prevent touch events from piling up on the main thread. r=mwu 2014-10-16 14:02:00 +02:00
L. David Baron
731e55f016 Back out changeset 197317c196cf (bug 1077301) for apparently breaking component alpha on some Windows variants (perhaps those without accelerated layers backends). 2014-10-20 00:23:46 -04:00
Phil Ringnalda
d37beb9414 Back out 820188e039a0 (bug 1067748) for Android reftest-2 failures 2014-10-19 13:50:29 -07:00
Jonathan Watt
b8b833765e Bug 1083753, part 2 - Port the code that uses nsRenderingContext::FillRect(nsRect) to Moz2D. r=mattwoodrow 2014-10-19 13:22:22 +01:00
Jonathan Watt
c6407bc7fb Bug 1083753, part 1 - Port the code that uses nsRenderingContext::FillRect(nscoord,...) to Moz2D. r=mattwoodrow 2014-10-19 11:55:36 +01:00
Jonathan Watt
5cf1157461 Bug 1082530, part 5 - remove the variant of Moz2D's UserToDevicePixelSnapped that takes a Matrix argument instead of a DrawTarget argument. r=mattwoodrow 2014-10-19 10:22:47 +01:00
Jonathan Watt
c1682f3de0 Bug 1082530, part 4 - Make BasicColorLayer use the variant of Moz2D's UserToDevicePixelSnapped that honors disabling of pixel snapping and make it ignore scaling in the matrix (restore the pre-bug 989858 beharior). r=mattwoodrow 2014-10-19 10:22:47 +01:00
Jonathan Watt
5a3d8c69bd Bug 1082530, part 3 - Get rid of gfxContext::FLAG_DISABLE_SNAPPING and use DrawTarget UserData to store information on whether to disable pixel snapping. r=mattwoodrow 2014-10-19 10:22:47 +01:00
Jonathan Watt
2e12270def Bug 1082530, part 2 - Fix up Moz2D's UserToDevicePixelSnapped to be more like gfxContext::UserToDevicePixelSnapped, and add a temporary variant to aid in porting. r=mattwoodrow 2014-10-19 10:22:47 +01:00
Jonathan Watt
15c45a74fe Bug 1082530, part 1 - Mark DrawTarget::GetUserData as const. r=mattwoodrow 2014-10-19 10:22:46 +01:00
Robert O'Callahan
4e78797955 Bug 1067748. When a solid-color display item covers everything else in its layer, make it a ColorLayer. r=tn 2014-09-16 16:27:14 +12:00
Robert O'Callahan
f49b65148e Bug 1072528. Part 2: Remove layers code. r=bas 2014-09-24 16:35:06 -04:00
Matt Woodrow
e57f853968 Bug 1085223 - Add an occlusion culling pass to compositor layers. r=BenWa 2014-10-20 17:04:39 +13:00
chiajung hung
29e15d9b54 Bug 1062475 - [Camera] Camera button highlight appears as a square. r=sotaro 2014-10-20 02:49:00 -04:00
Sotaro Ikeda
7857088154 Bug 1084570 - Add HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED r=nical 2014-10-20 06:43:42 -07:00
Mike Hommey
75e7142b89 Fixup bug 1084696 on a busted tree. r=me 2014-10-18 16:14:45 +09:00
Jeff Gilbert
fa2a8063a7 Bug 1084696 - Actually use the RAII helper for locking the DrawTarget. - r=kamidphish 2014-10-17 21:31:27 -07:00
Wes Kocher
36939bc3c8 Backed out 9 changesets (bug 1014614) for Android mochitest bustage on a CLOSED TREE
Backed out changeset 40f99ba7f616 (bug 1014614)
Backed out changeset 8fbc3c85adfc (bug 1014614)
Backed out changeset 40dbd7c6ce65 (bug 1014614)
Backed out changeset f2b504bdd7c5 (bug 1014614)
Backed out changeset c878e29fbef9 (bug 1014614)
Backed out changeset 511dcc817f5d (bug 1014614)
Backed out changeset 2b72e71f1fdf (bug 1014614)
Backed out changeset 8b530a9a2f99 (bug 1014614)
Backed out changeset 7fa1b78de684 (bug 1014614)
2014-10-17 16:34:01 -07:00
Wes Kocher
ae0090428f Backed out changeset 869a28961b5c (bug 1084514) 2014-10-17 16:33:35 -07:00
Wes Kocher
27734959f9 Backed out changeset e3fe86623065 (bug 1084607) 2014-10-17 16:32:27 -07:00
Ralph Giles
ef7e176ba7 Bug 1084607 - Add missing namespace references for GLImages.cpp. r=jgilbert CLOSED TREE
This fixes undeclared type errors on non-unified builds.
2014-10-17 15:03:00 -07:00
Ralph Giles
9dbc70f9ac Bug 1084514 - Fix AndroidSourceTexture namespace issues. r=dholbert CLOSED TREE
This worked in the unified build because it borrowed includes
and namespace references from other files.
2014-10-17 11:31:00 -07:00
James Willcox
5e54d8daab Bug 1014614 - Fix readback of SurfaceTextureImage r=jgilbert
--HG--
extra : rebase_source : 3580c219b47615d55bfa3d1c672d017dd67ef0a1
extra : histedit_source : 24c932ac4ebabad7d706fa5599d5f32762ce5a02
2014-10-17 10:35:13 -05:00
James Willcox
dfb835773a Bug 1014614 - Add GLBlitHelper::BlitImageToFramebuffer and support SurfaceTexture images r=jgilbert
--HG--
extra : rebase_source : 2718fddef7754bb84ef893fc81f175d963b01760
extra : histedit_source : efba21204779c8995e55623ca398d3f0b8336c31
2014-10-17 10:35:13 -05:00
James Willcox
b1bb293164 Bug 1014614 - Support attach/detach of GLContext to AndroidSurfaceTexture r=jgilbert
--HG--
extra : rebase_source : b309ea1761abdb26261fe8f2eda03de66952c018
2014-10-17 10:35:11 -05:00
James Willcox
be81b623ed Bug 1014614 - Do not try to use a temporary texture for SurfaceTexture r=jgilbert
--HG--
extra : rebase_source : b2108d17ef5d87328d1dc0e9ff190d667bfeaa44
2014-10-17 10:35:11 -05:00
James Willcox
d9918ba35a Bug 1014614 - Expose more SurfaceTexture API in AndroidSurfaceTexture r=blassey
--HG--
extra : rebase_source : b6ee26cf973e7d4821fefbcd3b8dba0585779d86
2014-10-17 10:35:10 -05:00
James Willcox
399aa1c748 Bug 1014614 - Expose Android native window via AndroidNativeWindow wrapper r=blassey
--HG--
extra : rebase_source : a2d27a4223c1bd1189c4c6a32431cc306a3e93c6
2014-10-17 10:35:10 -05:00
James Willcox
9450484c06 Bug 1014614 - Rename nsSurfaceTexture to AndroidSurfaceTexture r=jgilbert
--HG--
extra : rebase_source : 70d12286eb15808a4a540bae0d6785e560e97b29
2014-10-17 10:35:10 -05:00
Jeff Muizelaar
2ff5fd9a2c Bug 1084024. Remove graphite Makefile.in. r=jfkthame
This doesn't seem to be needed anymore.

--HG--
extra : rebase_source : 41cf994417c1e0fb3e8167b8e25b2c9e3efe9a02
2014-10-17 11:07:28 -04:00
Jonathan Watt
9f5596b76b Bug 1083597 - Port the code that uses nsRenderingContext::DrawRect() to Moz2D. r=mattwoodrow 2014-10-17 15:06:34 +01:00
Jonathan Watt
e20775a0d6 Bug 1083557 - Port the code that uses nsRenderingContext::FillPolygon() to Moz2D. r=mattwoodrow 2014-10-17 15:06:34 +01:00
Jeff Muizelaar
6e632ada07 Bug 1070308. Add Acquire and Release semantics to SharedSurface. r=jgilbert
This is needed for D3D11 keyed mutex support. The added assertions
also ensure we're doing things at the right times.

--HG--
extra : rebase_source : 7af4dccca745ee62e4ae97972de8a8eb83f2e8d3
2014-10-09 16:33:22 -04:00
Nicolas Silva
52335c4b52 Bug 1077301 - Simplify the gralloc texture code. r=sotaro 2014-10-16 19:08:32 +02:00