mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
473 624 коммитов 615 Ветки 98 Теги 5,7 GiB
Граф коммитов

7602 Коммитов

Автор SHA1 Сообщение Дата
Bas Schouten 8385c77c3e Bug 597320: Blacklist NVidia Optimus technology drivers for d3d9 layers. r=jrmuizel a=blocking-beta7 2010-09-17 18:57:46 +00:00
Oleg Romashin a0276bc2ac Bug 576437 - CreateOffscreenSurface should not silently translate ImageFormat24 into ImageFormat16_565. r=joe a=blocking2.0 2010-09-16 14:34:53 -07:00
Joe Drew edaafea0fe Fix mismerge. a=bustage 2010-09-17 11:17:32 -07:00
Matt Woodrow 81dfaaffd7 Bug 595938 - Garbage/overdrawing when using -moz-transform: Fix the clip rect before clearing the FBO. r=vlad a=b 
--HG--
extra : transplant_source : %FE%06%7Bq%F1%AE%F58%FFW%0Fr%A6W%DA%2B%8B%08%C1%89
 2010-09-13 21:30:00 -07:00
Matt Woodrow c4ea3060d4 Bug 594643 - Fix typo in ImageLayerOGL::SetData. r=joe a=b 
--HG--
extra : transplant_source : %B3%DC%24%EF%E8X%7D%C3A8%9F%9F%B2%C3o%87%B0d%24T
 2010-09-13 14:01:28 -07:00
Benoit Jacob a37e73a500 Bug 594874 - GfxInfo blocklist needs to be used by D3D, WebGL, OpenGL - 2/3 - r=vladimir 2010-09-16 12:45:19 -04:00
Benoit Jacob 39afae6c37 Bug 594874 - GfxInfo blocklist needs to be used by D3D, WebGL, OpenGL - 1/3 - r=vladimir 2010-09-16 12:45:15 -04:00
Benoit Jacob ee1bbcd8a8 Bug 596907 - Fix glScissor calls in ContainerLayerOGL - r=vladimir 2010-09-16 12:45:08 -04:00
Oleg Romashin 2d8c812a3a Bug 596769 - ShadowLayers not expecting Layer create/destruction during transaction. r=jones.chris.g a=approval2.0 2010-09-15 21:49:31 -07:00
Chris Jones 2d3753c877 Merge m-c --> cedar 2010-09-15 18:28:06 -05:00
Bas Schouten 8915449d83 Bug 596489 - Part 3: Recreate the layer manager when a device is removed. r=roc 2010-09-15 22:16:02 +00:00
Bas Schouten 3b157b7a00 Bug 596489 - Part 2: Expose when a device manager is removed. r=jrmuizel 2010-09-15 22:15:59 +00:00
Bas Schouten ade2ddb365 Bug 596489 - Part 1: Refactor DeviceManager ownership. r=jrmuizel 2010-09-15 22:15:56 +00:00
Bas Schouten 90d4b99c8d Bug 596419: Fix up layer destruction scheme. r=jrmuizel 2010-09-15 22:15:49 +00:00
Chris Jones 06ec6c6ee8 Merge m-c --> cedar 2010-09-15 16:44:30 -05:00
Chris Jones 166112f466 Bug 596542: Repainting a thebes layer with a non-1.0 resolution shouldn't (always) force buffer reallocs. r=roc 2010-09-15 16:03:13 -05:00
Chris Jones 2b12976c51 Merge m-c --> cedar 2010-09-14 14:28:39 -05:00
Chris Jones 7c1181632c Bug 570625, part 9: When updating thebes layers, swap out back/front buffers and invalidate the newly-painted region on the old front buffer. r=roc sr=shaver 2010-09-14 00:23:08 -05:00
Chris Jones 61979f9825 Bug 570625, part 8: Share Xlib surfaces across processes on X11 platforms. r=karl 2010-09-14 00:23:08 -05:00
Chris Jones 0cb7bd0628 Bug 570625, part 5: Mostly mechanically switch BasicShadowable/ShadowThebes over to the new SurfaceDescriptor API. r=roc 2010-09-14 00:23:08 -05:00
Chris Jones 433a837370 Bug 570625, part 4: Put support in place for allocating platform-specific backing buffers for IPC layers, and synchronizing properly during transactions (i.e. XSync() on X11). The platform-specific interfaces just default to Shmem in this patch. r=karl sr=shaver 2010-09-14 00:23:08 -05:00
Chris Jones f7bf383e15 Bug 570625, part 3: Add a SurfaceDescriptor IPDL union over all surfaces share-able to another process. r=roc sr=shaver 2010-09-14 00:23:08 -05:00
Chris Jones 413f96b038 Bug 570625, part 2: Add a SurfaceDescriptorX11 datatype that abstracts what's needed to share an Xlib surface to another process. r=karl sr=shaver 2010-09-14 00:23:08 -05:00
Chris Jones 7e002c08ab Bug 570625, part 1: Only use back/front buffers for BasicThebesLayer and update back->front in the compositor process. r=roc sr=shaver 2010-09-14 00:23:08 -05:00
Chris Jones f5894e967e Bug 570625, part 0: Don't throw out buffers when scrolling with a resolution applied. r=roc 2010-09-14 00:23:08 -05:00
Chris Jones 3f1c9a5b8a Bug 570625, part -1: ThebesLayerBuffer::SetBuffer needs to hold its ref to the old buffer. r=roc 2010-09-14 00:23:08 -05:00
Chris Jones d8f9eb58aa Merge m-c --> cedar 2010-09-13 19:24:09 -05:00
Bas Schouten dbb710b503 Bug 595154 - Part 4: Bail when texture lock fails. r=vlad a=b 2010-09-14 12:57:25 +02:00
Bas Schouten 9ff24ead27 Bug 595154 - Part 3: Recreate/update CanvasLayerD3D9 texture when needed. r=vlad 2010-09-14 12:57:03 +02:00
Bas Schouten 05782c80c6 Bug 595154 - Part 2: Clean CanvasLayerD3D9 resources when needed. r=jrmuizel 2010-09-14 12:56:56 +02:00
Bas Schouten 55b8afc7e5 Bug 595154 - Part 1: Generalize cleaning layer resources. r=jrmuizel 2010-09-14 12:56:39 +02:00
Oleg Romashin 8c88c718ff Merge with mozilla central 2779c55431a4, no conflicts 2010-09-10 22:32:25 -07:00
Vladimir Vukicevic fba30f2714 b=594892; [gl] force a real call to MakeCurrent after a widget is resized; r*=joe/jeff 
* * *
b=594892; merge fail
 2010-09-09 16:40:29 -04:00
