Commit Graph

590 Commits

Author SHA1 Message Date
David Zbarsky
a54523e5c9 [Bug 777657] Fix some opt build warnings r=cjones 2012-07-26 21:02:05 -07:00
Nicholas Cameron
3e80396ca2 Bug 746883; fix the bustage possibly caused by 746896. r=mattwoodrow 2012-07-26 14:30:20 +12:00
Nicholas Cameron
e5b55a65ac Back out bug 746883, bug 764125, bug 761895, bug 746883, bug 748116 2012-07-26 18:48:24 +12:00
Nicholas Cameron
5c8c9441ba Bug 746883; fix the bustage possibly caused by 746896. r=mattwoodrow 2012-07-26 14:30:20 +12:00
Chris Jones
f848c91766 Bug 776940: Fix shutdown protocol of shadow OGL layers. r=vlad 2012-07-24 19:46:32 -07:00
Ed Morley
3ed23376d4 Backout 1244b8a8e57a (bug 755084), 32d16d0f87c9 (bug 706179), 8548e016d4a9 (bug 768440), 697f5b87eae9 (bug 768440), 808fc2bd4e8c (bug 755084), 54b1484cd125 (bug 755084), 876726b632c0 (bug 706179) for xul android R3 failures 2012-07-25 16:37:04 +01:00
David Zbarsky
ced60d55d3 Bug 706179: Add support for animations to the Layers API r=roc, dbaron, cjones 2012-07-25 01:48:09 -07:00
Robert O'Callahan
13a40a7a24 Backout c1878d925ef5 (bug 776940) due to leaks on Mac 2012-07-25 17:39:47 +12:00
Chris Jones
42c7cd078e Bug 776940: Fix shutdown protocol of shadow OGL layers. r=roc 2012-07-24 19:46:32 -07:00
Matt Brubeck
90029e0bf6 Back out f4f5189b1d0c, 3b4f0606c547, b8a5a1ab8a5f, 5078933d6954, 7e0260c45de9 (bug 768440, bug 755084, bug 706179) because of reftest failures 2012-07-23 20:25:51 -07:00
David Zbarsky
33710a6b6d Bug 706179: Add support for animations to the Layers API r=roc, dbaron, cjones 2012-07-23 17:34:22 -07:00
Chris Jones
77fdc3e6fe Bug 771350, part 2: Use OpenDescriptorForTexturing() in ShadowThebesLayerOGL, where possible. r=BenWa 2012-07-23 16:58:37 -07:00
Chris Jones
82f0a71400 Bug 771350, part 0: Remove some dead code to make later patches clearer. r=BenWa 2012-07-23 16:58:35 -07:00
James Willcox
30e0f551ce Bug 687267 - Initial support for Flash on Honeycomb r=bgirard,vlad,jgilbert,blassey 2012-07-20 15:20:51 -04:00
Ed Morley
320a116efd Backout 4987ffd173a4 (bug 687267) for bustage 2012-07-23 14:47:54 +01:00
James Willcox
752928c2eb Bug 687267 - Initial support for Flash on Honeycomb r=bgirard,vlad,jgilbert,blassey
--HG--
extra : rebase_source : 450055ae3e71ea84f74252d3bf100fe970d29d14
2012-07-20 15:20:51 -04:00
Ms2ger
cb94cc2ce1 Bug 776142 - Back out bug 687267 / changeset 8571114112b2 on a CLOSED TREE. 2012-07-22 14:02:18 +02:00
James Willcox
5517ea9fde Bug 687267 - Initial support for Flash on Honeycomb r=bgirard,vlad,jgilbert 2012-07-20 15:20:51 -04:00
Andreas Gal
d76acb8d6a Remove dead code from upload path (bug 775863, r=cjones). 2012-07-20 00:36:19 -07:00
Chris Jones
f28956b0e5 Followup to bug 775436: Fix thinko. r=gal 2012-07-19 21:34:21 -07:00
Steve Fink
6914108ba0 Backed out changeset afd9e75374e8 from a CLOSED TREE for breaking Windows builds 2012-07-19 14:55:48 -07:00
James Willcox
08eb1f216b Bug 687267 - Initial support for Flash on Honeycomb r=benwa,vlad 2012-07-19 16:15:40 -04:00
cbrocious@mozilla.com
92d9870496 Strip out the progressive upload logic and other unnecessary upload paths from ShadowThebesLayerOGL (bug 775436, r=cjones). 2012-07-19 01:52:45 -07:00
David Zbarsky
9a61d96c70 [Bug 774505] Don't include Layers.h everywhere r=cjones 2012-07-18 12:31:40 -04:00
Chris Jones
f86571551f Bug 745148, part 7: Create a RefLayer type to temporarily contain a foreign layer subtree during composition. r=BenWa sr=roc 2012-07-17 16:59:45 -07:00
Kan-Ru Chen
0ca1d23935 Bug 774552 - Draw GraphicBuffer directly. r=roc,BenWa 2012-07-17 10:12:58 +08:00
Oleg Romashin
26b109bb23 Bug 728524 - Public shared texture API + Canvas impl. r=bgirard,vlad,jgilbert 2012-05-31 21:30:08 -04:00
Oleg Romashin
55fbefa166 Bug 728524 - Minor rework for TexImage filter setup. r=bgirard 2012-07-15 11:11:05 -04:00
Nicolas Silva
966f3cd0b1 Bug 598868: Add support for pushing video frames directly to the compositor thread, bypassing the content thread. r=cjones 2012-07-13 15:38:09 -04:00
Chris Jones
3b30cb023b Bug 765734, part 5: Disable texture-upload hacks on b2g. (This code is dead for android currently too, to be removed soon.) r=BenWa
--HG--
extra : rebase_source : d78019d51647bf55ff8bded0f35549100e72dd6c
2012-07-12 05:51:58 -07:00
Chris Jones
54accca6a3 Bug 765734, part 4: Add an RAII helper to open/close SurfaceDescriptors and mark usage of SurfaceDescriptor as ReadOnly or ReadWrite. r=BenWa,nrc sr=roc
--HG--
extra : rebase_source : 34d9f4f021bac540e96b82eceb855c9c2ce59ce6
2012-07-12 05:51:58 -07:00
Chris Jones
96f961a570 Bug 765734, part 2: Migrate ImageLayers to SurfaceDescriptor. r=mattwoodrow,roc
--HG--
extra : rebase_source : 19fc8b0ae4cfffdf9a098911deac3b48c2f5d768
2012-07-12 05:51:57 -07:00
Ed Morley
0dd4a2cd88 Backout 6087689a0745, 153e82923805, 255445a0a851 (bug 728524) on suspicion of causing bug 772405 2012-07-10 16:06:42 +01:00
Ali Juma
4996e5631f Bug 762101 - Correctly convert from screen coordinates to buffer coordinates in ShadowBufferOGL::Upload. r=cjones 2012-07-10 10:25:17 -04:00
Oleg Romashin
e70c266519 Bug 728524 - Public shared texture API + Canvas impl. r=bgirard,vlad,jgilbert 2012-05-31 21:30:08 -04:00
Oleg Romashin
2fedf5ad53 Bug 728524 - Minor rework for TexImage filter setup. r=bgirard 2012-07-09 21:30:14 -04:00
Vladimir Vukicevic
f362f03946 b=765150, HTML5 video playback shows purple screen on Motorola/Tegra 2 devices; r=jrmuizel 2012-07-05 14:34:04 -04:00
Phil Ringnalda
a0fb5dc0f6 Back out f79077bad960 and 94dd16a365d9 (bug 765150) for bustage 2012-07-05 09:07:18 -07:00
Vladimir Vukicevic
67e29dbd07 b=765150, HTML5 video playback shows purple screen on Motorola/Tegra 2 devices -- now with correctly generated shaders include; r=jrmuizel 2012-07-05 11:27:26 -04:00
Vladimir Vukicevic
a84a828387 b=765150, HTML5 video playback shows purple screen on Motorola/Tegra 2 devices; r=jrmuizel 2012-07-05 10:00:23 -04:00
Ehsan Akhgari
658ec4eb81 Backout changeset d97bd4246317 (bug 539356) because of performance and correctness regressions 2012-07-03 20:26:18 -04:00
Ehsan Akhgari
cf18ee9122 Backout changeset f568fc280fb0 (bug 539356) because of performance and correctness regressions 2012-07-03 20:24:55 -04:00
Ehsan Akhgari
8b3c1f653a Backout changeset cb1ac88bedc2 (bug 539356) because of performance and correctness regressions 2012-07-03 20:14:11 -04:00
Oleg Romashin
5cbefb95a7 Bug 539356 - Part 20 - Simplify regions to avoid excessive region calculation. r=roc 2012-06-30 15:06:13 +12:00
Matt Woodrow
31125260ee Bug 539356 - Part 9 - Implement DLBI. r=roc,bz,jwatt 2012-06-30 15:06:11 +12:00
Matt Woodrow
7aaf9816cd Bug 539356 - Part 8a - Add END_NO_COMPOSITE to EndTransactionFlags and implement in for all LayerManagers. r=roc 2012-06-30 15:06:10 +12:00
Nicholas Cameron
0e6b01bba2 Bug 757347; checking the format of images. r=roc 2012-06-26 14:43:31 +12:00
Nicholas Cameron
65d2f251d1 Bug 757346; Use A8 textures (OGL). r=roc 2012-06-26 14:43:31 +12:00
Nicholas Cameron
162bac1537 Bug 757346; mask image format stuff - use A8 textures (except DX10) and some small, misc fixes. r=roc 2012-06-26 14:43:31 +12:00
Nicholas Cameron
f1e0596d58 Bug 757347; Add a shutdown hook and remove MaskImageFormat(). r=roc 2012-06-26 14:43:30 +12:00
Nicholas Cameron
1a825cc2d4 Back out bug 757346
--HG--
extra : rebase_source : 8a07c2c56ca9dbc165012b679d421435cc886c2c
2012-06-26 10:54:05 +12:00
Nicholas Cameron
90e38cb124 Bug 757347; checking the format of images. r=roc 2012-06-26 09:44:41 +12:00
Nicholas Cameron
52501aeb72 Bug 757346; Use A8 textures (OGL). r=roc 2012-06-26 09:44:41 +12:00
Nicholas Cameron
eabed73236 Bug 757346; mask image format stuff - use A8 textures (except DX10) and some small, misc fixes. r=roc 2012-06-26 09:44:41 +12:00
Nicholas Cameron
841c20e037 Bug 757347; Add a shutdown hook and remove MaskImageFormat(). r=roc 2012-06-26 09:44:41 +12:00
Jeff Muizelaar
e766063a2f Bug 759866. Crash more aggressively if we aren't going to be able to paint. r=bgirard
This should make it easier to get an idea how common these kinds of failures are.

