Commit Graph

5820 Commits

Author SHA1 Message Date
David Anderson
9929d37fcc Merge from mozilla-central. 2012-07-31 17:19:41 -07:00
Nicholas Cameron
db90500fee Back out bug 779001, bug 746883, bug 778595, bug 776803, bug 7118849 2012-07-31 18:17:23 +12:00
Nicholas Cameron
cacd72e824 Bug 779001. Falling back to Cairo for large canvases. r=roc 2012-07-31 13:46:05 +12:00
Nicholas Cameron
12480ec1e9 Bug 776802; Give better info about Azure. r=Bas 2012-07-31 13:45:59 +12:00
Nicholas Cameron
d8993b1756 Bug 718849; patch to keep Skia up to date. r=gw280 2012-07-31 12:58:14 +12:00
David Anderson
644c651c3e Merge from mozilla-central. 2012-07-30 13:15:39 -07:00
Mark Finkle
70a01196ec Backout 169ff207ed19, a34baed70c1b, f9ccdd490bd7, 39550ed860e6, 2194a2dd66b2, 908eb2e26843, a76e0a267f26 due to mobile viewport bustage (bug 778580) 2012-07-30 14:36:12 -04:00
Chris Jones
513b789a44 Bug 781024: Use the current decoded image as the reference for allocation. r=roc 2012-08-08 10:51:40 -07:00
Aryeh Gregor
e806eeab4f Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
David Zbarsky
a656d3adfe Bug 778496 - Layer should store ComputedTimingFunction directly rather than as a pointer r=roc 2012-07-29 18:59:26 -07:00
Nicholas Cameron
e2b2783492 Backout bug 718849 2012-07-30 11:40:42 +12:00
Nicholas Cameron
6d2208c3ad Bug 718849; patch to keep Skia up to date. r=gw280 2012-07-30 10:35:54 +12:00
David Anderson
88ed1ce560 Merge from mozilla-central. 2012-07-26 18:19:02 -07:00
David Anderson
83c5be4f84 Merge from mozilla-central. 2012-07-25 14:30:08 -07:00
David Anderson
5fc5a16b63 Merge from mozilla-central. 2012-07-24 16:32:08 -07:00
Matt Brubeck
2e41f92cb5 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 Anderson
10352157a6 Merge from mozilla-central. 2012-07-23 12:37:49 -07:00
Matt Brubeck
6ead01e8d2 Back out 9fb78d71f361, 28f8ce199bed, 78ffaa79a3de, 9f6f9b74d685 (bug 779940 and bug 778036) because of Android failures 2012-08-06 21:59:01 -07:00
Matt Woodrow
0eb0792320 Bug 779940 - Add a ShadowLayer transaction fps counter. r=cjones 2012-08-07 15:00:42 +12:00
Matt Woodrow
5175ff1115 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
af3016ac22 Bug 778036 - Retain RefLayers instead of creating them every frame. r=roc 2012-08-07 15:00:41 +12:00
Karl Tomlinson
3b28801ea2 b=779786 check fbconfig alpha instead of buffer size against render format r=mattwoodrow
--HG--
extra : transplant_source : %B6%E0%DDdG%F0%93%88%02%DDKf%D7%F8%9E%98%2A%19%92%BB
2012-08-07 13:22:23 +12:00
Ed Morley
1368da883d Backout b4a63a0b90c2 (bug 778420), b849f1b3859a (bug 778420), d522b5a13b27 (bug 72964), 3a12c64bf53a (bug 778420), c07148142675 (bug 726053) for failures in test_bug435425.html on a CLOSED TREE 2012-08-07 00:57:27 +01:00
Bobby Holley
1138ef9062 Bug 778420 - Fix up tests that don't like the new enablePrivilege, r=jmaher.
--HG--
extra : rebase_source : 07565c66b279ba5a58b5902b697110f940c255fd
2012-08-06 22:38:19 +02:00
Daniel Holbert
fbf9a0e9ff Bug 780680: Remove never-read variable 'prevGlyphCharIndex' from gfxHarfBuzzShaper::SetGlyphsFromRun(). r=jfkthame 2012-08-06 13:34:38 -07:00
Sergey Glushchenko
970c894833 Bug 776429: Unify scattered M_PI definitions into mfbt/Constants.h r=dRdR 2012-08-06 13:32:11 -07:00
Robert O'Callahan
228dd8c270 Backout c1878d925ef5 (bug 776940) due to leaks on Mac 2012-07-25 17:39:47 +12:00
Chris Jones
6699a16b74 Bug 776940: Fix shutdown protocol of shadow OGL layers. r=roc 2012-07-24 19:46:32 -07:00
Nicholas Cameron
ed2f5019f3 Bug 775215; remove D3D10_RESOURCE_MISC_GDI_COMPATIBLE. r=Bas
--HG--
extra : rebase_source : bb05c51a4e7f57dc2db0c17cb321160dc619ecb6
2012-07-25 12:28:20 +12:00
Jim Mathies
09402fa5d6 Bug 776876- backout patch to try and fix red. r=backout 2012-07-24 15:29:30 -05:00
Jim Mathies
f5ec6a127f Bug 776876 - vc11 nullptr fix for GLContextProviderEGL. r=joe 2012-07-24 15:07:18 -05:00
David Zbarsky
669aea118d Remove trailing semicolons in GeckoContentController, no bug, r=dRdR 2012-07-24 12:12:11 -07:00
Chris Jones
cbd13d8e9d Bug 776217: Support gecko-implemented screen rotation with omtc. r=roc 2012-07-24 12:01:09 -07:00
Doug Sherk
6b093e6dd1 Bug 776226: Implement axis locking when panning along one axis r=roc 2012-07-22 23:49:07 -04:00
Matt Woodrow
315e04aaec Bug 539356 - Part 21 - BasicLayers should always retain content. r=roc 2012-07-23 15:00:37 +12:00
Matt Woodrow
b2fd923dac Bug 539356 - Part 23 - Fix MovePixels crash when our surface is in an error state. r=jrmuizel 2012-07-23 15:00:37 +12:00
Matt Woodrow
0bc8f48c38 Bug 741682 - Flatten component alpha layers into their parent layer with BasicLayers. r=roc 2012-07-23 15:00:36 +12:00
Matt Woodrow
31acc195c6 Bug 741682 - Use nsRegion::ScaleToInsidePixels when computing opaque regions of layers. r=roc 2012-07-23 15:00:36 +12:00
Matt Woodrow
2865678172 Bug 741682 - Add ScaleToInsidePixels and ScaleToNearestPixels to nsRegion. r=roc 2012-07-23 15:00:36 +12:00
Doug Sherk
8fbb6b6928 Bug 776413: Temporary workaround, fix initial displayport on page load. r=gal
This needs to be fixed properly by setting the displayport to a larger area than
just the viewport but before the page has already been loaded. This patch will
mask it to look decent once the page has finished loading and before panning.
2012-07-22 21:51:38 -04:00
Doug Sherk
ffe8a7b8f4 Bug 776226: Improve displayport sizing, account for velocity, and properly clip edges r=cjones 2012-07-22 21:51:23 -04:00
Doug Sherk
1d205454ca Bug 776310: Tune flinging friction and logic in AsyncPanZoomController r=cjones 2012-07-22 21:50:41 -04:00
Doug Sherk
c856c6237b Bug 776149: Fix Gecko panning code to account for time deltas for displacements r=cjones 2012-07-22 21:43:37 -04:00
David Anderson
7b87cb9a76 Merge from mozilla-central. 2012-07-20 12:02:04 -07:00
Doug Sherk
dbc1d2e5d5 Bug 776203: Add virtual dtor to GeckoContentController r=gal 2012-07-22 13:37:13 -07:00
David Zbarsky
dfd3e3d5ba Bug 706179: Add support for animations to the Layers API r=roc, dbaron, cjones 2012-07-23 17:34:22 -07:00
Chris Jones
708bd2e4ae Bug 771350, part 2: Use OpenDescriptorForTexturing() in ShadowThebesLayerOGL, where possible. r=BenWa 2012-07-23 16:58:37 -07:00
Chris Jones
73a85b798a Bug 771350, part 1: Add GLContext::CreateDirectTextureImage and OpenDescriptorForTexturing to more easily support direct texturing without updates. r=vlad 2012-07-23 16:58:37 -07:00
Chris Jones
f9af5d6888 Bug 771350, part 0: Remove some dead code to make later patches clearer. r=BenWa 2012-07-23 16:58:35 -07:00
Chris Jones
ef35aa58e9 Bug 750977: Implement glue code for asynchronous panning/zooming. r=jlebar,roc,vingtetun
This is a rollup of three separate patches
 - Add nsIDocShell.asyncPanZoomEnabled. r=jlebar
 - Have BrowserElementChild service repaint requests and handle fallback synchronous scrolling (for now). r=jlebar,vingtetun
 - Glue async pan/zoom logic up between compositing, event dispatch, and repaint requests. r=roc