Matt Woodrow 3d2ced7b82 b=594642; [gl] use scissor rect when drawing layers; r=vlad 2010-09-09 16:40:15 -04:00
Vladimir Vukicevic c4d22f2b89 b=594567; teach EGL backend about ANGLE for Layers; r=jrmuizel 2010-09-09 16:40:11 -04:00
Doug Turner e41b48044c Bug 594080 - On mobile, use nearest-neighbor interpolation when drawing BasicThebesLayers with a scale transform. r=roc a=cjones 2010-09-09 12:33:04 -07:00
Chris Jones 3b953ced69 Merge m-c --> cedar 2010-09-08 17:25:30 -05:00
Vladimir Vukicevic 0031e81e55 Bug 592462 - fix fullscreen video with OpenGL on Maemo with Qt. r=jmuizelaar. a=blocking-fennec 
--HG--
extra : rebase_source : 765979328a5337242c9b7a8bd837b92ed2ed4062
 2010-09-09 16:41:02 -07:00
Jeff Muizelaar acdcaa5b39 Bug 594187. ogl: Handle 0x0 widgets in Render(). r=vlad 
OpenGL doesn't like drawing to things without area so just bail.
 2010-09-07 19:59:47 -04:00
Chris Jones 7688c45243 Merge m-c --> cedar 2010-09-07 17:35:15 -05:00
Vladimir Vukicevic 1a13eb330a b=592462; [gl] followup, clear scissor region we're about to repaint; r=jrmuizel 2010-09-07 17:31:40 -04:00
Bas Schouten ddb91c6769 Bug 594624: Toss out surfaces on content type changes. r=jrmuizel a=blocking-beta6 2010-09-12 21:38:47 +02:00
Chris Jones a2c93af9b1 Bug 590294, part 8: Implement resolution-scaled drawing for basic layers. r=roc 2010-09-03 15:10:46 -05:00
Chris Jones f502883ffc Bug 590294, part 7: Add APIs for recording the resolution at which ThebesLayers were painted and for requesting resolution-scaled drawing for basic layers. r=roc sr=vlad 2010-09-03 15:10:46 -05:00
Chris Jones 0c28df6c86 Bug 590294, part 3: Keep ContainerLayer type info around in a few places. r=roc 2010-09-03 15:10:45 -05:00
Chris Jones 6480591e23 Bug 590294, part 2: Add a ContainerLayer attribute FrameMetrics that stores relevant information from layout/ on the root layer. r=roc sr=vlad 2010-09-03 15:10:45 -05:00
Chris Jones 1ef9f416ce Merge m-c --> cedar 
--HG--
rename : layout/style/test/hover_helper.html => layout/style/test/chrome/hover_helper.html
rename : layout/style/test/test_hover.html => layout/style/test/chrome/test_hover.html
 2010-09-03 14:07:55 -05:00
Matt Woodrow 95051089f9 b=593273, fix d3d9 layer manager crash on reftest shutdown, r=bas a=b 2010-09-03 14:07:59 -04:00
Joe Drew dbb9a82fc2 Bug 590841 - Add the ability for a DOM window to let us know when it's accelerated, and use that value in about:support. r=gavin sr=roc a=blocking2.0:beta6+ 2010-09-03 14:01:05 -04:00
Robert O'Callahan 418edf53e3 Fixing bustage, a=me 2010-09-03 16:20:23 +12:00
Chris Jones f2ee7d2dd8 Followup to bug 570294: Need to use OPERATOR_SOURCE for copying surface->surface. r=roc 2010-09-02 23:14:12 -05:00
Matt Woodrow 0fe2dd0835 Bug 590367 - Render RGB d2d layers with a RGBA surface and shader r=Bas, a=blocking2.0 2010-09-03 15:51:04 +12:00
Matt Woodrow e4a9dac062 Bug 593224 - ContainerLayerD3D9 can reset the clip rect r=Bas, a=blocking2.0 2010-09-03 15:50:53 +12:00
Matt Woodrow b5fb6a703c Bug 590735 - D3D9/OGL Image layers need to round up on uneven sized YCbCr images r=joe, a=blocking2.0 2010-09-03 15:50:42 +12:00
Matt Woodrow 47a5284310 Bug 589632 - Fix LayerManagerD3D9 debug output r=Bas, a=blocking2.0 2010-09-03 15:50:29 +12:00
Chris Jones 81e7d1c97a Bug 593248: Release old shmem surfaces on realloc. r=joe 2010-09-02 22:05:01 -05:00
Robert O'Callahan d070f2c342 Bug 579276. Part 13: Use CONTENT_COLOR for temporary surface in nonretained path, if possible. r=cjones 2010-09-03 14:31:42 +12:00
Robert O'Callahan ef6a01f479 Bug 579276. Part 12: Clip all drawing to the visible region on the nonretained path. r=cjones 2010-09-03 14:31:42 +12:00
Robert O'Callahan dc9e28789b Bug 579276. Part 11: Move ClipToRegion to gfxUtils. r=vlad 2010-09-03 14:31:42 +12:00
Robert O'Callahan c4801219d7 Bug 579276. Part 7: Don't retain transparent layers that would hurt text rendering. r=cjones 2010-09-02 21:18:41 +12:00
Robert O'Callahan be2d05f9a8 Bug 579276. Part 3: Change Set/IsOpaqueContent API to a more generic Get/SetContentFlags API. r=cjones,sr=vlad 2010-09-02 21:18:40 +12:00
Robert O'Callahan c649008789 Bug 579276. Part 1: Change layer/layermanager user data API to use keys and values. r=cjones,sr=vlad 2010-09-02 21:18:39 +12:00
Bas Schouten 575f0f6eee Bug 596152: Clear intermediate textures used with container layers. r=jrmuizel a=blocking-beta7 2010-09-15 17:00:42 +00:00
Robert O'Callahan c06ae165fe Bug 593361. Part 2. Don't bother trying to draw directly to the backbuffer instead of retaining ThebesLayer, if the backbuffer is transparent anyway. r=tnikkel 
--HG--
extra : rebase_source : 4a8d5833d6fab79147389a7c2f49f8653e90b9c5
 2010-09-06 15:02:43 +12:00