--HG--
extra : rebase_source : c5c029ebfe723fc4d32d604528beb1769c21d98c
2012-05-31 17:51:52 -04:00
Gervase Markham
68d38d677f Bug 759095 - upgrade license to MPL 2, and other licensing cleanups.
--HG--
extra : rebase_source : da55a4937383eda2baf7c9a362501da8ee664146
2012-05-29 16:52:43 +01:00
Kartikaya Gupta
9583637c8e Bug 748384 - Propagate page bounds and CSS page bounds in via compositor. r=Cwiiis,ajuma,mats 2012-05-23 10:51:39 -04:00
Kartikaya Gupta
15d02d35fd Bug 748384 - Back out 330e9c52f9ac, 9ba1078559fe, 2ed39c12d792, f53f05ecacd5 for build bustage. r=bustage 2012-05-23 11:08:19 -04:00
Kartikaya Gupta
c9a4698bf1 Bug 748384 - Propagate page bounds and CSS page bounds in via compositor. r=Cwiiis,ajuma,mats 2012-05-23 10:51:39 -04:00
Nicholas Cameron
0ff78c2542 Bug 753784; force mask layers to have a single tile - misc bits and pieces. r=roc 2012-05-17 10:30:10 +12:00
Nicholas Cameron
befb18b0a8 Bug 753784; allow access to the max texture size from FrameLayerBuilder. r=roc 2012-05-22 19:15:16 -04:00
Nicholas Cameron
13553ad870 Bug 753784; add the ability to force a single tile. r=roc 2012-05-22 19:14:03 -04:00
Gervase Markham
82ff7027aa Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Kartikaya Gupta
e8291047ec Bug 756555 - Intersect the upload region with the valid region. r=ajuma 2012-05-18 21:19:43 -04:00
David Zbarsky
21841cc405 Bug 756171 - Fix warning in LayerManagerOGLProgram.h. r=bgirard 2012-05-18 11:42:04 -04:00
Benoit Girard
51f967fdc3 Bug 754233 - Handle negative layer coordinate in Tiled layers. r=ajuma 2012-05-17 15:47:53 -04:00
Nicolas Silva
388217afa6 Bug 751163 - Release ShadowImageLayerOGL's YUV textures in ShadowImageLayerOGL::CleanupResources. r=bgirard
--HG--
extra : rebase_source : 97cfcda1374519f71b4e9e01a6636ce4b701a5c1
2012-05-15 15:17:33 -04:00
Benoit Jacob
653bf48f50 Bug 754056 - call ReadUnlock() before replacing tiles - r=bgirard 2012-05-12 16:56:55 -04:00
Benoit Jacob
4d92553d61 Bug 739648 - add mFlags field to TextureImage; introduce GetSrcTileRect flipping tile y-coords as needed; use it in DirectUpdate() to fix WebGL compositing bug - r=bgirard 2012-05-09 16:55:31 -04:00
Joe Drew
114b3f8fcf Bug 725105 - Fix the single-buffered (i.e., not default) case in LayerManagerOGL. r=bjacob 2012-05-07 17:46:25 -04:00
Benoit Girard
1fdac7df1a Bug 748649 - Shallow copy BasicTiledLayerBuffer to work around bug 747811. r=ajuma
--HG--
extra : rebase_source : 914f0602e64557481f91f96bd78fb9c6ed2dc4b5
2012-05-01 15:59:41 -04:00
Chris Lord
57d39cfc72 Bug 750535 - Fix invalidation of retained tiles. r=ajuma a=blocking-fennec
When the layer size changed, reused tiles that then fell out of the layer area
would be incorrectly rendered. Fix this by deriving the rendered content area
from set display-ports and correctly invalidating when harvesting tiles, and
clipping when drawing them.

