Matt Woodrow
8ab773e4a8
Bug 539356 - Part 8b - Move painting of retained layers to the view manager flush, and only composite on the paint event. r=roc
2012-06-11 16:44:09 +12:00
Matt Woodrow
f1c27870fb
Bug 539356 - Part 8a - Add END_NO_COMPOSITE to EndTransactionFlags and implement in for all LayerManagers. r=roc
2012-06-11 16:44:08 +12:00
Matt Woodrow
0e8bdfe6c2
Bug 539356 - Part 6 - Add compositing paint flashing to BasicLayers. r=roc
2012-06-11 16:44:08 +12:00
Matt Woodrow
e12899ee80
Bug 539356 - Part 2 - Add new API to BasicLayers. r=roc
2012-06-11 16:44:08 +12:00
Matt Woodrow
b17e4001dc
Bug 539356 - Part 1 - Allow LayerManagers to have multiple user data objects. r=roc
2012-06-11 16:44:08 +12:00
Ehsan Akhgari
517c7b93f2
Bug 766000 - CompositionNotifySink needs a virtual destructor; r=roc
2012-06-18 21:19:06 -04:00
David Anderson
54d51b8342
Merge from mozilla-central.
2012-05-23 14:33:15 -07:00
David Anderson
531c35aeaa
Merge from mozilla-central.
2012-05-21 14:40:04 -07:00
Gervase Markham
87620f5676
Bug 716478 - update licence to MPL 2.
2012-05-21 12:12:37 +01:00
Kartikaya Gupta
7178944e03
Bug 753444 - Remove device-space page rect from setPageRect as it is not needed. r=jrmuizel
2012-06-13 13:49:40 -04:00
Ben Turner
785be4974a
Bug 666693 - 'Remote IndexedDB for multiple IndexedDB-using processes'. r=cjones+sicking.
2012-06-01 10:21:12 -07:00
Ali Juma
ca60d38ab2
Bug 748088 - Part 2: Drawing to a non-default target should happen on the shadow side, not the shadowable side. r=BenWa
2012-06-01 08:42:36 -04:00
Ali Juma
eb79efd447
Bug 748088 - Part 1: Add a DrawToSurface message to PLayers. r=BenWa
2012-06-01 08:42:34 -04:00
David Anderson
1c69f02062
Merge from mozilla-central.
...
--HG--
rename : xpcom/ds/CheckedInt.h => mfbt/CheckedInt.h
2012-05-16 15:39:10 -07:00
Kyle Huey
0ab789d7a3
Back out bug 703484 on this CLOSED TREE.
2012-05-15 20:19:37 -07:00
Benoit Girard
cfa59c2e98
Backout ab1cd425d884 for talos failures
...
--HG--
extra : rebase_source : 0d2930f14507123535a72aa75f73f78d03bcb765
2012-05-15 19:21:10 -04:00
Marco Castelluccio
715c60f1c1
Bug 703484 - Part 1: Allow OMTC to be used with basic layers. r=bgirard
...
--HG--
extra : rebase_source : a96747d6ea09d7112649fa46d2d6a84ababaeaab
2012-05-15 15:56:56 -04:00
Gervase Markham
638c878b13
Bug 759095 - upgrade license to MPL 2, and other licensing cleanups.
...
--HG--
extra : rebase_source : da55a4937383eda2baf7c9a362501da8ee664146
2012-05-29 16:52:43 +01:00
Bas Schouten
b5b2e50a6b
Bug 734404 - Part 1: Add support for DXGI shared surface handles to ImageLayers. r=roc
2012-05-30 07:14:30 +02:00
Nicholas Cameron
41314b89f2
Bug 755078 - Backout previously-landed patch for bug 755078. r=roc
2012-06-09 14:22:40 -04:00
David Anderson
70d6435f79
Merge from mozilla-central.
2012-05-14 12:10:12 -07:00
Benoit Jacob
bfeaeaba01
Bug 754056 - call ReadUnlock() before replacing tiles - r=bgirard
2012-05-12 16:56:55 -04:00
David Anderson
be93786d71
Merge from mozilla-central.
2012-05-10 13:44:10 -07:00
David Anderson
c2de63af87
Merge from mozilla-central.
2012-05-09 12:31:01 -07:00
David Anderson
6364c530b8
Merge from mozilla-central.
2012-05-08 17:34:07 -07:00
Oleg Romashin
d43e63fbbd
Bug 752643 - Make CompositorParent eglSurface setup available for non-android environment. r=ajuma
2012-05-08 12:40:41 -07:00
Oleg Romashin
79c7b221c2
Bug 752640 - Allow PCompositor to work with Basic Layers backend. r=ajuma
2012-05-07 16:05:13 -07:00
David Anderson
526de59b44
Merge from mozilla-central.
...
--HG--
rename : accessible/src/base/nsRootAccessible.cpp => accessible/src/generic/RootAccessible.cpp
rename : accessible/src/base/nsRootAccessible.h => accessible/src/generic/RootAccessible.h
rename : js/src/jsgcmark.cpp => js/src/gc/Marking.cpp
rename : js/src/jsgcmark.h => js/src/gc/Marking.h
2012-05-04 19:16:35 -07:00
Dave Hylands
d267afdead
Bug 759169 - Fix for compile error when MOZ_RENDERTRACE is enabled. r=bgirard
...
--HG--
extra : rebase_source : 56d1c44d4efeea7b2237385f560fad856dae15a4
2012-05-29 13:56:44 -04:00
Ali Juma
b802df3029
Bug 759162 - Part 2: Make CompositorParent::ScheduleResumeOnCompositorThread block until the compositor resumes. r=bgirard
2012-05-29 13:49:03 -04:00
Kartikaya Gupta
7e40449c93
Bug 607417 - Clamp the transform of fixed-position layers to work with RTL pages (interaction with bug 748384). r=ajuma
2012-05-29 10:22:49 -04:00
Benoit Girard
04c78756d4
Bug 759181 - Disable COMPOSITOR_PERFORMANCE_WARNING. r=ajuma
2012-05-28 17:28:31 -04:00
Oleg Romashin
20ef409664
Bug 757380 - BasicLayers Paint ignore NULL Clip when render with groupTarget. r=bas, r=roc
2012-05-24 18:36:22 -07:00
David Anderson
e701dedad3
Merge from mozilla-central.
2012-05-03 11:40:52 -07:00
Nicholas Cameron
a75759c60f
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
a938e2e825
Bug 753784; allow access to the max texture size from FrameLayerBuilder. r=roc
2012-05-22 19:15:16 -04:00
Nicholas Cameron
9be563af61
Bug 753784; add the ability to force a single tile. r=roc
2012-05-22 19:14:03 -04:00
David Anderson
6ad5a5ee0c
Merge from mozilla-central.
...
--HG--
rename : accessible/src/atk/nsApplicationAccessibleWrap.cpp => accessible/src/atk/ApplicationAccessibleWrap.cpp
rename : accessible/src/atk/nsApplicationAccessibleWrap.h => accessible/src/atk/ApplicationAccessibleWrap.h
rename : accessible/src/base/nsApplicationAccessible.cpp => accessible/src/generic/ApplicationAccessible.cpp
rename : accessible/src/base/nsApplicationAccessible.h => accessible/src/generic/ApplicationAccessible.h
rename : browser/devtools/webconsole/test/browser_gcli_integrate.js => browser/devtools/shared/test/browser_gcli_integrate.js
rename : browser/devtools/webconsole/test/browser_gcli_web.js => browser/devtools/shared/test/browser_gcli_web.js
rename : security/manager/ssl/src/nsNSSIOLayer.cpp => security/manager/ssl/src/TransportSecurityInfo.cpp
rename : security/manager/ssl/src/nsNSSIOLayer.h => security/manager/ssl/src/TransportSecurityInfo.h
2012-04-30 12:53:32 -07:00
Jacek Caban
ab7b61f390
Bug 733708 - gfx/layers fail to compile on mingw r=bas
...
--HG--
extra : rebase_source : 4ed99a22f66a20e4c6d2d7096396f6b2c261e63e
2012-05-21 11:03:23 +02:00
Chris Lord
0b684f98c7
Bug 758620 - Fix abort caused by unchecked clamping. r=ajuma
...
The initial values set for the offset for fixed position layers could clamp
with a max < min. This was due to a slightly incorrect min, but also because
it should have set these values in the else block of a later if that did a
range check on these values.
2012-07-04 15:56:49 +01:00
Ehsan Akhgari
e4d2d195ad
Backout changeset 89f35d1fea6c (bug 539356) because of performance and correctness regressions
2012-07-03 20:32:33 -04:00
Ehsan Akhgari
03f92ed057
Backout changeset 75419010ac02 (bug 539356) because of performance and correctness regressions
2012-07-03 20:31:54 -04:00
Ehsan Akhgari
15926d8730
Backout changeset 2c411daf6633 (bug 539356) because of performance and correctness regressions
2012-07-03 20:27:47 -04:00
Ehsan Akhgari
e13dc32085
Backout changeset d97bd4246317 (bug 539356) because of performance and correctness regressions
2012-07-03 20:26:18 -04:00
Ehsan Akhgari
5c63bf26a2
Backout changeset bd0a91621ea9 (bug 539356) because of performance and correctness regressions
2012-07-03 20:25:57 -04:00
Ehsan Akhgari
6ef72aef93
Backout changeset f568fc280fb0 (bug 539356) because of performance and correctness regressions
2012-07-03 20:24:55 -04:00
Ehsan Akhgari
ee77eaaad9
Backout changeset 65410094add4 (bug 539356) because of performance and correctness regressions
2012-07-03 20:19:18 -04:00
Ehsan Akhgari
0138ec138a
Backout changeset cb1ac88bedc2 (bug 539356) because of performance and correctness regressions
2012-07-03 20:14:11 -04:00
Ehsan Akhgari
0183c5d8cd
Backout changeset ef4557011ad3 (bug 539356) because of performance and correctness regressions
2012-07-03 20:13:38 -04:00
Ehsan Akhgari
775f4e511e
Backout changeset a9ae09d4f1d8 (bug 539356 part 30) because DLBI is being backed out
2012-07-03 19:41:27 -04:00
Nicolas Silva
6390c39a42
Bug 769294 - Fix crash when trying to dump layers in the console. r=joedrew
2012-06-28 11:23:40 -04:00
Robert O'Callahan
efc9c0e607
Bug 539356. Part 30: Call correct HasShadowManager method. Fixing Win mochitest-2 bustage. r=the-wind
2012-07-01 00:21:39 +12:00
Matt Woodrow
cd11452cad
Bug 539356 - Part 21 - BasicLayers should always retain content. r=roc
2012-06-30 15:06:13 +12:00
Oleg Romashin
54721f863f
Bug 539356 - Part 20 - Simplify regions to avoid excessive region calculation. r=roc
2012-06-30 15:06:13 +12:00
Matt Woodrow
56a4c51474
Bug 741682 - Disable component alpha layers with BasicLayers. r=roc
2012-06-30 15:06:12 +12:00
Matt Woodrow
1f0dbc7c74
Bug 539356 - Part 9 - Implement DLBI. r=roc,bz,jwatt
2012-06-30 15:06:11 +12:00
Matt Woodrow
69d08d71a9
Bug 539356 - Part 8b - Move painting of retained layers to the view manager flush, and only composite on the paint event. r=roc
2012-06-30 15:06:10 +12:00
Matt Woodrow
d59a49c9a9
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
Matt Woodrow
4e1295308d
Bug 539356 - Part 6 - Add compositing paint flashing to BasicLayers. r=roc
2012-06-30 15:06:10 +12:00
Matt Woodrow
8487f7b12f
Bug 539356 - Part 2 - Add new API to BasicLayers. r=roc
2012-06-30 15:06:09 +12:00
Matt Woodrow
eb7d17c374
Bug 539356 - Part 1 - Allow LayerManagers to have multiple user data objects. r=roc
2012-06-30 15:06:09 +12:00
Nicholas Cameron
10a445c328
Bug 768723; Reorganise BasicLayers.cpp into multiple files; r=roc
...
--HG--
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicCanvasLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicColorLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicImageLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayerManager.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.h
extra : rebase_source : aff7ec0b95a70e00149d2d9ea2856f9192dbc7f6
2012-06-29 18:01:34 +12:00
Ed Morley
01d2ddd5d5
Backout 5c35cd6f3ea4 & ba39b0822992 (bug 607417) for native Android R1 failures
2012-05-04 14:26:09 +01:00
Chris Lord
d8f77ad734
Bug 607417 - Reconcile async scrolling for fixed position layers. r=ajuma
...
Untranslate fixed position layers when doing async scrolling so that they don't
jump about as content re-renders them in the correct place.
--HG--
extra : rebase_source : 709a9b14b5301bb675e118859090e6fb1c0f26f9
2012-05-04 17:04:15 +12:00
Robert O'Callahan
8d789110c9
Bug 607417. Improve definition of the 'fixed layer' flag. r=tnikkel
...
--HG--
extra : rebase_source : f68d53736e65c21a30a6248abe6b2b9ec32cdb17
2012-05-04 17:00:57 +12:00
Robert O'Callahan
65e34332be
backing out patches for bug 607417 due to build bustage
2012-05-04 17:29:05 +12:00
Chris Lord
675c02dfe0
Bug 607417 - Reconcile async scrolling for fixed position layers. r=ajuma
...
Untranslate fixed position layers when doing async scrolling so that they don't
jump about as content re-renders them in the correct place.
2012-05-04 17:04:15 +12:00
Robert O'Callahan
9367097525
Bug 607417. Improve definition of the 'fixed layer' flag. r=tnikkel
2012-05-04 17:00:57 +12:00
Chris Lord
cf4f8d7c5f
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
Phil Ringnalda
97b3be524b
Backout 8b3b879bc63f (Bug 777463), 32cc8084d1b7 (Bug 775451), ce9014442e13:4d52cfac7c37 (Bug 779572), b33f2b2dbbc5:963aed158547 (Bug 775463), 36832ad5ea65 (Bug 780210), 10695750e4e9:a2afc5b5e538 (Bug 775448), c9f42eebd694 (Bug 775447) for Linux bustage
2012-08-07 20:40:48 -07:00
Doug Sherk
e181f6be38
Bug 775451: Reduce diagonal checkerboarding r=cjones
2012-08-07 18:51:15 -07:00
Doug Sherk
daa347f70b
Bug 779572: Properly protect state in AsyncPanZoomController with a monitor r=cjones
2012-08-07 18:51:13 -07:00
Doug Sherk
01a75d4dec
Bug 779572: Factor zoom into min pan distance before moving the viewport r=cjones
2012-08-07 18:51:11 -07:00
Doug Sherk
510ae34328
Bug 775463: Implement tolerance in double tap detection r=cjones
2012-08-07 18:51:10 -07:00
Doug Sherk
2723d5bbda
Bug 775463: Implement double-tap-to-zoom content r=cjones
2012-08-07 18:51:08 -07:00
Doug Sherk
54f9994afe
Bug 780210: Fix B2G focus point calculation for pinching r=kats
2012-08-07 18:51:05 -07:00
Doug Sherk
bc1275627a
Bug 775448: Add gesture cancelling support during sync subframe scrolling r=cjones
2012-08-07 18:51:03 -07:00
Doug Sherk
10f1ad1f2a
Bug 775448: Disable async scrolling when we detect a scrollable subframe r=cjones
2012-08-07 18:51:02 -07:00
Doug Sherk
b46b71535a
Bug 775447: Properly count number of touch listeners in AsyncPanZoomController r=cjones
2012-08-07 18:51:00 -07:00
Chris Lord
bd93048cf7
Bug 775431 - Make MOZ_DUMP_PAINT_LIST output terminal-friendly. r=mattwoodrow
...
Only output in HTML if we're dumping to a file, otherwise output as it did
before the HTML output change was made.
2012-08-07 18:57:26 +01:00
David Anderson
33cb582413
Merge from mozilla-central.
...
--HG--
rename : accessible/src/base/nsFormControlAccessible.cpp => accessible/src/generic/FormControlAccessible.cpp
rename : accessible/src/base/nsFormControlAccessible.h => accessible/src/generic/FormControlAccessible.h
rename : accessible/src/html/nsHTMLFormControlAccessible.cpp => accessible/src/html/HTMLFormControlAccessible.cpp
rename : accessible/src/html/nsHTMLFormControlAccessible.h => accessible/src/html/HTMLFormControlAccessible.h
rename : accessible/src/xul/nsXULFormControlAccessible.cpp => accessible/src/xul/XULFormControlAccessible.cpp
rename : accessible/src/xul/nsXULFormControlAccessible.h => accessible/src/xul/XULFormControlAccessible.h
2012-04-18 10:23:31 -07:00
David Anderson
949a078989
Merge from mozilla-central.
...
--HG--
rename : accessible/src/base/nsARIAGridAccessible.cpp => accessible/src/generic/ARIAGridAccessible.cpp
rename : accessible/src/base/nsARIAGridAccessible.h => accessible/src/generic/ARIAGridAccessible.h
2012-04-11 14:37:59 -07:00
Joe Drew
20842f8db4
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
f28811574f
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
Benoit Girard
973521416c
Bug 748649 - Allow layer transactions that don't require a buffer swap to be perform asynchronously. r=cjones
...
--HG--
extra : rebase_source : b0d11710119eb87cef8f461ece44baaba88f7477
2012-05-01 15:23:39 -04:00
Bas Schouten
ce1e20d908
Bug 749482: Fix assertion in SetRemoteImageData. r=roc
2012-05-01 23:46:53 +02:00
David Anderson
31bb169fde
Merge from mozilla-central.
2012-04-04 13:40:49 -07:00
David Anderson
bebb7bdc7b
Merge from mozilla-central.
2012-04-03 17:54:29 -07:00
Robert O'Callahan
06747b8dac
Bug 664918. Part 6: ImageContainer::GetCurrentAsSurface shouldn't crash when mActiveImage is null. r=bas
2012-04-30 15:11:47 +12:00
Chris Lord
9b4791fda0
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
Matt Woodrow
885ef2c84c
Bug 735178 - Add error tolerance values when sorting preserve-3d layers. r=roc
2012-04-27 12:24:53 +12:00
Matt Woodrow
79fed68860
Bug 735178 - Add debug coloring of sorted 3d layers to help identification. r=roc
2012-04-27 12:24:53 +12:00
Kartikaya Gupta
4acaf02b8d
Bug 746120 - Transform the root layer even if not scrollable so it doesn't cause separation of layers. r=ajuma
2012-04-26 15:24:06 -04:00
Chris Lord
07470e550b
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
Oleg Romashin
1810600f2e
Bug 750276 - Make CompositorParent transforms not android-only. r=ajuma
2012-04-30 17:03:26 -07:00
Daniel Holbert
ed998a5aaa
Bug 750356: fix signed/unsigned comparison build warnings in ReusableTileStoreOGL.cpp. r=chrislord
2012-04-30 15:47:42 -07:00
Benoit Girard
7e14831de1
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
eb5204fb96
Bug 749357 - TiledThebesLayerOGL can draw un-rendered areas of tiles. r=chrislord
2012-04-30 10:19:17 -04:00
Ali Juma
24fd33ba42
Bug 737437 - Post a task to handle compositor destruction. r=bgirard
2012-03-30 15:43:11 -04:00
Ali Juma
be583b5cab
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
f4fc3a2565
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
60dfdc3a1d
Bug 741730 - Remove USE_GLES2 - r=romaxa
2012-04-10 11:49:21 -04:00
Wes Johnston
d605226018
Backed out changeset f5d6cc2e4726
2012-04-09 10:44:32 -07:00
Wes Johnston
19dd5922a5
Bug 740218 - Support transactions in sqlitebridge and use them. r=gcp,rnewman,lucasr
2012-04-09 10:08:37 -07:00
Bas Schouten
12b9c87e20
Bug 738413 - Followup: Move ToIntRect to a Rect class method. r=roc
2012-05-03 23:41:37 +02:00
Bas Schouten
79cfec2c9d
Bug 738413 - Part 2: Use OpaqueRect API in BasicLayers with non-cairo contexts. r=roc
2012-05-03 23:31:02 +02:00
Benoit Jacob
dd4611db33
Backing out bug 739648 for linux build failure
2012-05-03 16:26:04 -04:00
Benoit Jacob
8560bfdefa
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
David Anderson
36cbca6efd
Merge from mozilla-central.
2012-03-30 18:40:08 -07:00
David Anderson
b654488bda
Merge from mozilla-central.
2012-03-27 12:48:33 -07:00
David Anderson
dccded1603
Merge from mozilla-central.
...
--HG--
rename : dom/system/nsDeviceMotion.cpp => dom/system/nsDeviceSensors.cpp
rename : dom/system/nsDeviceMotion.h => dom/system/nsDeviceSensors.h
2012-03-26 14:17:28 -07:00
Jeff Gilbert
cdb18186e9
Bug 735378 - Cache temporary composite surfaces - r=bgirard
2012-03-25 12:50:26 -07:00
George Wright
562e45f8f0
Bug 728284 - Main container layer has siblings that are drawn in the background. r=bgirard
2012-03-29 14:07:45 -04:00
Phil Ringnalda
fc2d95cb25
Back out 7bffc102114e (bug 737437) for Android native talos bustage
2012-03-29 08:26:58 -07:00
Ali Juma
1734bbd72b
Bug 737437 - Destroy the compositor's layer manager before the CompositorChild gets destroyed. r=cjones
2012-03-29 09:59:22 -04:00
David Anderson
8e15bb428d
Merge from mozilla-central.
2012-03-23 14:50:35 -07:00
Matt Brubeck
74ec9d09ab
Back out 636349fa2e09 because of robocop failures
2012-03-22 19:07:42 -07:00
Oleg Romashin
67d8714fd8
Bug 739095 - Offscreen context without offscreen texture does not need YFlip. r=jgilbert
2012-03-26 12:56:10 -04:00
Jeff Gilbert
0bb6ff2747
Bug 735378 - Cache temporary composite surfaces - r=bgirard
2012-03-22 15:04:25 -07:00
Chris Jones
5138518644
Bug 738158, part 2: Set the wrap mode for cairo images. r=ajuma
2012-03-22 01:02:59 -07:00
Chris Jones
7787759b9c
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
David Anderson
1dc18fa6e1
Merge from mozilla-central.
2012-03-21 15:35:48 -07:00
Chris Jones
95f474b611
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
David Anderson
41df49806f
Merge from mozilla-central.
...
--HG--
rename : toolkit/components/places/tests/unit/test_favicons.js => toolkit/components/places/tests/favicons/test_favicons.js
2012-03-20 14:43:39 -07:00
Daniel Holbert
26b9ef1360
backout 1383ac50bcff (bug 723484) for remote image & occasional 'load failed: null' in reftest reference case
2012-03-20 10:22:53 -07:00
Ali Juma
eac3276684
Bug 735230 - Part 1: Add Pause and Resume messages to PCompositor. r=bgirard
2012-03-28 18:00:10 -04:00
Chris Lord
3f7ec4f974
Bug 739604 - Check if output file is valid before printing. r=mattwoodrow
...
Check that gfxUtils::sDumpPaintFile isn't NULL before calling print functions
in Layers.cpp:WriteSnapshotToDumpFile_internal().
2012-03-28 19:10:22 +01:00
Robert O'Callahan
16c1e56be3
Bug 723484. Fix alpha values for image layers with opacity. r=bas
2012-03-20 20:55:40 +13:00
David Anderson
988a7e7cca
Merge from mozilla-central.
...
--HG--
rename : js/src/jsfun.cpp => js/src/vm/ArgumentsObject.cpp
2012-03-19 14:13:34 -07:00
Oleg Romashin
099abf17ab
Bug 736875 - Compositor perf warning need to be filtered up to 15ms. r=bgirard
2012-03-19 12:55:37 +01:00
Robert O'Callahan
5663697d35
Bug 700867. Don't allow rotation when we're drawing a BasicThebesLayer that needs to be drawn atomically. r=tnikkel
2012-03-19 13:01:47 +13:00
Robert O'Callahan
4ba1788a98
Bug 664764. Part 2: Make PushGroupWithCachedSurface always return a valid context even if getting the cached surface fails. r=mattwoodrow
2012-03-19 12:36:28 +13:00
Robert O'Callahan
77d91a3428
Bug 664764. Part 1: Change assertion to warning since it can happen due to resource exhaustion. r=mattwoodrow
2012-03-19 12:36:22 +13:00
Robert O'Callahan
0fde3c49ad
Bug 723484. Fix alpha values for image layers with opacity. r=bas
2012-03-20 20:55:40 +13:00
David Anderson
950ea396cf
Merge from mozilla-central.
2012-03-15 17:21:05 -07:00
Andreas Gal
ac82c60a6f
Remove unused and broken tiling code (bug 736716, r=cjones).
2012-03-17 15:22:22 -07:00
Andreas Gal
7f4ec61fd0
Backout bug 736716.
2012-03-17 15:20:01 -07:00
Andreas Gal
b0c0acf59c
Follow-up fix for bug 736716 (fix bad style fix).
2012-03-17 15:07:22 -07:00
Andreas Gal
089ef250fc
Remove unused and broken tiling code (bug 736716, r=cjones).
2012-03-17 15:02:02 -07:00
Benoit Girard
22c8bc2123
Bug 736743 - Fix LayerManagerOGL Description. r=ajuma
2012-03-17 12:44:45 -04:00
Ali Juma
3d5d0929d4
Bug 735600 - Don't composite when the layer tree is empty. r=bgirard
2012-03-14 10:54:34 -04:00
David Anderson
ab6d9d70dd
Merge from mozilla-central.
2012-03-13 16:10:05 -07:00
Chris Lord
1c2dd7f8ef
Bug 732756 - Fix overdrawing of checkerboard. r=kats
...
Fix overdrawing of the checkerboard layer by letting layers have a concept of
a display-port, and keeping the root layer's display port in track with
Gecko's.
2012-03-17 15:08:22 +00:00
Chris Lord
12c7521973
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
9a92b22aca
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
7b663980b2
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
Chris Lord
0f78f77b63
Bug 732917 - Remove ShadowLayers::ShouldDoubleBuffer. r=cjones
...
This function has been unused since bug #690469 .
2012-03-17 12:06:29 +00:00
Benoit Girard
32745d1cc3
Merge mc->Maple
2012-03-13 11:05:28 -04:00
Ehsan Akhgari
dfa138382a
Backout changeset b52bae0250f7 because of test failures
2012-03-12 18:51:17 -04:00
Ali Juma
7013e73a7b
Bug 725095 - Address GFX review comments. r=joe
2012-03-12 16:32:02 -04:00
Benoit Girard
803f0eba61
Bug 712716 - Fix AndroidGraphicBuffer resource management. r=snorp,jmuizelaar
2012-03-12 16:28:02 -04:00
Ali Juma
ad33d5e44d
Bug 732091 - Part 5: Make the compositor notify Java when the page size changes or when a first paint occurs. r=bgirard
2012-03-12 11:50:27 -04:00
Ali Juma
f8d6403787
Bug 732091 - Part 3: Pass on the isFirstPaint flag from the PresShell to the compositor via the layer manager. r=tnikkel,bgirard
2012-03-12 11:50:15 -04:00
Ali Juma
def0c0bab3
Bug 732091 - Part 1: Add an isFirstPaint bool to PLayers update. r=bgirard
2012-03-12 11:50:07 -04:00
Bas Schouten
841d83e5a0
Bug 732988 - Part 1: Add ScaleToSize API to ImageLayers. r=roc
2012-03-13 01:41:29 +00:00
Jeff Gilbert
1c94bfeca7
Bug 729702 - Use ReadPixelsIntoImageSurface in CopyToTarget instead of duplicating functionality - r=BenWa
2012-03-12 18:42:02 -07:00
Ali Juma
fc63f05edc
Bug 694964 - Don't generate a Thebes Paint edit in an incomplete transaction. r=bgirard
2012-03-30 09:25:20 -04:00
Mats Palmgren
08ba65e8eb
Fix build bustage from rev 24f3dd5529bb (Bug 607417). r=bustage
2012-05-26 13:32:57 +02:00
Chris Lord
063f625ae2
Bug 607417 - Reconcile async scrolling for fixed position layers (part 2). r=ajuma
...
Part of this patch got lost in a rebase, this completes it.
Untranslate fixed position layers when doing async scrolling so that they don't
jump about as content re-renders them in the correct place.
2012-05-26 11:43:41 +01:00
Takanori MATSUURA
5c9f3f4809
Bug 751521 - Separate pixman detection from cairo. r=glandium
2012-05-26 08:44:00 +02:00
Kan-Ru Chen
4509acf05c
Bug 743182 - Use gfxPlatform::OptimalFormatForContent everywhere. r=joedrew
2012-05-26 12:38:17 +08:00
Phil Ringnalda
133797c58e
Back out 8bc719810cd5 (bug 757380) and 3f93e4add42b (bug 757933) for mochitest-4 assertions
2012-05-24 19:56:42 -07:00
Oleg Romashin
ad11357a1a
Bug 757380 - BasicLayers Paint ignore NULL Clip when render with groupTarget. r=bas, r=roc
2012-05-24 18:36:22 -07:00
Benoit Girard
0f0612ce47
Merge mc->Maple
2012-03-07 11:10:45 -05:00
Nicholas Cameron
9e4ceaecb8
Back out bug 746883, bug 764125, bug 761895, bug 746883, bug 748116
2012-07-26 18:48:24 +12:00
Nicholas Cameron
800f256f44
Bug 746883; fix the bustage possibly caused by 746896. r=mattwoodrow
2012-07-26 14:30:20 +12:00
Nicholas Cameron
65cef0593d
Bug 764125; remove AzureEnabled from gfxInfo and replace with backend check. r=roc
2012-07-26 13:56:42 +12:00
Nicholas Cameron
c93adeeed1
Bug 764125; sort out preferred and fallback Azure backends for all platforms (gfxPlatform). r=Bas
2012-07-25 12:45:58 +12:00
Benoit Girard
8461970bfc
Bug 733184 - Remove more logging from widget. r=pcwalton
2012-03-05 19:58:18 -05:00
Benoit Girard
7de784afd9
Bug 733113 - Maple: Remove debug logging. r=ajuma
2012-03-05 16:10:43 -05:00
Benoit Girard
9c04adc27f
Bug 717958 - Always read FPS pref on the main thread with OMTC. r=ajuma
2012-03-05 14:02:22 -05:00
Benoit Girard
392ef78337
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
18b1521f00
Restore merge changeset 39a3044823b0, regression fixed upstream in mc
2012-03-05 13:09:05 -05:00
Benoit Girard
b24e1949c2
Backed out changeset 39a3044823b0 because of bad interaction with maple.
2012-03-02 18:32:46 -05:00
Benoit Girard
77a9a7b782
Merge mc->Maple, resolved conflicts
2012-03-02 14:27:05 -05:00
David Anderson
2d8a2de603
Merge from mozilla-central.
2012-03-06 14:08:51 -08:00
David Anderson
86c356fa7a
Merge from mozilla-central.
...
--HG--
rename : intl/locale/public/nsICharsetAlias.h => intl/locale/public/nsCharsetAlias.h
rename : intl/locale/src/nsCharsetAliasImp.cpp => intl/locale/src/nsCharsetAlias.cpp
2012-03-05 17:50:51 -08:00
David Anderson
bf5935099a
Merge from mozilla-central.
2012-03-02 12:10:27 -08:00
Joe Drew
180a1da805
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
David Anderson
3ce895b5b5
Merge from mozilla-central.
...
--HG--
rename : toolkit/components/feeds/nsScriptableUnescapeHTML.cpp => parser/html/nsParserUtils.cpp
2012-02-28 12:21:56 -08:00
Kartikaya Gupta
d5c3b7e98b
Merge m-c again to pick up 75deec1f1a7b
2012-02-28 14:37:26 -05:00
Benoit Girard
5582ac1cee
More render trace. r=debug_only
...
--HG--
extra : rebase_source : b20e2e6e7469433ee6148c8fa0a7dd0c0ca21009
2012-02-28 11:24:24 -05:00
Benoit Girard
8c7d03cc7c
Bug 755452 - Don't re-invalidate region to paint in BasicTiledLayerBuffer::PaintThebes. r=roc
...
--HG--
extra : rebase_source : 0e66b6a2cd4c741fe7d70c3ccd82aa1283a64034
2012-05-15 16:34:06 -04:00
Marco Castelluccio
09e2e875f5
Bug 703484 - Allow OMTC to be used with basic layers. r=bgirard
2012-05-15 15:56:56 -04:00
Nicolas Silva
fb2d26335c
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
Chris Lord
42df6b85a3
Bug 758620 - Respect the Layers' anchor points in CompositorParent. r=ajuma
...
When asynchronously zooming, respect a Layer's anchor point so that it stays in
the correct position.
2012-06-27 16:44:22 +01:00
Chris Lord
f52875b4e5
Bug 758620 - Force fixed-position frames to have their own layers. r=roc
...
Introduce a new display-list item 'nsDisplayFixedPosition' that represents
fixed-position elements. This item cannot be merged, which forces fixed
position elements to have their own layer, and has a BuildLayer implementation
that sets the necessary metadata on a Layer to be able to maintain its
position correctly during composition when asynchronously panning and zooming.
2012-06-27 16:43:57 +01:00
Benoit Girard
a9a9772362
Added more rendertrace breakdowns
2012-02-27 14:31:29 -05:00
Benoit Girard
b31f45d2f0
Improve RenderTrace. r=debug
...
--HG--
extra : rebase_source : a01b6e678bca01848fe124b839c0e5433866fa58
2012-02-24 17:41:16 -05:00
Benoit Girard
9d0e9c74ef
Rendertrace improvements. r=runtime_config_only
2012-02-24 11:35:04 -05:00
Jacek Caban
3608ba0206
Bug 756996 - GCC warnings in gfx/2d r=bas
2012-06-04 13:02:02 +02:00
Andreas Gal
d3eef34feb
Bug 714408 Part 2 - Media plugin support for libstagefright - r=doublec
...
--HG--
extra : rebase_source : 308d1aab3cfffbb7ddeb0602a3991565603e6212
2012-06-01 12:54:23 +12:00
Jeff Muizelaar
8094c9788d
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
Ed Morley
698a10580d
Backout fa3fe2aff1f5 (bug 756996) for bustage
2012-05-31 15:46:38 +01:00
Jacek Caban
2a959813ec
Bug 756996 - GCC warnings in gfx/2d r=bas
2012-05-31 16:09:20 +02:00
Daniel Holbert
331a6340f6
Backout 4b46f6eff8f4 (Bug 732988) for linux Cipc orange
2012-03-11 16:43:12 -07:00
Bas Schouten
891f5531b5
Bug 732988 - Part 1: Add ScaleToSize API to ImageLayers. r=roc
2012-03-11 22:33:22 +00:00
Benoit Girard
0eac7fe3b7
Bug 728352 - Implement a render trace utility for GFX perf & debugging. r=mattwoodroow
2012-03-05 15:17:13 -05:00
Benoit Girard
f9eaee1ae0
Bug 717958 - Always read FPS pref on the main thread with OMTC. r=ajuma
2012-03-05 14:02:22 -05:00
Jeff Muizelaar
ea3be680bd
Remove ifdefs from RenderTrace and enable it on composite
...
--HG--
extra : rebase_source : 6d6af824d02b90ac0e43855ce179aa0233b40c5b
2012-02-21 20:20:14 -05:00
Benoit Girard
8157d36f9f
Disable rendertrace by default (adb lolcat slowdown)
2012-02-21 11:34:10 -05:00
Ali Juma
03d84bc9ee
Only try to scroll scrollable layers, and force Gecko to generate a scrollable layer even for smaller pages.
2012-02-20 11:30:05 -05:00
Bas Schouten
19df465dd3
Bug 740815 - Part 3: Use component alpha rendering when required and drawing content with Azure. r=jrmuizel
2012-04-03 22:25:52 +02:00
Bas Schouten
86eb93cc3b
Bug 740815 - Part 2: Generalize code for filling component alpha surfaces with opaque colors. r=jrmuizel
2012-04-03 22:25:52 +02:00
Nicholas Cameron
9e43179755
Bug 716439; compile OGL shaders lazily. r=BenWa
2012-05-02 14:54:40 +12:00
Nicholas Cameron
0413e14a8f
Bug 716439; shadow layer support. r=BenWa
2012-03-19 12:02:38 +13:00
Nicholas Cameron
4636d66fbb
Bug 716439; change build process to genshaders statically. r=BenWa
2012-03-27 11:13:34 +13:00
Nicholas Cameron
04cd642d51
Bug 716439; using mask layers in OGL. r=BenWa
2012-03-19 09:08:53 +13:00
Nicholas Cameron
5cc1397fe6
Bug 716439; load a mask texture in the OGL backend. r=BenWa
2012-03-19 09:08:49 +13:00
Nicholas Cameron
446bb86751
Bug 716439; managing mask layer shaders in OpenGL. r=BenWa
2012-03-19 09:07:25 +13:00
Nicholas Cameron
3849921577
Bug 716439; shaders for OpenGL mask layers. r=BenWa
2012-03-19 09:07:25 +13:00
Nicholas Cameron
059fcb1038
Bug 716439; shaders for the dx9 backend. r-Bas
2012-03-07 10:09:19 +13:00
Nicholas Cameron
fa43179112
Bug 716439; c++ support for the shaders and textures for dx9 backend. r-Bas
2012-03-07 10:07:48 +13:00
Nicholas Cameron
69669ee102
Bug 716439; using masks in each of the dx9 backend layers. r-Bas
2012-03-07 10:07:48 +13:00
Nicholas Cameron
1a1d9b947e
Bug 716438; using flags to select a shader. r=Bas
2012-03-01 17:29:30 +00:00
George Wright
7382e27ea3
Bug 721489 - Older Adreno 200 drivers intermittently crash when uploading RGB565 textures with glTexImage2D - r=jrmuizel
2012-02-18 21:23:06 -05:00
Ali Juma
24c78a83e6
Fix non-Android bustage.
2012-02-17 19:41:16 -05:00
Ali Juma
5c0f454c22
Clean up the compositor's transformation calculations.
2012-02-17 17:58:03 -05:00
Benoit Girard
afec18a35e
Preliminary render trace
2012-02-17 17:05:03 -05:00
Kartikaya Gupta
f3c1b6a928
Put back some things left out of dougt's merge
2012-02-17 01:36:49 -05:00
Doug Turner
b66a0f8126
Merge with mozilla-central
2012-02-16 18:06:54 -08:00
David Anderson
8b50c1ee36
Merge from mozilla-central.
2012-02-16 15:06:30 -08:00
Nicholas Cameron
eac598ef43
Bug 716439; dx10 shaders for mask layers. r=Bas
2012-02-16 12:34:28 +13:00
Nicholas Cameron
066b53a0d9
Bug 716439; Using mask layer shaders in DX10. r=Bas
2012-02-16 12:34:25 +13:00
Nicholas Cameron
8a3481fe55
Bug 716439; Loading a mask layer to textures in DX10. r=Bas
2012-02-16 12:34:23 +13:00
Timothy B. Terriberry
443099c3f1
Bug 726580, Stop shadowing PlanarYCbCr::mOffscreenFormat, r=bas
2012-02-15 14:32:11 -08:00
Benoit Girard
5a75c7871e
Bug 732552 - Remove void return in ColorLayerOGL. r=ajuma
2012-03-02 15:36:30 -05:00
David Anderson
7659e2e097
Merge from mozilla-central.
...
--HG--
rename : content/media/nsMediaStream.cpp => content/media/MediaResource.cpp
rename : content/media/nsMediaStream.h => content/media/MediaResource.h
2012-02-15 13:45:39 -08:00
Matt Woodrow
a7e5ef01f1
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
Benoit Girard
567f149d32
Fix one shutdown crash
...
--HG--
extra : rebase_source : dd71617cbabf7848565ab609362964037fbac01a
2012-02-15 11:29:14 -05:00
Ali Juma
70b876af83
Improve zooming behaviour.
2012-02-15 10:15:52 -05:00
Matt Woodrow
d3135bba63
Bug 724025 - Correctly flatten transform-style:flat with BasicLayers. r=roc
2012-02-15 22:28:22 +13:00
Matt Woodrow
9fbf1226cb
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
David Zbarsky
b59e0492e0
Bug 776401 Part 2: Add animation to the layer and then add segments directly to it r=roc
2012-08-20 09:35:42 -04:00
David Zbarsky
724b4882ac
Bug 783835 - Compositor needs to know the css property being animated r=roc
2012-08-20 09:35:41 -04:00
Karl Tomlinson
c45040f5fe
b=780059 tidy up API for FindVisualAndDepth r=mattwoodrow
...
--HG--
extra : rebase_source : c6022bd51aad41b7439531e7c3db1725aabda5e7
2012-08-20 16:20:37 +12:00
Matt Woodrow
430eb94bb3
Bug 782372 - Fix clang build. r=nical
2012-08-20 14:39:10 +12:00
David Zbarsky
b36047e59c
Bug 783841 - Fix build warnings in layers r=cjones
2012-08-19 20:07:31 -04:00
Nicolas Silva
54dd2bf57f
Bug 782372 - Splits ImageLayers.h into ImageLayers.h ImageContainer.h and ImageTypes.h, r=bgirard
2012-08-19 15:33:25 -04:00
Chris Jones
ec68513835
Bug 782411: Work around having multiple compositors when -jsconsole is used. r=ajuma
2012-08-16 13:23:24 -07:00
Kan-Ru Chen
0fdb67a324
Bug 757341 - Camera direct texturing with async video. r=cjones
2012-08-17 18:56:55 +08:00
Kan-Ru Chen
11da9f86fc
Bug 757341 - Move GonkIOSurfaceImage to its own header. r=roc
2012-08-17 18:56:49 +08:00
Matt Woodrow
22aafcc6f2
Bug 778036 - Only mark Layers as Mutated if the property values are different. r=roc
2012-08-07 15:00:41 +12:00
Matt Woodrow
53ce1b3577
Bug 778036 - Retain RefLayers instead of creating them every frame. r=roc
2012-08-07 15:00:41 +12:00
Karl Tomlinson
bf312c647a
b=782185 use extend_pad when compositing image layers even for Quartz and X11 r=roc
...
--HG--
extra : transplant_source : %F7%24N%7E%E0y%C4%2C%D4%9B%DB%83B_Ai6%A1%7E%91
2012-08-14 23:47:49 +12:00
Oleg Romashin
537bc83192
Bug 778385 - We perform 32bpp slow video decoding on arm instead of 16bpp neon. r=joe
...
--HG--
extra : rebase_source : f045ae84ebb3ff07a7e59043065f396d5bd43dc0
2012-08-09 22:46:47 -04:00
Robert O'Callahan
8b57a3e190
Bug 708116. Factor out logic for updating the current frame of a video element into a helper object. r=doublec
2012-02-15 17:35:01 +13:00
Benoit Girard
612ce84d1f
remove dead code
2012-02-14 18:36:33 -05:00
Patrick Walton
1b46184a8f
Fix scissor rect and use the Java compositor's cached viewport metrics when drawing decorations
2012-02-13 20:20:38 -08:00
Benoit Girard
5ec8cb5563
Make OMTC changes not effect desktop
2012-02-13 17:17:12 -05:00