Robert O'Callahan 349f37cc97 Bug 593361. Part 1: Limit the region of a non-retained layer we repaint to the clip region of the destination buffer. r=tnikkel 
--HG--
extra : rebase_source : 20bea1e114bffe61bb621e7e99757cccd9fc98a0
 2010-09-06 15:00:10 +12:00
Bas Schouten f7a7d600cc Bug 590695: Don't check mDeviceEx when it doesn't exist. r=vlad a=blocking-beta6 2010-09-05 18:59:57 +02:00
Joe Drew a6a9e1fd22 Bug 593618 - Because we always paint the whole texture we're drawing to, we need to validate and draw the _bounds_ of the visible region, not just the visible region's subrectangles. r=bas a=blocking2.0:beta6+ 2010-09-05 01:31:19 -04:00
Bas Schouten 8ae2d33728 Bug 592024 - Don't clear shared D3D9/D2D surfaces in cairo_d2d_create_for_handle because D3D9 and D2D need a lot of synchronization points. Instead, put a clear in DrawRegion, which already has synchronization points. r=jrmuizel a=blocking 2010-09-02 15:07:26 -04:00
Matt Woodrow aaa21a504a Bug 587678 - Implement ImageLayerOGL::GetCurrentAsSurface for YUV surfaces. r=bas a=blocking2.0:beta6+ 2010-09-03 23:27:04 -04:00
Matt Woodrow 881a4c21e1 Bug 593530 - Don't leak the DeviceManagerD3D9 if initializing it fails. r=joe a=blocking2.0:beta6+ 2010-09-03 23:21:26 -04:00
Chris Jones 76dde2a6bc Merge m-c --> cedar 
--HG--
rename : layout/style/test/test_hover.html => layout/style/test/hover_helper.html
 2010-08-31 00:35:03 -05:00
Atul Apte 3551ca8cb1 Enable basic stereoscopic rendering support for D3D9 layers with 3D Vision. r=bas 2010-08-26 20:44:53 +00:00
Bas Schouten a98eb3997a Fix line endings in DeviceManagerD3D9. 2010-08-26 20:44:11 +00:00
Oleg Romashin 6e925ce155 Merged with mozilla-central: 00186bbb7459 2010-08-24 14:21:48 -07:00
Chris Jones f22350f2bc Bug 570620, part o: Connect the dots to enable drawing remote frames for <browser remote>: create the frame on the content side, insert a display item for it in compositor-side SubdocFrame, and use IPC-enabled layer managers to make it all work. r=mats sr=roc 2010-08-20 18:24:41 -05:00
Chris Jones 0e3d3aaf97 Bug 570620, part n: Hook layout/ipc into the build system, and integrate PRenderFrame into the PBrowser family. sr=bsmedberg 2010-08-20 18:24:41 -05:00
Chris Jones b4c4c02965 Bug 570620, part i: Implement ShadowLayer::Disconnect() for common-case shutdown, and ShadowableLayer::Disconnect() for emergency-case shutdown. r=vlad 2010-08-20 18:24:41 -05:00
Chris Jones 16b9e25f92 Bug 570620, part h: Add a Layer::Disconnect interface. sr=vlad 2010-08-20 18:24:41 -05:00
Chris Jones 03c4f01c8b Bug 570620, part g: Fix bone-headed bugs with shadowable layers, remove unnecessary MOZ_LAYER_DECL_NAME()s, and have the "shadow layer manager" side keep a "shadow root" rather than setting the "real" root. r=vlad 2010-08-20 18:24:41 -05:00
Bas Schouten a35172c9e2 Bug 593860: Only render parts of a layer in the visible region. r=jrmuizel a=blocking-betaN 2010-09-08 05:27:38 +02:00
Bas Schouten 9f3321e5ee Bug 593268 - Part 3: Implement CreateOptimalSurface for D3D9 layers and use interop in CanvasLayerD3D9. r=jrmuizel 2010-09-08 05:27:36 +02:00
Bas Schouten 2d7db6d80e Bug 593268 - Part 1: Expose LayerManager::CreateOptimalSurface. r=vlad sr=roc 2010-09-08 05:27:29 +02:00
Oleg Romashin 8aa93601ef Bug 578649 - ThebesLayerOGL using wrong shader program on QT GL build. r=vlad,a=blocking-fennec 2010-09-07 17:37:34 -07:00
Matt Woodrow 0e4edc0417 Bug 505115 - Part 1 - Fix OpenGL container layer to support transforming children.r=vlad,a=roc 2010-09-07 17:35:50 -07:00
Vladimir Vukicevic 79b654fd1a comments only, updating license text. a=b 2010-09-13 13:45:20 -07:00
Robert O'Callahan cfb7f48514 Backing out bug 579276. a=me 2010-09-02 23:14:25 +12:00
Robert O'Callahan df7ddc69f9 Fixing bustage, a=me 2010-09-02 22:15:17 +12:00
Robert O'Callahan 2fb2fc7212 Bug 579276. Part 7: Don't retain transparent layers that would hurt text rendering. r=cjones 2010-09-02 21:18:41 +12:00
Robert O'Callahan 93076398d1 Bug 579276. Part 3: Change Set/IsOpaqueContent API to a more generic Get/SetContentFlags API. r=cjones,sr=vlad 2010-09-02 21:18:40 +12:00
Robert O'Callahan bc14460ac4 Bug 579276. Part 1: Change layer/layermanager user data API to use keys and values. r=cjones,sr=vlad 2010-09-02 21:18:39 +12:00
Jeff Muizelaar 49feffb4b6 Bug 589395. d3d9: adjust vertex locations in the vertex shader. r=bas,a=blocking 
Previously we adjusted the vertex locations directly, now
they have an implicit adjustment that happens in the vertex shader.
This should let us ignore the pixel center differences between
opengl/d3d9/d3d10.
 2010-09-01 17:10:51 -04:00
Jeff Muizelaar 981b6640f0 Bug 592458. Generate the d3d9 shaders using a script. r=bas,a=joe 
This isn't part of the build because we don't want to depend
on the directx sdk (fxc) for building.
 2010-09-01 17:02:02 -04:00