--HG--
extra : rebase_source : 6427be89b9cfb1e54feb0582fb64fa97d7d42bde
2012-05-03 20:55:08 -04:00
Benoit Jacob
1519eb1059 Backing out bug 739648 for linux build failure 2012-05-03 16:26:04 -04:00
Benoit Jacob
657df782fe Bug 739648 - WebGL rendering is broken on Android due to tiles being rendered at y-flipped coordinates - r=bgirard 2012-05-03 15:59:19 -04:00
Nicholas Cameron
79a33df6e6 Bug 716439; compile OGL shaders lazily. r=BenWa 2012-05-02 14:54:40 +12:00
Nicholas Cameron
444eba98c1 Bug 716439; shadow layer support. r=BenWa 2012-03-19 12:02:38 +13:00
Nicholas Cameron
37880b7f51 Bug 716439; change build process to genshaders statically. r=BenWa 2012-03-27 11:13:34 +13:00
Nicholas Cameron
74622d3afc Bug 716439; using mask layers in OGL. r=BenWa 2012-03-19 09:08:53 +13:00
Nicholas Cameron
72a96f7faf Bug 716439; load a mask texture in the OGL backend. r=BenWa 2012-03-19 09:08:49 +13:00
Nicholas Cameron
c801f9b117 Bug 716439; managing mask layer shaders in OpenGL. r=BenWa 2012-03-19 09:07:25 +13:00
Nicholas Cameron
bc5a6227b2 Bug 716439; shaders for OpenGL mask layers. r=BenWa 2012-03-19 09:07:25 +13:00
Nicholas Cameron
1b6756aa23 Bug 733894; changing the framework for representing shaders in the OGL
layers backend. r=BenWa
2012-03-19 09:07:25 +13:00
Daniel Holbert
b7932b3e66 Bug 750356: fix signed/unsigned comparison build warnings in ReusableTileStoreOGL.cpp. r=chrislord 2012-04-30 15:47:42 -07:00
Benoit Girard
4b321f4886 Bug 749107 - Set the texture unit before binding the tile texture and change the texture ordering in ImageLayer to leave texture unit 0 bound. r=jmuizelaar 2012-04-30 14:51:05 -04:00
Benoit Girard
eb0a17535a Bug 749357 - TiledThebesLayerOGL can draw un-rendered areas of tiles. r=chrislord 2012-04-30 10:19:17 -04:00
Chris Lord
6ec3beb9c7 Bug 749630 - Fix single-colour checkerboard and masking. r=kats
Bug 748718 tried to fix masking of the checkerboard layer, but incorrectly
calculated the values for the right and bottom sides of the page, causing
less masking to occur than should happen.