--HG--
rename : b2g/chrome/content/webapi.js => dom/browser-element/BrowserElementScrolling.js
2012-07-19 23:48:27 -07:00
Doug Sherk
df87148215 Bug 750974: Move basic pan/zoom logic into Gecko C++ r=cjones,roc sr=smaug[widget/] 2012-07-19 23:48:25 -07:00
Jonathan Watt
e52e0a6f49 Bug 775697 - Cancel layer transactions that haven't ended after nsDisplaySVGEffects::PaintAsLayer returns. r=roc. 2012-07-20 00:53:55 -04:00
Chris Jones
a297e6c928 Followup to bug 775436: Fix thinko. r=gal 2012-07-19 21:34:21 -07:00
David Anderson
180cbd4d9d Merge from mozilla-central. 2012-07-19 14:34:36 -07:00
David Anderson
921bd834c9 Merge from mozilla-central.
--HG--
rename : js/xpconnect/wrappers/CrossOriginWrapper.cpp => js/xpconnect/wrappers/WaiveXrayWrapper.cpp
rename : js/xpconnect/wrappers/CrossOriginWrapper.h => js/xpconnect/wrappers/WaiveXrayWrapper.h
2012-07-18 19:02:32 -07:00
Doug Sherk
83f3cf231d Bug 775463: Implement tolerance in double tap detection r=cjones 2012-08-08 21:39:11 -07:00
Doug Sherk
de15346fad Bug 775463: Implement double-tap-to-zoom content r=cjones 2012-08-08 21:39:02 -07:00
Doug Sherk
90a980f807 Bug 775451: Reduce diagonal checkerboarding r=cjones 2012-08-08 13:38:23 -07:00
Doug Sherk
64b39b128f Bug 779572: Properly protect state in AsyncPanZoomController with a monitor r=cjones 2012-08-08 13:38:20 -07:00
Doug Sherk
c0451be7fd Bug 779572: Factor zoom into min pan distance before moving the viewport r=cjones 2012-08-08 13:38:16 -07:00
Doug Sherk
660329b4cb Bug 780210: Fix B2G focus point calculation for pinching r=kats 2012-08-08 13:38:14 -07:00
Doug Sherk
7eb9a065a8 Bug 775448: Add gesture cancelling support during sync subframe scrolling r=cjones 2012-08-08 13:38:10 -07:00
Doug Sherk
71ccfa781a Bug 775448: Disable async scrolling when we detect a scrollable subframe r=cjones 2012-08-08 13:38:06 -07:00
Doug Sherk
a1e5523a38 Bug 775447: Properly count number of touch listeners in AsyncPanZoomController r=cjones 2012-08-08 13:37:57 -07:00
Bobby Holley
364da93593 Bug 778420 - Fix up tests that don't like the new enablePrivilege. r=jmaher
--HG--
extra : rebase_source : 1158df4a4eb917074204e649efd8f2b8e699f115
2012-08-03 22:19:54 +02:00
Nicholas Cameron
36ea565564 Bug 779401; Teach HelpersCairo.h about 565 image formats. r=bas
--HG--
extra : rebase_source : eef05ab0fa1a8094104f272786ba7a3714c27dd5
2012-08-09 08:17:04 +12:00
Nicholas Cameron
f94f86a078 Bug 780392; Make ScaledFontDWrite inherit from ScaledFontBase. r=bas
--HG--
extra : rebase_source : 83ffee7d64f1ecdfa15b8cf96024c27fdf00c29b
2012-08-09 08:17:04 +12:00
Jeff Gilbert
be44ef0388 Bug 774059 - Fix up references to glEGLImageTargetTexture2D - r=bjacob 2012-07-19 21:14:14 -07:00
ku.b@gmx.de
69919c6184 Bug 709732 - double color correction with X Color Management 2012-07-18 21:09:13 -04:00
Jeff Gilbert
420dd6ad44 merge the backout of cset d4a04cc38326 2012-07-18 15:25:59 -07:00
Jeff Gilbert
289b5c018d Backed out changeset d4a04cc38326 2012-07-18 15:23:47 -07:00
Jeff Gilbert
c4f2d7a60e Bug 774059 - Fix up references to glEGLImageTargetTexture2D - r=bjacob 2012-07-18 14:17:10 -07:00
Jeff Gilbert
8e80259430 Bug 774841 - Check the proper extension before using ImageTargetTexture2D - r=bgirard 2012-07-18 13:41:49 -07:00
David Zbarsky
88371b030a [Bug 774505] Don't include Layers.h everywhere r=cjones 2012-07-18 12:31:40 -04:00
Jonathan Kew
ca01c7a551 bug 769475 - incorrect font used for italicized Arabic text when font-family is Arial or Times New Roman. r=smontagu 2012-07-23 03:48:26 -04:00
Siddharth Agarwal
41ac5ef842 Bug 780421 - Use $(PYTHON) to run config.status. r=glandium 2012-08-05 12:42:57 +02:00
David Anderson
c36e0f89e0 Merge from mozilla-central. 2012-07-13 19:50:02 -07:00
Ms2ger
0a56bc3482 Bug 776142 - Back out bug 687267 / changeset 8571114112b2 on a CLOSED TREE. 2012-07-22 14:02:18 +02:00
Phil Ringnalda
cfef187ad4 Back out 0c1f34eb5b93 and 0f987ac28e8c (bug 683243) for Android R2 bustage 2012-07-12 22:27:34 -07:00
Nicholas Cameron
fad09f613e Bug 767337; remove D3D10_RESOURCE_MISC_GDI_COMPATIBLE flag from D3D10 layer manager. r=roc 2012-07-18 15:02:12 -04:00
Bas Schouten
60391b14e8 Bug 772726. Part 4: Fix SampleTextTexturesPS(Masked) shaders to premultiply TextColor. r=jrmuizel
--HG--
extra : rebase_source : 76781e7f69db6d47b3ecf8d8c37bac284133c6be
2012-07-18 01:02:08 -04:00
Robert O'Callahan
fc590c6356 Bug 772726. Part 2: When BasicLayers is compositing directly to an Azure DrawTarget, Transform3D should handle the destination not having a CurrentSurface. r=mattwoodrow
--HG--
extra : rebase_source : 838f6b643d9ab4ca10a0bf9612eb2081e728288f
2012-07-18 01:02:07 -04:00
Jeff Gilbert
af031de17f Bug 774688 - Mark reused buffer as dirty in BasicCanvasLayer - r=bas 2012-07-17 21:27:49 -07:00
David Anderson
b93d6b9c04 Merge from mozilla-central. 2012-07-12 13:23:26 -07:00
Vladimir Vukicevic
ef9becd1a5 b=773071; use KHR_fence_sync instead of GuaranteedRsolve with EGLImage WebGL; r=jgilbert 2012-07-17 21:20:28 -04:00
David Anderson
56d1e29054 Merge from mozilla-central.
--HG--
rename : editor/libeditor/base/DeleteElementTxn.cpp => editor/libeditor/base/DeleteNodeTxn.cpp
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
rename : js/src/jsobj.cpp => js/src/builtin/Eval.cpp
2012-07-10 19:45:14 -07:00
Ryan VanderMeulen
22a9fed718 Backout a516a86f854d (bug 767064) due to Android M1 orange. 2012-07-09 21:49:50 -04:00
Rafael Ávila de Espíndola
6fa6b984a6 Bug 775134 - Remove extra ; r=ehsan.
--HG--
extra : rebase_source : 1d44663679e8f1944649d54608e5e6e6694e88c5
2012-07-18 12:15:47 -04:00
Joshua Cranmer
4ad48824ad Bug 702877 - Replace NS_OVERRIDE with MOZ_OVERRIDE. r=ehsan
--HG--
extra : rebase_source : 1843575683c3897f96f3966cbce26140ff1a7d90
2012-07-06 13:15:45 -05:00
Oleg Romashin
9ac5a2c10b Bug 774841 - Call SetupLookupFunction for EGL - r=jgilbert 2012-07-23 13:39:29 -07:00
James Willcox
80029db926 Bug 687267 - Initial support for Flash on Honeycomb r=bgirard,vlad,jgilbert,blassey 2012-07-20 15:20:51 -04:00
Ed Morley
69ac41ee19 Backout 4987ffd173a4 (bug 687267) for bustage 2012-07-23 14:47:54 +01:00
James Willcox
9c75650095 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
Aryeh Gregor
e57dd159b2 Bug 626472 part 1 - Define nsnull as nullptr where available; r=ehsan 2012-07-20 14:16:17 +03:00
Ed Morley
a7ac1e9692 Backout 07cd3d70434c & 9be67e1a7b4f (bug 769475) for failures in arial-arabic.html 2012-07-23 11:01:59 +01:00
Jonathan Kew
cfbd46e324 bug 769475 - incorrect font used for italicized Arabic text when font-family is Arial or Times New Roman. r=smontagu 2012-07-23 03:48:26 -04:00
Vladimir Vukicevic
ebab93cfd3 b=767064; use 4444/565 GL context format for WebGL on mobile; r=jgilbert,r=bjacob 2012-07-06 09:19:27 -04:00
Chris Jones
9af2a80734 Bug 745148, part 9: Hook up the pieces and enable direct compositor. r=roc 2012-07-17 16:59:45 -07:00
Chris Jones
df4d81a2c8 Bug 745148, part 8: Implement the little boilerplate-y bits and pieces needed for cross-process compositor. r=ajuma,BenWa 2012-07-17 16:59:45 -07:00
Chris Jones
ba57040674 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
Chris Jones
52df2c5fbb Bug 745148, part 6: Allow layer trees to be given IDs so that the referent can be used in another context. r=ajuma sr=roc 2012-07-17 16:59:45 -07:00
Chris Jones
30ad2db6df Bug 745148, part 5: Pass the layer tree to ShadowLayersUpdate(). r=ajuma 2012-07-17 16:59:44 -07:00
Chris Jones
261ec69d02 Bug 745148, part 4: Remove duplicated code in Basic*ContainerLayer. r=roc 2012-07-17 16:59:44 -07:00
Matt Woodrow
963214988b Bug 539356 - Part 6 - Add compositing paint flashing to BasicLayers. r=roc 2012-07-17 13:03:51 -04:00
Matt Woodrow
8c49e4a361 Bug 539356 - Part 2 - Add new API to BasicLayers. r=roc 2012-07-17 13:03:51 -04:00
Matt Woodrow
d857e4f101 Bug 539356 - Part 1 - Allow LayerManagers to have multiple user data objects. r=roc 2012-07-17 13:03:50 -04:00
Mike Hommey
6173fa297f Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Mike Hommey
4e998b1d36 Backout changeset 2ef51674316a (bug 774032 bonus) for various Mochitest bustages on a CLOSED TREE 2012-08-04 10:38:41 +02:00
Mike Hommey
17fb6cad2d Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 08:48:56 +02:00
Mike Hommey
98cf7cdf43 Bug 774032 part 6 - Replace autoconf handling of config files and headers with our own. r=ted 2012-08-04 08:47:28 +02:00
Benjamin Peterson
99d3c15c8b backout 6609595c84eb for leaking mutex 2012-08-03 20:32:57 -07:00
Matt Woodrow
452cca761a Bug 778036 - Add Has function to gfx::UserData and use it in Layers to correctly check for existance of user data. r=roc 2012-08-03 17:38:44 -07:00
Matt Woodrow
bd240c97f8 Bug 780260 - Add serial numbers to Images and use it to check if an image has been painted to its BasicShadowableImageLayer already. r=cjones 2012-08-03 17:09:13 -07:00
Ed Morley
37898217b6 Backout 14245bf85a3d (bug 778420), b9f603d3eef4 (bug 778420), e9bc27234022 (bug 72964), d5aa53121d29 (bug 778420), 959cc7ef5f5a (bug 726053) for m1 failures in test_offline_gzip.html 2012-08-03 23:29:10 +01:00
David Zbarsky
a2c20d2493 Bug 706179 Part 3: Turn on the use of scaling for layers in FrameLayerBuilder r=mattwoodrow 2012-08-03 14:29:22 -07:00
Bobby Holley
33def11e6c Bug 778420 - Fix up tests that don't like the new enablePrivilege. r=jmaher 2012-08-03 22:19:54 +02:00
Andrew McCreight
9d50b26b4e Bug 724666 - Remove debugging printfs. r=bgirard 2012-08-01 08:51:31 -07:00
Benoit Jacob
2478e097c2 Bug 778765 - Work around nouveau driver bug by changing samples=1 to samples=0 - r=jgilbert 2012-08-03 11:08:11 -04:00
Jan Beich
759364fa7a Bug 779847: use optimized color conversion on BSDs. r=doublec 2012-08-03 15:04:39 +02:00
Brian R. Bondy
e51fe56eda Bug 770694 - Fix for snapped view windows size. r=bas 2012-07-04 20:36:37 -04:00
James Willcox
93ef7eba01 Bug 776331 - Avoid crash when trying to redraw a destroyed plugin on Android r=josh 2012-07-26 09:39:21 -04:00
Jeff Muizelaar
40983c8443 Bug 683243. Dither 16 bit gradients. r=BenWa
This does a 2x2 ordered dither in the same way that Skia does.