Matt Woodrow 2441967f84 Bug 589978 - [D3D9] 2D canvas layers always have premultiplied alpha. r=bas, a=beta5+ 2010-08-23 20:58:27 -07:00
Matt Woodrow 56e9a9a98a Bug 589755 - [D3D9] Canvas layer uses incorrect source with d2d surfaces. r=bas, a=beta5+ 2010-08-23 20:57:59 -07:00
Matt Woodrow a4b8d433d4 Bug 589097 - [D3D9] Incorrect alpha blending on canvas layers. r=bas, a=beta5+ 2010-08-23 20:57:22 -07:00
Matt Woodrow 35a7b7fe11 Bug 588212 - LayerManagerD3D9 PaintToTarget uses wrong render target. r=bas, a=beta5+ 2010-08-23 20:56:49 -07:00
Karl Tomlinson b1ef0bf840 backout dbbb9575aae1 due to build issues in some configurations b=577743 2010-08-23 16:27:49 +12:00
Chris Double d2b3e251e9 Bug 577743 - Scale videos at YCbCr to RGB conversion time - r=roc a=blocking 2010-08-23 13:47:33 +12:00
Bas Schouten 77a6b11872 Fix bustage from changeset 8c767b950381. a=bustage 2010-08-20 05:58:44 +02:00
Bas Schouten cb632a9c1b Bug 588690 - Part 1: Expose ClearCachedResources on BasicLayerManagers. r=roc 2010-08-20 05:40:49 +02:00
Jacek Caban 31719e089e Bug 723942 - ImageLayerD3D*.cpp does not compile on mingw r=bas 
--HG--
extra : rebase_source : e98c15c62a8998c1c646a5d9851ec96514f0b376
 2012-02-06 11:24:47 +01:00
Jim Mathies 393f497027 Bug 786979 - Use a new constant for returning ICoreWindow from GetNativeData. r=bbondy 2012-09-07 14:51:02 -05:00
Chris Peterson 2b72ba5c09 Bug 786103 - Advance the aSrc and aDst pointers when copying video planes. r=roc 2012-09-04 10:10:06 -07:00
Vladimir Vukicevic 0fff021bbd b=586043; GL layer manager should use GetClientBounds, not GetBounds; r=bas 2010-08-14 10:52:16 -07:00
Jacek Caban aac1a9302f Bug 586279 - Broken DeviceManagerD3D9.h compilation on mingw r=bas.schouten a=joe 
--HG--
extra : rebase_source : c3c6d40e0adbfa705759cb238ea10fc0e12e0d4a
 2010-08-14 16:43:14 +02:00
Bas Schouten 2d2753ac80 Bug 586562: Always use A8R8G8B8 for our swap chains. Fixes black chrome for NVidia. r=vlad a=mossop 2010-08-12 18:25:12 +00:00
Bas Schouten 4055e82557 Bug 586159: Use SYSTEMMEM textures instead of OffscreenPlainSurfaces, better supported on NVidia. r=vlad 2010-08-12 18:25:09 +00:00
Justin Wood 0b585cc0a7 bug 586187 - Build failure in LayerManagerD3D9 due to --disable-ipc not also defining Unicode, r=khuey a=bustage 2010-08-11 18:05:14 +02:00
Bas Schouten 3ef26ae8e5 Bug 584539: Part 3 - Use D2D interop when using the D3D9 layer manager. r=vlad a=dougt 2010-08-11 02:36:05 +02:00
Bas Schouten 93ae62051a Bug 584754: Use the D3D9Ex device where available. r=vlad 2010-08-11 01:39:45 +02:00
Bas Schouten 9ea6e6543e Bug 585248: Use a single device for all LayerManagerD3D9's. r=vlad 2010-08-11 01:32:45 +02:00
Bas Schouten 4138c802e8 Bug 578384: Clear to to transparent black instead of solid white. r=jrmuizel 2010-08-11 01:32:43 +02:00
Vladimir Vukicevic d0c8473b6b b=583838; add ANGLE/D3D WebGL support - part 4 - allow CanvasLayerOGL to work with different-type GL contexts; r=bas 2010-08-06 22:09:18 -07:00
Vladimir Vukicevic ee64634b3d b=583844; use correct pack alignment when reading via ReadPixels; also use EXT_bgra correctly; r=bjacob 2010-08-06 22:09:18 -07:00
Vladimir Vukicevic 99c28af205 b=583838; add ANGLE/D3D WebGL support - part 2 - build EGL on windows and try to use it; r=bjacob 2010-08-06 22:09:18 -07:00
Vladimir Vukicevic b524227b49 b=574481; fix layers lifetime issues; part 4 - fix other layers; r=bas 2010-08-06 22:09:18 -07:00
Vladimir Vukicevic df9d6bc2dd b=574481; fix layers lifetime isues; part 3 - add lifetime mgmt to GL layers; r=bas 2010-08-06 22:09:18 -07:00
Vladimir Vukicevic 956826cf56 b=574481; fix layers lifetime issues; part 1 - add API; r=roc 2010-08-06 22:09:17 -07:00
Robert O'Callahan 1524120859 Bug 579349. Track the 'drawn region' of content in layers, whhich ignores visibility, and use it to determine which layer a display item should be placed in. r=tnikkel 2010-08-02 15:06:58 +12:00
Chris Jones 9bff50e1eb Followup to bug 573829: Clean up a chunk of .rej vomit that just so happened to be syntactically correct and not change semantics. r=vlad 2010-07-29 14:15:13 -05:00
Vladimir Vukicevic 78b092c544 b=580345; fix up some GLESv2 vs. desktop GL differences; r=joe 2010-07-28 14:24:09 -07:00
Robert O'Callahan 120f46d5e2 Bug 579262. Inherit FLAG_DESTINED_FOR_SCREEN into BasicLayer rendering. r=vlad 2010-07-24 21:37:17 +12:00
Chris Jones 90269c6e6d Followup to bug 570294: Avoid vector::data(), it's not C++98. 
--HG--
extra : rebase_source : 66a38bee840b21251dd4cbfca370cf9294745ee3
 2010-07-21 18:13:24 -05:00
Chris Jones d153e8e243 Bug 570294, part j: Publish BasicThebesLayer pixels to remote processes (slowly). r=roc 
--HG--
extra : rebase_source : bac63c2b868fd002f9b27c6836aaed3f95c5316d
 2010-07-21 16:17:33 -05:00
Chris Jones 3ee53108c2 Bug 570294, part i: Publish BasicImageLayer pixels to remote processes (slowly). r=Bas 
--HG--
extra : rebase_source : 6a5749fd41cc8181531b7ad89867be8736dbe63b
 2010-07-21 16:17:33 -05:00