It also possibly broke single-colour layer drawing (though I'm not sure this
worked previously), which this fixes by clearing to the page colour instead of
generating and drawing a texture for it.
2012-04-27 12:54:18 -04:00
Chris Lord
c2b59c5b4f Bug 749143 - Don't draw retained tiles outside of layer bounds. r=bgirard
It is possible for the content that layers represent to change size, causing
tiles to be reused where they shouldn't. Make sure that tiles that are outside
of content bounds are not drawn, and that they get evicted when harvesting
tiles.
2012-04-26 12:53:14 -04:00
Benoit Girard
45ec8d0322 Bug 748645 - Upload TiledThebesLayerOGL outside the transaction. r=chrislord
--HG--
rename : mozglue/linker/Elfxx.h => mozglue/linker/CustomElf.h
rename : toolkit/devtools/debugger/server/dbg-server.js => toolkit/devtools/debugger/server/dbg-server.jsm
extra : rebase_source : 547cc2fb5871ba58b1c133824a06eab9d4027524
2012-04-25 11:32:10 -04:00
Chris Lord
70e676b14d Bug 745177 - Retain and re-use uploaded GL tiles. r=ajuma
Rather than discarding uploaded tiles once they fall outside of the valid
region, shuffle them off into a separate tile-store with all the metadata they
need to render them, and render them in the areas that our current valid
region doesn't cover in TiledThebesLayerOGL::RenderLayer.
2012-04-24 22:48:33 -04:00
Matt Brubeck
e95835d8ba Back out 4114c654f5d0 (bug 745177) because of Mac build errors 2012-04-24 20:18:50 -07:00
Chris Lord
8000a2a211 Bug 745177 - Retain and re-use uploaded GL tiles. r=ajuma
Rather than discarding uploaded tiles once they fall outside of the valid
region, shuffle them off into a separate tile-store with all the metadata they
need to render them, and render them in the areas that our current valid
region doesn't cover in TiledThebesLayerOGL::RenderLayer.
2012-04-24 22:48:33 -04:00
Benoit Girard
0a221c25a9 Bug 739679 - Part 6: Fix unlocking gfxReusableSurface. r=pcwalton 2012-04-23 20:08:18 -04:00
Benoit Girard
6c1b206cd4 Bug 739679 - Part 4: TiledLayerBufferOGL. r=mwoodrow,roc 2012-04-16 19:04:24 -04:00
Ali Juma
ed64e52133 Bug 733596 - Tell the compositor about the new surface size on surface change. r=bgirard a=blocking-fennec 2012-04-20 11:46:30 -04:00
George Wright
3deefb5e3c Bug 744543 - LayerManagerOGL doesn't build on Linux/clang. r=bjacob 2012-04-11 15:50:45 -04:00
Ali Juma
65e2dc5b45 Bug 741319 - Delete textures using the same context used to create them, on the thread that owns that context. r=joe 2012-04-10 16:20:02 -04:00
Benoit Jacob
d9adfa7a3f Bug 686735 - 2/2 - Implement no-gfx-driver-workarounds mode - r=joe
Part 2: In no-workarounds mode, also don't work around NPOT FBO bug
2012-04-10 11:49:32 -04:00
Benoit Jacob
3ec34c8a72 Bug 741730 - Remove USE_GLES2 - r=romaxa 2012-04-10 11:49:21 -04:00
Oleg Romashin
c633f71c80 Bug 739095 - Offscreen context without offscreen texture does not need YFlip. r=jgilbert 2012-03-26 12:56:10 -04:00
Jeff Gilbert
c962e216ff Bug 735378 - Cache temporary composite surfaces - r=bgirard 2012-03-25 12:50:26 -07:00
Matt Brubeck
2bbc3d0175 Back out 636349fa2e09 because of robocop failures 2012-03-22 19:07:42 -07:00
Jeff Gilbert
9d1519111f Bug 735378 - Cache temporary composite surfaces - r=bgirard 2012-03-22 15:04:25 -07:00
Chris Jones
71e9ddbde6 Bug 738158, part 2: Set the wrap mode for cairo images. r=ajuma 2012-03-22 01:02:59 -07:00
Chris Jones
9ac0f342f8 Bug 738158, part 1: Remove unnecessary settings from InitTexture(). UploadSurfaceToTexture() and SetFilter/ApplyFilter() do these now. r=ajuma 2012-03-22 01:02:29 -07:00
Chris Jones
ac508d4470 Bug 737071: Remove LayerManagerOGL::glForResources() because it's not needed and causes performance degradtion sometimes. r=Bas 2012-03-21 22:48:41 -07:00
Chris Lord
62043cf721 Bug 736850 - Cancel progressive upload task on buffer destruction. r=bgirard
Make sure to cancel the progressive upload task when destroying the
front-buffer. This also changes the Destroy method to call DestroyFrontbuffer
instead of just assigning nsnull to mBuffer.
2012-03-19 14:38:34 +00:00
Andreas Gal
6d9d726c6a Remove unused and broken tiling code (bug 736716, r=cjones). 2012-03-17 15:22:22 -07:00
Andreas Gal
f8ebf3db54 Backout bug 736716. 2012-03-17 15:20:01 -07:00
Andreas Gal
5a21426f72 Follow-up fix for bug 736716 (fix bad style fix). 2012-03-17 15:07:22 -07:00
Andreas Gal
93f73de1fb Remove unused and broken tiling code (bug 736716, r=cjones). 2012-03-17 15:02:02 -07:00
Benoit Girard
17f6932716 Bug 736743 - Fix LayerManagerOGL Description. r=ajuma 2012-03-17 12:44:45 -04:00
Chris Lord
268c0e7138 Bug 732917 - Upload textures progressively. r=bgirard
When using double-buffering in ShadowThebesLayerOGL, upload texture data
progressively.
2012-03-17 12:07:02 +00:00
Chris Lord
5671285300 Bug 732917 - Upload to texture on demand. r=bgirard,mattwoodrow
Add functions to do progressive texture upload and only upload to texture on
draw-demand. This is a building block towards asynchronous texture upload.
2012-03-17 12:07:02 +00:00
Chris Lord
814c8c8c68 Bug 732917 - Enable double-buffering on Android. r=ajuma
Add support for double-buffering to ThebesLayerOGL, and enable it on Android.
Double-buffering should allow us to more easily implement progressive texture
upload.
2012-03-17 12:07:02 +00:00
Phil Ringnalda
c80d1bb60a Back out 243cd4db5edd and 4175fc853e16 (bug 712716) for OS X 10.6 and 10.7 assertions 2012-03-15 23:21:54 -07:00
Benoit Girard
69465f1b22 Bug 712716 - Add conditional shaders and a Copy2DExternalProgramType for gralloc. r=jrmuizelaar 2012-03-14 15:10:36 -04:00
Benoit Girard
42c404e37f Bug 712716 - Fix AndroidGraphicBuffer resource management. r=snorp,jmuizelaar 2012-03-12 16:28:02 -04:00
Benoit Girard
dc6ea71b7e Merge mc->Maple 2012-03-13 11:05:28 -04:00
Ehsan Akhgari
43f6c7a351 Backout changeset b52bae0250f7 because of test failures 2012-03-12 18:51:17 -04:00
Benoit Girard
8ecdfd895f Bug 712716 - Fix AndroidGraphicBuffer resource management. r=snorp,jmuizelaar 2012-03-12 16:28:02 -04:00
Bas Schouten
dbb9c56a6c Bug 732988 - Part 1: Add ScaleToSize API to ImageLayers. r=roc 2012-03-13 01:41:29 +00:00
Jeff Gilbert
f2bbb8f93e Bug 729702 - Use ReadPixelsIntoImageSurface in CopyToTarget instead of duplicating functionality - r=BenWa 2012-03-12 18:42:02 -07:00
Benoit Girard
0e825779e0 Bug 733184 - Remove more logging from widget. r=pcwalton 2012-03-05 19:58:18 -05:00
Benoit Girard
677ccfe9c3 Bug 733113 - Maple: Remove debug logging. r=ajuma 2012-03-05 16:10:43 -05:00
Benoit Girard
d900d4eab3 Bug 717958 - Always read FPS pref on the main thread with OMTC. r=ajuma 2012-03-05 14:02:22 -05:00
Benoit Girard
997a81e71b Merge latest green changeset from mozilla-central to maple
--HG--
rename : dom/base/nsDOMMemoryReporter.cpp => dom/base/nsWindowMemoryReporter.cpp
rename : dom/base/nsDOMMemoryReporter.h => dom/base/nsWindowMemoryReporter.h
2012-03-05 13:41:15 -05:00
Benoit Girard
73a287f0ea Restore merge changeset 39a3044823b0, regression fixed upstream in mc 2012-03-05 13:09:05 -05:00
Benoit Girard
a4a3883264 Backed out changeset 39a3044823b0 because of bad interaction with maple. 2012-03-02 18:32:46 -05:00
Benoit Girard
7e6f558d70 Merge mc->Maple, resolved conflicts 2012-03-02 14:27:05 -05:00
Joe Drew
419f5ec1a4 Bug 728625 - Add support for vertically flipping textured quads generated with RectTriangles and DecomposeIntoNoRepeatTriangles. r=bjacob,gw280
--HG--
extra : rebase_source : f42bd3c951651339d2ecb1286a6ac5c9e65ddd7d
2012-02-29 14:15:12 -08:00
Kartikaya Gupta
1847cf91b3 Merge m-c again to pick up 75deec1f1a7b 2012-02-28 14:37:26 -05:00
Daniel Holbert
98a7f77a1c Backout 4b46f6eff8f4 (Bug 732988) for linux Cipc orange 2012-03-11 16:43:12 -07:00
Bas Schouten
7630416702 Bug 732988 - Part 1: Add ScaleToSize API to ImageLayers. r=roc 2012-03-11 22:33:22 +00:00
George Wright
fa376f2332 Bug 721489 - Older Adreno 200 drivers intermittently crash when uploading RGB565 textures with glTexImage2D - r=jrmuizel 2012-02-18 21:23:06 -05:00
Kartikaya Gupta
54ec96eba6 Put back some things left out of dougt's merge 2012-02-17 01:36:49 -05:00
Doug Turner
3f133bfdd1 Merge with mozilla-central 2012-02-16 18:06:54 -08:00
Benoit Girard
7980ddb052 Bug 732552 - Remove void return in ColorLayerOGL. r=ajuma 2012-03-02 15:36:30 -05:00
Matt Woodrow
b01db32e07 Bug 725209 - Mark TextureImage as valid when self copying, and correctly mark the region needing to be redrawn. r=joe 2012-02-15 16:03:05 -05:00
Matt Woodrow
131b3ab55f Bug 725209 - Mark TextureImage as valid when self copying, and correctly mark the region needing to be redrawn. r=joe 2012-02-15 22:28:21 +13:00
Benoit Girard
465c0d7898 Make OMTC changes not effect desktop 2012-02-13 17:17:12 -05:00
Benoit Girard
e7dd21c01b Bug 721489 - Backout changeset 0cb6641ab21a for a more desirable fix.
--HG--
extra : rebase_source : b8100a07f626c3cc51e019911a3b023b482d23b9
2012-02-10 15:12:35 -05:00
Ali Juma
1938bda689 Merge heads. 2012-02-10 10:31:31 -05:00
Patrick Walton
8e9cf5b1f7 Add a DrawWindowUnderlay() to match DrawWindowOverlay() 2012-02-09 19:47:50 -08:00
Benoit Girard
6bcb6bfee6 Bug 721489 - Allocate a PoT Shmem for the Adreno. This replaces segfaults by visual artifacts
--HG--
extra : rebase_source : 400e392843cf2d15b941e7e94b736106e6b447e2
2012-02-09 17:52:03 -05:00
Benoit Girard
2fd24c9367 Merge viewport with tip 2012-02-08 20:42:17 -05:00
Benoit Girard
f470edbef2 Merge m-c into maple 2012-02-08 16:43:22 -05:00
Patrick Walton
684cfdccea Remove the blinkenlights in the background 2012-02-07 23:24:58 -08:00
Benoit Jacob
c5a42c7937 Bug 711656 - report force-enabled features in crash reports - r=jrmuizel
Force-enabled features will be reported with a '!' instead of the usual '?' in AppNotes in crash reports.
2012-02-27 16:33:19 -05:00
Ali Juma
220516c4e6 Add ifdefs to fix desktop build.
--HG--
extra : rebase_source : fe51e388ff7dbd95e968cf60af800917801ab911
2012-02-03 21:48:05 -05:00