One of the things I'm currently unhappy with is that it duplicates
the gradient walker code for 16 bits. We could turn it into a large
macro that does the appropriate things for 16 bit and 32 bit
versions, but that's not particularly appealing.

--HG--
extra : rebase_source : ef89cd53d68166db825bb993e1262db342ba9b5d
2012-07-04 11:42:29 -04:00
Jeff Muizelaar
6d431e1711 Bug 683243. Add a 16 bit pipeline. r=BenWa
This is to support dithering 16 bit gradients with decent performance.

--HG--
extra : rebase_source : cffa90d5959211c8c1953867d85c7799ed52d662
2012-07-11 12:58:17 -04:00
Chris Jones
db8fe81f49 Bug 773192: Only proxy drawing to a non-default target in BasicShadowableLayerManager, i.e. drawWindow(USE_WIDGET_LAYERS) for a content context, when the request is same-process. r=ajuma 2012-07-12 14:07:13 -07:00
Jacek Caban
c2e3337296 Bug 778129 - GLContextProviderEGL.cpp fails to compile on mingw-w64 r=snorp 2012-08-02 15:58:34 +02:00
Steve Fink
f20c2ef916 Backed out changeset afd9e75374e8 from a CLOSED TREE for breaking Windows builds 2012-07-19 14:55:48 -07:00
James Willcox
67949244f1 Bug 687267 - Initial support for Flash on Honeycomb r=benwa,vlad 2012-07-19 16:15:40 -04:00
Andreas Gal
bdee770482 Unbind external buffers by re-binding a dummy texture to work around GL driver issues with unlocking (bug 774530, r=cjones). 2012-07-19 11:40:04 -07:00
cbrocious@mozilla.com
e2ba0ff957 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
Robert O'Callahan
16858576bf Bug 772726. Part 3: Optimize DrawTargetD2D::GetClippedGeometry for the case where all clips are rectangles, to work around a D2D geometry-intersection bug. r=bas
--HG--
extra : rebase_source : 72a21554ec37818e1b5ba4c36d03e4f81010c6a1
2012-08-10 23:18:36 +12:00
Honza Bambas
541453729c Bug 215450: Allow uploading of files greater than 2gb in size. Involves making input streams 64-bit capable. Significant work done by Makoto Kato, finished by Honza Bambas. r=hbambas,bsmedberg,jdrew,sicking 2012-08-10 22:44:11 -04:00
Ed Morley
10b5d6d4ac Backout 5d77941eba28 (bug 772726), df597d36bcbb (bug 383026), c9c7e1b9aed9 (bug 779399) for failures in meter-native-style.html 2012-08-10 14:50:43 +01:00
Robert O'Callahan
290e486f0b Bug 772726. Part 3: Optimize DrawTargetD2D::GetClippedGeometry for the case where all clips are rectangles, to work around a D2D geometry-intersection bug. r=bas
--HG--
extra : rebase_source : 51734958e7100ee4a5fc96d973905834d69345f0
2012-08-10 23:18:36 +12:00
Nicolas Silva
501a64223f Bug 776957 - Use OpenDescriptorForDirectTexturing when available in CanvasLayerOGL to avoid useless texture upload. r=cjones 2012-08-09 10:32:48 -04:00
Nathan Froyd
a7eb97f896 Bug 370750 - consolidate mochitest files installation; r=glandium
With assistance on the patch from Ms2ger, Waldo, and Mossop.
2012-07-03 16:49:02 -04:00
Vladimir Vukicevic
4c6ced282f b=767064; use 4444/565 GL context format for WebGL on mobile; r=jgilbert 2012-07-06 09:19:27 -04:00
Benoit Girard
b5177ee586 Bug 771219 - Disable progressive painting until Talos correctly measure progressive painting progress. r=ajuma 2012-07-08 11:36:49 -04:00
Benoit Girard
358e391815 Bug 771219 - Added a pref for progressive painting. r=ajuma 2012-07-06 14:38:50 -04:00
Benoit Girard
d637f02a21 Bug 771219 - Implement tile based progressive drawing. r=ajuma 2012-07-06 14:02:10 -04:00
Benoit Girard
330ecc7585 Bug 771219 - Add Repeatable transactions. r=ajuma 2012-07-06 13:58:01 -04:00
David Anderson
8cc88ca2e4 Merge from mozilla-central. 2012-06-28 15:17:18 -07:00
Jeff Gilbert
0170beea31 Bug 758844 - Requiet gfx/gl code spew - r=bjacob 2012-07-17 08:26:12 -07:00
Kan-Ru Chen
65a340614f Bug 774552 - Draw GraphicBuffer directly. r=roc,BenWa 2012-07-17 10:12:58 +08:00
David Anderson
af248c16a6 Merge from mozilla-central. 2012-06-27 11:00:48 -07:00
George Wright
4a11ba2c89 Bug 740194 - [Skia] Implement a version of SkMemory for Mozilla that uses the infallible mozalloc allocators r=cjones 2012-08-15 23:51:34 -04:00
Joe Drew
05d2135de5 Bug 781679 - Assert that we're not in the middle of a transaction when we switch layer managers. r=mattwoodrow 2012-08-15 17:55:38 -04:00
Joe Drew
c12d40e347 Bug 782416 - Switch from NULL to nullptr in gfx::2d. r=Bas
--HG--
extra : rebase_source : cfa9fc8ae592880e22e1f14cee42539b4f911668
2012-08-14 14:06:12 -04:00
Joe Drew
97cec546da Bug 782416 - Make gfx::2d's nullptr definition actually work. r=nrc
--HG--
extra : rebase_source : da098e5e6d04aa1dce2ffefd4ccd0ad6ffb376b8
2012-08-15 15:24:44 -04:00
George Wright
77abf24bff Backed out changeset c2475674e105 2012-08-15 17:26:45 -04:00
George Wright
d6f608d0d1 Bug 740194 - [Skia] Implement a version of SkMemory for Mozilla that uses the infallible mozalloc allocators r=cjones
--HG--
extra : rebase_source : 6dc39ae06b4cb38cd8e85e41c01077f815b8f8c8
2012-08-15 16:59:07 -04:00
Justin Lebar
4ae3ae1f2c Bug 782971 - Fix crash resulting from not initializing an argument in ShadowThebesLayerOGL::Swap(). r=cjones 2012-08-15 14:36:44 -04:00
Joe Drew
012f6296d7 Back out 98d2c24ce932 for failing to build r=moron 2012-08-15 12:51:33 -04:00
Joe Drew
7d9c231869 Bug 782416 - Switch from NULL to nullptr in gfx::2d. r=Bas
--HG--
extra : rebase_source : 9b12a2af4c55f4dc383e8075b400e7a1fbe1ac23
2012-08-14 14:06:12 -04:00
Ms2ger
f900f266f1 Backout bug 781731. 2012-08-27 12:27:40 +02:00
Anthony Jones
0e06d7bda0 Bug 781731 - Fixed failed assertion in reftest1; r=doublec 2012-08-27 22:01:47 +12:00
Anthony Jones
cd3e2d436b Bug 781731 - Use a similar surface for non-blurred shadows to improve performance; r=roc 2012-08-27 11:34:33 +02:00
Anthony Jones
e1f0182516 Bug 781731 - Speed up shadows by using tee surface to avoid doing a read back; r=roc 2012-08-27 11:34:07 +02:00
Anthony Jones
f506730ee0 Bug 781731 - Fix shadow surface extents so they aren't double padded; r=roc 2012-08-27 11:32:14 +02:00
Anthony Jones
e10d5fffde Bug 781731 - Clean up DrawTargetCairo::DrawSurfaceWithShadow() to make it simpler and paint correctly in all modes; r=jrmuizel 2012-08-27 11:31:56 +02:00
Anthony Jones
a918455be9 Bug 781731 - Fixed Azure Cairo GTK perf by removing xlib to buffered image conversion; r=Bas 2012-08-27 11:31:33 +02:00
Kan-Ru Chen (陳侃如)
abc77a9c59 Bug 785001 - Add default constructor to PlanarYCbCrImage::Data. r=roc 2012-08-26 20:14:20 -03:00
Matt Woodrow
69d5c7c425 Bug 779940: Meter layers transactions in addition to composites. r=cjones 2012-08-07 14:41:29 +12:00
Kan-Ru Chen (陳侃如)
b6dc323f77 Bug 767480 - Remove offset field from PlanarYCbCrImage::Data. r=roc 2012-08-26 00:22:51 -03:00
David Zbarsky
e0fe5ae49b Bug 785657 - Enable async animations in content processes r=cjones 2012-08-25 21:27:28 -04:00
Kyle Huey
674bb7388a No bug: Fix some class/struct mismatch warnings on MSVC.
--HG--
extra : rebase_source : 28a4fa9689a62c497fc537d3cc7b9bae4bda8d58
2012-08-24 11:45:05 -07:00
Nicholas Cameron
ec4082e8bb Bug 768079; mask layers force an intermediate surface for their containers. r=roc 2012-06-27 08:06:32 +12:00
Nicholas Cameron
205bca3553 Bug 768079; test for patch. r=roc 2012-06-27 08:06:32 +12:00
Ed Morley
ef4179d2d4 Backout de70e79ced32, ddd519d0767e, 9b952d924953 & 03efce585669 (bug 758620) for reftest failures 2012-06-26 16:13:33 +01:00
Chris Lord
b05770560f 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-26 14:43:18 +01:00
Chris Lord
1448e862c1 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-26 14:43:11 +01:00
Jonathan Kew
486d6a7bf5 bug 763873 - avoid repeatedly accessing aRanges.Length() within ComputeRanges. r=jdaggett 2012-06-26 09:51:37 +01:00
Nicholas Cameron
6be9877aaf Bug 757347; checking the format of images. r=roc 2012-06-26 14:43:31 +12:00
Nicholas Cameron
88e40f4fe1 Bug 757346; Use A8 textures (OGL). r=roc 2012-06-26 14:43:31 +12:00
Nicholas Cameron
9f19c1a23a Bug 757346; Use A8 textures (DX9). r=roc 2012-06-26 14:43:31 +12:00
Nicholas Cameron
03e8305815 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
34289b5948 Bug 757347; Add a shutdown hook and remove MaskImageFormat(). r=roc 2012-06-26 14:43:30 +12:00
Nicholas Cameron
dde00bf60b Bug 757347; changes to FrameLayerBuilder. r=roc 2012-06-26 14:43:30 +12:00
Bas Schouten
d8b7729753 Bug 765845: Reduce calling frequency of SetTextRenderingParams. r=jrmuizel 2012-06-26 02:59:18 +02:00
Nicholas Cameron
549b63d97d Back out bug 757346
--HG--
extra : rebase_source : 8a07c2c56ca9dbc165012b679d421435cc886c2c
2012-06-26 10:54:05 +12:00
Nicholas Cameron
bb0ad1299c Bug 757346 followup, actually compile 2012-06-26 10:15:15 +12:00
Nicholas Cameron
e0a38b326b Bug 757347; checking the format of images. r=roc 2012-06-26 09:44:41 +12:00
Nicholas Cameron
14b8ef1f95 Bug 757346; Use A8 textures (OGL). r=roc 2012-06-26 09:44:41 +12:00
Nicholas Cameron
ac7e54e7fc Bug 757346; Use A8 textures (DX9). r=roc 2012-06-26 09:44:41 +12:00
Nicholas Cameron
aae4ecb5d0 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
f7821afd6f Bug 757347; Add a shutdown hook and remove MaskImageFormat(). r=roc 2012-06-26 09:44:41 +12:00
Nicholas Cameron
6f0ff4bb34 Bug 757347; changes to FrameLayerBuilder. r=roc 2012-06-26 09:44:41 +12:00
David Zbarsky
4e2cd5f742 no bug, avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor in APZ, blanket r=bz 2012-07-20 16:49:12 -04:00
James Willcox
f0d7883166 Bug 687267 - Initial support for Flash on Honeycomb r=bgirard,vlad,jgilbert 2012-07-20 15:20:51 -04:00
Andreas Gal
9b43cdb80d Remove dead code from upload path (bug 775863, r=cjones). 2012-07-20 00:36:19 -07:00
Brian R. Bondy
cd57d05a97 Bug 750898 - GFX code for Metro. r=bas 2012-07-17 21:53:28 -04:00
Brian R. Bondy
e37f6f4b34 Bug 747377 - Force D2D on in Metro mode. r=bas 2012-07-17 21:53:12 -04:00
Marshall Culpepper
4ba3595a19 Bug 749538 - Check 24bpp/RGBX_8888 and 32bpp/RGBA_8888 when validating EGL Contexts. r=vlad 2012-07-07 10:06:59 -04:00
Chris Jones
a461883264 Bug 765734, part 6: Integrate gralloc buffers into the shadow-layers pipelines. r=gal
--HG--
extra : rebase_source : f7d46aeab3c44d237c8f2ab690caf00f6cd3270d
2012-07-12 05:51:58 -07:00
Chris Jones
2e1fa258fd 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
f2d2a7bb3b 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
e0f72354fe Bug 765734, part 3: Remove unused code. r=mattwoodrow
--HG--
extra : rebase_source : 9c7f8b54b501ebcc9d3f8e757044b8d3f52d1cd9
2012-07-12 05:51:57 -07:00
Chris Jones
fae577c2a7 Bug 765734, part 2: Migrate ImageLayers to SurfaceDescriptor. r=mattwoodrow,roc
--HG--
extra : rebase_source : 19fc8b0ae4cfffdf9a098911deac3b48c2f5d768
2012-07-12 05:51:57 -07:00
Chris Jones
4b8927b5f1 Bug 765734, part 1: Let clients specify capabilities required of cross-process surfaces. Only MAP_AS_IMAGE_SURFACE needed for now. r=roc
--HG--
extra : rebase_source : a2e4411772b4504ce86900826d2dc812dcaa68be
2012-07-12 05:51:57 -07:00
Chris Jones
70375ea1b1 Bug 765734, part 0.2: Remove \r from basic layers files. r=nrc
--HG--
extra : rebase_source : c79a1469e473865a22d83b503c947ef3a6b26889
2012-07-12 05:51:57 -07:00
Matt Woodrow
d8981c966e Bug 718849; fix radial gradients in Skia. r=Bas 2012-06-18 15:06:22 +12:00
David Zbarsky
1e9fefd64e Bug 706179 Part 2: Add a BaseTransform and scaling to layers, r=roc, cjones 2012-07-30 19:20:00 -07:00
David Zbarsky
06ea1f66f2 Bug 778519 - Don't include Layers.h everywhere Part 2 r=cjones 2012-07-30 17:42:26 -07:00
Ryan VanderMeulen
ed3645f4ca Merge m-c to inbound. 2012-07-30 20:14:22 -04:00
Aryeh Gregor
9ee902c3ed Bug 777292 - gfx/, widget/: Remove conversions to nsresult that will always result in NS_SUCCEEDED; r=roc 2012-07-27 16:52:43 +03:00
Aryeh Gregor
903f6c9c84 Bug 777292 - Convert incorrect conversions to nsresult and fix named constants; r=ehsan 2012-07-27 16:59:29 +03:00
Vladimir Vukicevic
bf0ee680e1 b=773071; more incorrect merge fixup for KHR_fence_sync; r=vlad 2012-07-30 11:07:23 -04:00
Ehsan Akhgari
b40b21d633 Merge the nullptr conversion from mozilla-central into mozilla-inbound 2012-07-30 10:28:15 -04:00
Aryeh Gregor
14f9145bbf Bug 777292 - Switch incorrect nsresult to nsrefcnt; r=ehsan 2012-07-27 17:03:25 +03:00
Matt Woodrow
a4e32aaab0 Bug 718849; fix radial gradients to the spec. r=Bas 2012-06-18 15:06:22 +12:00
Bas Schouten
58584f2ceb Bug 777700 - Part 2: Verify if a cached SourceSurface is still valid. r=jrmuizel 2012-07-28 02:33:08 +02:00
Bas Schouten
69cb6d9312 Bug 777700 - Part 1: Add a way to check validity of SourceSurfaces. r=jrmuizel 2012-07-28 02:33:08 +02:00
Benjamin Peterson
5cf420dd36 Backout 22eea4925efc for windows failures 2012-07-27 21:47:06 -07:00
Benjamin Peterson
627bc81505 Backout 46b27e913ac9 for windows failures 2012-07-27 21:46:51 -07:00
Doug Sherk
4b06950c82 Bug 775463: Recognize double tap gestures while still supporting single taps r=cjones 2012-07-27 19:24:24 -07:00
Ryan VanderMeulen
0a6e3c1d9a Backout e0e33c1c7c17 and 3d0fb7ac961a (bug 775463) due to bustage. 2012-07-27 20:46:49 -04:00
Bas Schouten
6f26f9c15f Bug 777700 - Part 2: Verify if a cached SourceSurface is still valid. r=jrmuizel 2012-07-28 02:33:08 +02:00
Bas Schouten
561e8409f6 Bug 777700 - Part 1: Add a way to check validity of SourceSurfaces. r=jrmuizel 2012-07-28 02:33:08 +02:00
Doug Sherk
4e801b42e1 Bug 775463: Fix a mistake in a comment r=none DONTBUILD 2012-07-27 17:26:14 -07:00
Doug Sherk
42ecca33c0 Bug 775463: Recognize double tap gestures while still supporting single taps 2012-07-27 17:23:51 -07:00
Oleg Romashin
5fcecd68ea Bug 778195 - Add string.h to cover memcpy include and fix build error. r=nrc 2012-07-27 17:51:53 -04:00
Jeff Gilbert
a7225d7ed8 Bug 736298 - Remove unused CreateForNativePixmapSurface - r=bjacob 2012-07-27 14:30:38 -07:00
David Zbarsky
9bf8a70491 Bug 706179 Part 2: Add a BaseTransform to layers r=roc 2012-07-27 13:23:45 -07:00
David Zbarsky
7dcf199c9c Bug 755084 Part 3: Move checks for whether to animate opacity and transforms on the compositor thread to nsLayoutUtils, and make them also check whether the compositor is actually running r=cjones,dbaron 2012-07-27 13:23:45 -07:00
David Zbarsky
12752872fe Bug 706179: Add support for animations to the Layers API r=roc, dbaron, cjones 2012-07-27 13:23:44 -07:00
Nicolas Silva
062884e98d Bug 775226 - Support CreateDrawTargetForData with Azure's CoreGraphics backend, r=jrmuizel 2012-07-26 14:06:23 -04:00
George Wright
2a90ed1ba7 Bug 778202 - Filter out -pedantic for the Skia subdirectory. r=jrmuizel 2012-07-27 14:10:36 -04:00
Doug Sherk
a178e53bd6 Bug 777264: Remove timer-based repaint throttling r=cjones 2012-07-27 00:33:57 -07:00
Doug Sherk
c1d2060973 Bug 777264: Fix AsyncPanZoomController and Axis to use CSS pixels for dimension checking r=cjones 2012-07-27 00:33:53 -07:00
Doug Sherk
b6a7422619 Bug 777264: Throttle repaint requests in Gecko panning/zooming r=cjones 2012-07-27 00:33:48 -07:00
David Zbarsky
87e7b8b42a [Bug 777657] Fix some opt build warnings r=cjones 2012-07-26 21:02:05 -07:00
Vladimir Vukicevic
9eaaa81dc3 b=773071; use KHR_fence_sync instead of GuaranteeResolve, fixup; r=jgilbert 2012-07-26 21:31:42 -04:00
Kan-Ru Chen
3687e6bf7a Bug 777495 - Fallback to TexImage2D if unable to allocate gralloc buffer. r=cjones 2012-07-27 08:47:14 +08:00
Doug Sherk
2b84631ef6 Bug 779344: Properly transform B2G panning/zooming after layers changes r=dzbarsky 2012-07-31 16:19:25 -07:00
Karl Tomlinson
4f22ae8780 b=775848 Initialize BasicShadowLayerManager::mRepeatTransaction appropriately r=BenWa
--HG--
extra : transplant_source : %3F%14R%1BD%CCL%AFL4%B2%ACN%1EP%D03%F5%27D
2012-07-31 14:54:36 +12:00
Karl Tomlinson
e5ff09f31a b=687831 use XSync for glXWaitX with Mesa r=mattwoodrow
--HG--
extra : transplant_source : I%ADPT%BA%E4%A4%C8V%D64%EF%BF%B1l%C1%D2%FEe%B8
2012-07-31 14:54:21 +12:00
Karl Tomlinson
d138dc914c b=687831 remove unused gIsChromium r=mattwoodrow
--HG--
extra : transplant_source : %94nUe%29Y%A1%1B2g%10_%D0%DB%2B%C9%AAE%E1%F8
2012-07-31 14:54:21 +12:00
Karl Tomlinson
7f837343e4 b=707722 select config in CreatePixmap to match Pixmap format r=mattwoodrow
--HG--
extra : transplant_source : %EB%B9%B8%E1%F8%19%E8%D9%94%A3GX%DC%EC%AA%23%8Be%13%F5
2012-07-31 14:54:21 +12:00
Karl Tomlinson
9c7714f910 b=778031 remove unnecessary ScopedXErrorHandler::GetError interface r=cjones
--HG--
extra : transplant_source : %FE%EC%0A%24%1B%8A%B3%D2%94%F6%2B%23%E3%A9R%8Df%90%FF%17
2012-07-31 14:54:21 +12:00
Karl Tomlinson
efce7d7c15 b=778031 add FinishX to XSync less frequently and use it r=cjones
--HG--
extra : transplant_source : %BC%2C%80%F65%1DV%B7YVI%80%B2%FD%FE%F1%18G%06%26
2012-07-31 14:54:21 +12:00
Jeff Muizelaar
d8f1a99c9c Bug 778307. Don't shadow mFormat in DrawTargetCG. r=bgirard
This was causing problems with Azure content.
2012-07-31 12:28:03 -07:00
David Zbarsky
f4b0395707 Bug 755084 Part 3: Move checks for whether to animate opacity and transforms on the compositor thread to nsLayoutUtils, and make them also check whether the compositor is actually running r=cjones,dbaron 2012-07-31 10:28:22 -07:00
David Zbarsky
1ab8257975 Bug 706179 Part 1: Add support for animations to the Layers API r=roc, dbaron, cjones 2012-07-31 10:28:20 -07:00
Benoit Girard
be1e81f90f Bug 724666 - Part 2: Add CGIOSurfaceContext to azure. r=jmuizelaar 2012-07-31 11:17:43 -04:00
Benoit Girard
d38270d473 Bug 724666 - Part 1: Refactor nsCoreAnimation support into azure QuartzSupport. r=jmuizelaar
--HG--
rename : gfx/thebes/nsIOSurface.h => gfx/2d/MacIOSurface.h
rename : gfx/thebes/nsCoreAnimationSupport.mm => gfx/2d/QuartzSupport.mm
2012-07-31 11:11:57 -04:00
David Anderson
eccdd8879b Merge from mozilla-central. 2012-06-26 15:37:34 -07:00
David Anderson
5708a1e047 Merge from mozilla-central.
--HG--
extra : rebase_source : 521cbf2f434cad88106f32be797faae4861afc39
2012-06-25 13:09:36 -07:00
Aryeh Gregor
0923bf00ef Bug 780618 - Move all error codes to nsError.h; r=ehsan 2012-07-27 17:03:27 +03:00
Nicholas Cameron
d11aac3e65 Bug 746883; fix the bustage possibly caused by 746896. r=mattwoodrow 2012-07-26 14:30:20 +12:00
Nicholas Cameron
7aa563c2b9 Bug 764125; remove AzureEnabled from gfxInfo and replace with backend check. r=roc 2012-07-26 13:56:42 +12:00
Nicholas Cameron
97d6423dfa Bug 764125; sort out preferred and fallback Azure backends for all platforms (gfxPlatform). r=Bas 2012-07-25 12:45:58 +12:00