Chris Jones 4cc19406c4 Bug 570294, part h: Publish BasicCanvasLayer pixels to remote processes (slowly). sr=vlad 
--HG--
extra : rebase_source : c113259f24d6f1c43583c729b7e996be01ed35bc
 2010-07-21 16:17:33 -05:00
Chris Jones d72e903707 Bug 570294, part g: Implement basic ShadowLayers and share basic layers with remote processes. r=Bas sr=vlad 
--HG--
extra : rebase_source : aca1e9e2ebb49f000bbe5116c04145f8aff8ac03
 2010-07-21 16:17:33 -05:00
Chris Jones 2989ab88fa Bug 570294, part f: Implement the "manager" side of IPC layers. r=vlad 
--HG--
extra : rebase_source : 8c99ac9f20dd92ab8d1f8379d166339366be4c60
 2010-07-21 16:17:33 -05:00
Chris Jones 8e4be915c6 Bug 570294, part e: Implement the "forwarder" side of IPC layers. r=jrmuizel 
--HG--
extra : rebase_source : 43c9bd051ec500d08ebd7bce6767c1be36abcd26
 2010-07-21 16:17:33 -05:00
Chris Jones 5ad1372c5c Bug 570294, part d: IPC protocol for Layers. r=jrmuizel sr=vlad 
--HG--
extra : rebase_source : dba7175f08f4fe6df93f2a66622dc3780a1890ed
 2010-07-21 16:17:33 -05:00
Chris Jones cdb78a8151 Bug 570294, part c: C++ part of Layers IPC interface. r=Bas sr=vlad 
--HG--
extra : rebase_source : 12246bd29d0469630c406dea4b137e792002de57
 2010-07-21 16:17:33 -05:00
Chris Jones aab660510e Bug 570294, part b: Add a Mutated() API allowing Layers to notify their managers that their Layer attributes have changed. r=Bas sr=roc 
--HG--
extra : rebase_source : e3b7714bb3083bcf30b08920ebce1a656d48798a
 2010-07-21 16:17:33 -05:00
Chris Jones da2a929d29 Bug 573829, part 4: Use GL_REPEAT and appropriate texcoords to render ThebesLayerOGL's pixels rotated correctly. r=vlad 2010-07-22 15:29:37 -05:00
Chris Jones 5ce4b9fe07 Bug 573829, part 3: Use ThebesLayerBuffer to retain contents for ASurface-backed TextureImages. r=vlad 2010-07-22 15:29:37 -05:00
Chris Jones 40a231016e Bug 573829, part 1: Refactor ThebesLayerBuffer in preparation for its use in the OGL layers backend. r=roc 
--HG--
rename : gfx/layers/basic/ThebesLayerBuffer.cpp => gfx/layers/ThebesLayerBuffer.cpp
rename : gfx/layers/basic/ThebesLayerBuffer.h => gfx/layers/ThebesLayerBuffer.h
 2010-07-21 13:06:33 -05:00
Chris Jones ad15c41672 Bug 567421, part 2: Implement Dump[Self](FILE*) and Log[Self]() methods for layers. r=roc 2010-07-21 13:06:33 -05:00
Chris Jones 509381a2b4 Bug 567421, part 1: Rename NS_* macros to MOZ_* and add LayerManager::Name() interface. r=roc 2010-07-21 13:06:33 -05:00
Vladimir Vukicevic 32f7f1aef8 b=580101; fix GLX GL context provider (nvidia/intel fix); r=cjones 2010-07-19 22:25:47 -07:00
Matt Woodrow 8baacd5f75 b=580101; fix GLX GL context provider; r=vlad 2010-07-19 21:05:42 -07:00
Vladimir Vukicevic 4c1166372f b=579696; BasicTextureImage doesn't handle partial updates properly; r=cjones 2010-07-19 14:54:17 -07:00
Vladimir Vukicevic 27b296ce6e b=575469; use CreateOffscreen in layers; r=bas 2010-07-18 22:01:14 -07:00
Vladimir Vukicevic e71cc8f81f b=575469; implement CreateOffscreen and context sharing in GLContexts; r=bas 2010-07-18 22:01:14 -07:00
Vladimir Vukicevic 061fa66851 b=575032; make GL Context providers static, allow for multiple providers; r=bas 2010-07-18 22:01:14 -07:00
Ryan VanderMeulen bf4b81178a Bug 577344 - Define extra virtual function unconditionally. r=roc 2010-07-17 18:26:02 +02:00
Robert O'Callahan f7ac43fd89 Bug 564991. Part 41: When we clear our buffer, we need to redraw the entire visible region. r=cjones 2010-07-16 09:08:11 +12:00
Robert O'Callahan 6da468e0e8 Bug 564991. Part 40: ThebesLayers painted with variable opacity can still be OPAQUE_CONTENT themselves. r=bas 2010-07-16 09:08:11 +12:00
Robert O'Callahan 306a6d44c0 Bug 564991. Part 34: Make sure that ThebesLayerBuffers are always allocated as similar surfaces to the widget surface, whenever possible. r=cjones 2010-07-16 09:08:10 +12:00
Robert O'Callahan 4b75d1b16c Bug 564991. Part 32: Fix assertion in BasicThebesLayer; it's entirely possible that we need to invalidate an area, but the actual visible region is empty so there's no context to draw to. r=cjones 2010-07-16 09:08:10 +12:00
Robert O'Callahan 61b008df80 Bug 564991. Part 30: Skip clearing our ThebesLayerBuffer surface if we just created it. r=cjones 2010-07-16 09:08:09 +12:00
Karl Tomlinson f7284fe424 b=573409 expire unused cached double-buffering back surfaces r=vlad sr=roc 2010-07-16 09:08:09 +12:00
Robert O'Callahan 1b38f406bd Bug 564991. Part 23: Introduce the concept of 'inactive' layers. r=mats,sr=dbaron 2010-07-16 09:08:05 +12:00
Matt Woodrow 2eeaed4ebb Bug 564991. Part 21: Avoid double-buffering if we're only going to paint one layer. r=vlad 2010-07-16 09:08:05 +12:00
Matt Woodrow 5e872d086e Bug 564991. Part 20: Performance win by avoiding PushGroup for single-layer opacity. r=vlad 2010-07-16 09:08:04 +12:00
Robert O'Callahan b3a05d5100 Bug 564991. Part 19: Cache the backbuffer surface for performance wins. r=vlad 2010-07-16 09:08:04 +12:00
Matt Woodrow 64934786f8 Bug 564991. Part 18: Move double-buffering into the layer manager. r=jrmuizel,sr=vlad 2010-07-16 09:08:04 +12:00
Robert O'Callahan f63eab3242 Bug 564991. Part 15: Start retaining the contents of BasicLayers. r=mats 2010-07-16 09:08:03 +12:00
Robert O'Callahan 6824d17ea0 Bug 564991. Part 9: Retain layer trees. r=tnikkel,sr=mats 2010-07-16 09:07:51 +12:00
Bas Schouten bc942e367e Bug 577462: Addition - add comment requested in review. 2010-07-14 00:23:32 +02:00
Bas Schouten 7e49fc5fa1 Bug 577462: Use GetDC where possible for ThebesLayerD3D9 textures. r=jrmuizel 2010-07-14 00:19:45 +02:00
Bas Schouten a2b4191bd4 Bug 578500: Clear mTarget at the end of a transaction. r=roc 2010-07-14 00:19:43 +02:00
Bas Schouten d53399f950 Bug 577770: LayerManagerD3D9 should be using GetClientBounds not GetBounds. r=roc 2010-07-14 00:19:41 +02:00
timeless@mozdev.org 03f17e3cc6 Bug 576375 LayerManagerOGL::Initialize leaks p in SHADER_PROGRAM when p->Initialize fails 
r=vlad

--HG--
extra : rebase_source : 3e48dcd70be50d94126272c6339573133075faf6
 2010-07-02 17:31:08 +03:00
timeless@mozdev.org 6ad8a00f94 Bug 565326 ContainerLayerOGL::ContainerLayerOGL doesn't use mTexture 
r=bas

--HG--
extra : rebase_source : 81003129e2b42ed026a43a4a43c295dc0f6fc9cb
 2010-05-25 17:34:09 +03:00
Benoit Jacob f39d072c77 b=576081; Remove gfx/layers/opengl/glDefs.h; r=vladimir 2010-07-03 18:26:56 -04:00
Bas Schouten b94e5f575a Bug 574239: Have ThebesLayerD3D9 retain its content even across changes to the visible region. r=jrmuizel 2010-07-02 04:08:48 +02:00
Robert O'Callahan b12eec77e4 Bug 564991. Part 6: Make BasicLayers support retained ThebesLayer contents. r=cjones,sr=vlad 2010-03-04 10:37:04 +13:00
Matt Woodrow 47f140fb7d Bug 564991. Part 8: Hoist GetLayerType out of individual layer manager types and make it available for all layers. r=jrmuizel,sr=vlad 2010-07-01 20:01:09 -05:00
Chris Jones 2a0c514521 Bug 574585: Have LayerManagerOGL release its root layer before destruction. r=vlad 2010-07-01 20:01:09 -05:00
Chris Jones 0e3cacd0f6 Bug 573889, part 6: RefactorThebesLayerOGL to use TextureImage. r=Bas 2010-07-01 11:30:38 -05:00
Chris Jones 9afc0278ab Bug 573889, part 0: Move the DEBUG_GL_ERROR_CHECK() macro into GLContext.h. r=vlad 2010-07-01 11:30:38 -05:00
Vladimir Vukicevic 5f25830c9f b=573181; clean up render path on Android and prepare for GL layers rendering; r=mwu 2010-06-25 17:52:37 -07:00
Oleg Romashin fcce45e724 Bug 574581 - "Conditional jump or move depends on uninitialised value(s)" in ThebesLayerOGL::EnsureSurface(). r=jones.chris.g 
--HG--
extra : rebase_source : 6934d7596614430ae5366da61b2a0846fd90c311
 2010-06-25 07:18:56 -04:00
Matt Woodrow d1d07f6129 Bug 573929: Prevent GLX textures from being released after the window supplying the GLContext from which they were allocated dies. r=vlad 2010-06-23 18:37:00 -05:00
Oleg Romashin dde1799847 Bug 571832 - GL ThebesLayer rendering layout on X-System terribly slow. ImageLayer. r=vladimir. 2010-06-23 10:03:31 -04:00
Oleg Romashin 1d72fb92ae Bug 571832 - GL ThebesLayer rendering layout on X-System terribly slow. CanvasLayer. r=vladimir. 2010-06-23 10:02:32 -04:00
Oleg Romashin c5124a04cd Bug 571832 - GL ThebesLayer rendering layout on X-System terribly slow. ThebesLayer. r=vladimir. 2010-06-23 10:01:29 -04:00
Chris Jones 64c7c1423e Bug 573894: Have LayerManagerOGL hold a strong ref to its root layer. r=Bas 2010-06-23 13:59:07 -05:00
Chris Jones ff424e7f8f Followup to bug 572939: include fixes for Mesa-family drivers that were accidentally omitted earlier. 2010-06-22 19:24:52 -05:00
Matt Woodrow f7d661ef25 Bug 572939: Implement GLContexProvider::CreateForWindow() for GLX. r=vlad 2010-06-18 18:17:00 -05:00
Robert O'Callahan d547fc3e17 Fixing bustage 2010-06-18 21:40:11 +12:00
Robert O'Callahan d6302b247b Bug 572283. Part 3: Fix compiler warnings. r=vlad 2010-06-18 21:22:08 +12:00
Robert O'Callahan 2280cd5e00 Bug 572283. Fix CanvasLayerOGL to work with retained layers (and on Mac). r=vlad 2010-06-18 21:21:42 +12:00
Matt Woodrow fad26daa24 b=565833; add GLX GLContextProvider, pbuffers only; r=vlad 2010-06-14 23:55:08 -07:00
Oleg Romashin 2f5e014ed0 Bug 545632 - Add 16bpp format support enabler. r=jmuizelaar 2010-06-11 05:33:22 -04:00
Oleg Romashin 6747cc21c0 Backed out changeset 2959eddcd018, to fix oranges 2010-06-11 08:35:26 -04:00
Oleg Romashin 0c1e77aac6 Bug 545632 - Add 16bpp format support enabler. r=jmuizelaar 
--HG--
extra : rebase_source : 8ddcebaa4f6418c65325b4374f7f9f5ab4ec377e
 2010-06-11 05:33:22 -04:00
Justin Wood 7404e635db Bug 467051 - Introduce GLOBAL_DEPS to build system (gfx/cairo) r=vlad, feedback+=ted 
--HG--
extra : rebase_source : 3dee9c67387cb9b72dd81da6d52ad996afa2bfae
 2010-05-30 22:49:32 -04:00
Vladimir Vukicevic 125f59871e b=562409; add GLContextProvider form EGL (patch from vlad/fred/romaxa); r=bas 2010-06-09 15:27:29 -07:00
Neil Rashbrook d2d8caf75a Bug 569490 Don't build D3D9 layer if we can't find d3d9.h r=ted,jmuizelaar 2010-06-06 11:37:44 +01:00
Robert O'Callahan 3f30bb4186 Bug 586041. Part 2: refactor RemoveChild. r=bas 2010-06-01 11:32:05 +12:00
Robert O'Callahan 37a26c36a7 Bug 568041. Add user-data API and GetRoot to LayerManager. Move mVisibleRegion into Layer. r=bas,sr=vlad 2010-06-01 11:29:37 +12:00
Bas Schouten 34ebfb3b84 Numerous whitespace fixes in D3D9 layers code. 2010-05-29 05:27:03 +02:00
Daniel Holbert 9088953686 Bug 567626 followup: Add missing "*/" at end of first line in CanvasLayerOGL.cpp, ColorLayerOGL.h, & ThebesLayerOGL.h, to fix 'warning: "/*" within comment'. rs=vlad 2010-05-27 13:04:26 -07:00
Bas Schouten 3c3030d11d Bug 568150: Properly use parent sibling members for OGL Containers. r=roc 2010-05-26 06:06:34 +02:00
Bas Schouten 60be6ff517 Bug 567966: Part 2: Remove rogue allocation from PlanarYCbCrImageD3D9. r=vlad 2010-05-25 09:37:21 +02:00
Bas Schouten 7087289353 Bug 567966: Part 1: Properly handle siblings and children. Also fix missing release on container destructor. r=vlad 2010-05-25 09:37:19 +02:00
Vladimir Vukicevic 4c3754729e b=567626; fix up opengl layers; r=bas 2010-05-24 23:35:35 -07:00
Bas Schouten 64b69309d0 Bug 567943: Let ContainerLayerD3D9 keep references to their children. r=roc 2010-05-25 04:43:59 +02:00
timeless@mozdev.org fd388768cb Bug 565337 Please cache GetOpacity() in ContainerLayerOGL::RenderLayer. r=Bas 
--HG--
extra : rebase_source : 101952fad466e60ac4933ac5d4c347c2b3449092
 2010-05-23 15:34:58 -07:00
Bas Schouten 01d768b811 Bug 546515: Part 1: Add a layers backend based on Direct3D9. r=jrmuizel 2010-05-24 17:28:51 +02:00
Robert O'Callahan 4886cf3d1c Bug 564993. Fix build error, and fix Bas' review comment. 2010-05-24 14:25:58 +12:00
Robert O'Callahan b32027fed6 Bug 564993. Part 5: Change ThebesLayer painting to be callback-based; move layer tree construction to FrameLayerBuilder. r=Bas,mats,sr=vlad 2010-05-21 15:20:48 +12:00
Robert O'Callahan 01e9dabdad Backed out changeset b37bdb032fe7 2010-05-24 10:53:05 +12:00
Robert O'Callahan 0417d4868e Bug 564993. Part 5: Change ThebesLayer painting to be callback-based; move layer tree construction to FrameLayerBuilder. r=Bas,mats,sr=vlad 2010-05-21 15:20:48 +12:00
Robert O'Callahan 20c2e464f7 Backed out changeset efa8719a93d2 2010-05-21 16:34:23 +12:00
Robert O'Callahan 6391e1262a Bug 564993. Part 5: Change ThebesLayer painting to be callback-based; move layer tree construction to FrameLayerBuilder. r=Bas,mats,sr=vlad 2010-05-21 15:20:48 +12:00
Robert O'Callahan b5746a540b Bug 564993. Part 4: Add trivial user-data API so layout can attach data to layers. r=Bas,sr=vlad 2010-05-21 15:20:48 +12:00
Robert O'Callahan c3ff0859ee Bug 565875. Part 4: Recycle textures used by PlanarYCbCrImageOGL to avoid reallocation/recommit costs (especially on Mac). r=bas 2010-05-17 11:09:28 +12:00
Robert O'Callahan 9695389e69 Bug 565875. Part 3: Recycle temporary buffer used by PlanarYCbCrImageOGL to avoid reallocation/recommit costs (especially on Mac). r=bas 2010-05-17 11:08:41 +12:00
Robert O'Callahan 85fb4022b8 Bug 565875. Part 2: Create GLTexture wrapper to manage texture lifetimes and ensure textures are released on the main thread. r=bas 2010-05-17 11:08:01 +12:00
Robert O'Callahan cc9d41a047 Bug 565875. Part 1: Refactor PlanarYCbCrImageOGL to make ownership of its temporary buffer more explicit. r=bas 2010-05-17 11:07:13 +12:00
Rich Dougherty a9d5c7ce86 Bug 557982. Use Image objects in the video frame queue so we can avoid making an extra copy as we put frames into the queue. r=kinetik 2010-05-19 15:04:33 +12:00
Robert O'Callahan 87f96430ac Bug 561959. Replace solid-color ThebesLayers with ColorLayers. r=dbaron 2010-05-13 12:56:11 +12:00
Robert O'Callahan d7e60623a4 Bug 547924. Paint <canvas> using EXTEND_PAD to prevent seams. r=vlad 2010-05-19 15:04:32 +12:00
Vladimir Vukicevic e5d92d3d03 b=561168; convert canvas to use layers for rendering - followup #2; r=roc 2010-05-17 21:04:22 -07:00
Vladimir Vukicevic 57c2111dfe b=561168; convert canvas to use layers for rendering - followup; r=roc 2010-05-17 21:04:22 -07:00
Vladimir Vukicevic b5ac042d49 b=561168; convert canvas to use layers for rendering; r=roc,bas 2010-05-17 21:04:22 -07:00
Robert O'Callahan 26569a71da Bug 561959. Implement ColorLayer, which paints a solid color into its layer. r=bas,sr=vlad 2010-05-13 12:56:11 +12:00
Robert O'Callahan 962d37b89b Bug 564993. Part 1: Remove CopyFrom API, it won't be used. r=Bas 2010-03-03 13:53:52 +13:00
Bas Schouten 03102f3dc9 Add a comment explaining texture usage as backbuffer. 2010-05-12 18:21:34 +02:00
Bas Schouten c6a69f8e5a Bug 562392: Use TEXTURE_RECTANGLE_EXT for backbuffer where we can't bind NPOT TEXTURE_2D to a framebuffer. r=joedrew 2010-05-12 18:21:31 +02:00
Bas Schouten 853793da4f Bug 560147: Follow-up fixing non-libxul builds. This will include layers into thebes.dll, and ensure thebes.dll exposes the correct symbols. r=ted 2010-04-28 22:43:52 +02:00
Matt Woodrow 2c6e57bb9c Bug 561957. Support GL backend on Mac OS X. r=vlad 2010-04-28 10:29:29 +12:00
Chris Pearce 2966b4cccd Bug 556455 - Remove liboggz, liboggplay, libfishsound from video decoder. r=doublec 2010-04-27 20:53:48 +12:00
Chris Pearce fce92ab150 Bug 556889 - Honour video aspect ratio in layers rendering. r=roc 2010-04-27 20:53:44 +12:00
Bas Schouten 4ed10293de Bug 560147: Another follow-up bustage fix for changeset c453741bcbdb. r=joe 2010-04-27 04:37:14 +02:00
Bas Schouten 0e5a79ef23 Bug 560147: Use the new Unified OpenGL Wrapper for OpenGL layers, and remove wrapper code from layers. r=vlad 2010-04-27 04:09:47 +02:00
Bas Schouten 351a3f8126 Bug 561678: Use Platform Native drawing surfaces for ThebesLayerOGL. r=roc 2010-04-27 00:24:03 +02:00
Chris Double bc56aab89c Bug 551378 - Implement 4:4:4 colorspace conversion routine for YCbCr layers code - r=roc 2010-04-21 15:05:34 +12:00
Chris Double ef03b912fb Bug 551277 - Replace liboggplay YUV to RGB color conversion code - r=roc 2010-04-19 13:17:06 +12:00
Chris Pearce 9c85f50feb Bug 556889 - Backed out changeset 6f250c9b680b due to reftest failure on Linux. 2010-04-08 21:18:58 +12:00
Chris Pearce 8ae321bbc6 Bug 556889 - Honour video aspect ratio in layers rendering. r=roc 2010-04-08 20:16:02 +12:00
Bas Schouten 24c3d464ad Bug 557896: Display information on the error console when using a OpenGL layer manager. r=joedrew 2010-04-08 09:29:58 +02:00
Bas Schouten 60de353002 Bug 557671: Properly make image layers threadsafe by guarding the active image. r=roc 2010-04-08 09:29:55 +02:00
Chris Double 4d94fbf7a0 Bug 551277. Backed out changeset f9a11b9b2b9f 2010-04-06 18:10:02 +12:00
Chris Double 987e0e6294 Bug 551277 - Implement software YCbCr conversion in layers, replacing liboggplay color conversion code - r=roc 
--HG--
extra : rebase_source : 53b2c194aa6eb75a4751efdd83f066d3aeadf5d7
 2010-04-06 12:07:39 +12:00
Bas Schouten 0291fc7a4f Bug 556584: Allow opaque containers to draw their contents directly to their parent layer. r=joedrew 2010-04-01 23:17:15 +02:00
Bas Schouten e06c8ff57c Bug 556572: Support none-multiple of 4 strides. r=joedrew 2010-04-01 23:17:13 +02:00
Daniel Holbert d509dc0e16 Bug 551298, patch B: Replace uses of THEBES_INLINE_DECL_REFCOUNTING with NS_INLINE_DECL_REFCOUNTING. r=roc 2010-04-01 11:05:40 -07:00
Daniel Holbert 605900c19f Backed out changeset 29bc09de2f77 (Bug 551298) due to Linux debug mochitest-5 orange 2010-04-01 09:38:53 -07:00
Daniel Holbert f670acaa95 Bug 551298, patch B: Replace uses of THEBES_INLINE_DECL_REFCOUNTING with NS_INLINE_DECL_REFCOUNTING. r=roc 2010-04-01 08:08:51 -07:00
Bas Schouten 4a42fdf506 Bug 556387: Fix OpenGL context creation for some drivers. r=joedrew 2010-04-01 03:44:05 +02:00
Bas Schouten f7c951c2c7 Bug 556288: Use linear filters so framebuffers can use the same texture on all hardware. Assert succes. r=joedrew 2010-04-01 03:44:02 +02:00
Bas Schouten fc6417c11a Bug 556029: Add the ability to detect which layers backend is used. r=roc 2010-03-30 20:58:37 +02:00
Bas Schouten 926f20d238 Bug 546517: The layers OpenGL backend. r=vlad 2010-03-30 06:48:52 +02:00
Robert O'Callahan 6b6667800c Bug 538323. Part 1: create ImageLayers and associated API for displaying pixel-buffers in various formats. r=jrmuizel,sr=dbaron 2010-03-02 12:09:35 +13:00
Robert O'Callahan 421aac51af Bug 538266. Part 2: add transform API to layer system. r=jrmuizel,sr=dbaron 2010-03-02 12:08:28 +13:00
Bas Schouten cb26d1fc0e Bug 550846: Restructure layers to use different directories for different backends. r=roc,ted 
--HG--
rename : gfx/layers/BasicLayers.cpp => gfx/layers/basic/BasicLayers.cpp
rename : gfx/layers/BasicLayers.h => gfx/layers/basic/BasicLayers.h
 2010-03-14 18:30:40 +01:00
Boying Lu 204a561dc2 Bug 549805 - Failed to build liblayer.so on OpenSolaris. r=roc, sr=vlad 2010-03-04 10:26:11 +01:00
Mark Banner 56591a83ce Fix windows debug build bustage from bug 534425 2010-03-01 10:46:37 +00:00
Robert O'Callahan 0b4e30fcb2 Bug 534425. Part 2: Create BasicLayers implementation. r=jrmuizel 2010-03-01 20:56:18 +13:00
Robert O'Callahan eca9fe7345 Bug 534425. Part 1: Create initial layers API. r=jmuizelaar,sr=dbaron 2010-03-01 20:56:18 +13:00