Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
339,575 Commits 615 Branches 98 Tags 5.8 GiB
f7cf973b9a
Commit Graph

14078 Commits

Author SHA1 Message Date
Benoit Girard
65cae9c4de Bug 904227 - Expect any number of calls to SendAsyncScrollDOMEvent. r=kats 2013-12-07 12:45:19 -05:00
Ryan VanderMeulen
c269bf8ea6 Backed out 17 changesets (bug 897452) for OSX crashes on a CLOSED TREE. 
Backed out changeset 11ad8608bc27 (bug 897452)
Backed out changeset 6bcc629e76f9 (bug 897452)
Backed out changeset b91c858a43f5 (bug 897452)
Backed out changeset 38ba49ee3e97 (bug 897452)
Backed out changeset ea184ef84762 (bug 897452)
Backed out changeset 686cc5122149 (bug 897452)
Backed out changeset 3685a8018e49 (bug 897452)
Backed out changeset be7ef6240068 (bug 897452)
Backed out changeset f95c20e70947 (bug 897452)
Backed out changeset 4a370d2a1c62 (bug 897452)
Backed out changeset 1222f6ab66d2 (bug 897452)
Backed out changeset 5e9d3c681ee9 (bug 897452)
Backed out changeset 3b9ddce12b7a (bug 897452)
Backed out changeset 7aec6387f3e9 (bug 897452)
Backed out changeset eb1fe464fdaf (bug 897452)
Backed out changeset 07deaa53b6fd (bug 897452)
Backed out changeset ddab7d071d69 (bug 897452)
 2013-12-11 14:52:50 -05:00
Phil Ringnalda
ef063fb0d4 Back out b6f9dbc91dc4 (bug 947038) for Cipc crashes 2013-12-12 23:33:50 -08:00
David Anderson
f853c97cb8 Ensure that the software compositor never uses deprecated textures (bug 947038, r=mattwoodrow). 2013-12-12 20:29:14 -08:00
Ryan VanderMeulen
cd364e9987 Merge m-c to inbound. 2013-12-13 16:16:46 -05:00
Benoit Jacob
fad917b723 Bug 948406 - Append some zeros to EGL attrib lists to work around a bug in Android/B2G emulator - r=vladv 2013-12-13 15:15:07 -05:00
Chris Lord
8fa042c6ad Bug 936500 - Don't copy Axis when creating a FlingAnimation. r=kats 
FlingAnimation was, likely accidentally, creating copies of the axes it was
animating and operating on those, which lead to problems when displayports
were calculated based on the original copies which housed old values.
 2013-12-13 19:37:42 +00:00
Benoit Girard
892081b54a Bug 941095 - Part 2: Disable subpixelaa + component alpha. r=mattwoodrow 
--HG--
extra : rebase_source : 7e3a0d3710fb29b47615cc0254135d3b44637ed8
 2013-12-13 13:53:18 -05:00
Benoit Girard
dc08516cff Bug 941095 - Part 1: Support SetPermitSubpixelAA with Quartz. r=bas 
--HG--
extra : rebase_source : 69171a8a17a34c822b34f48babecf18ffa08bf56
 2013-12-11 23:16:03 -05:00
Bill McCloskey
e3463fe50e Bug 948238 - Read browser.tabs.remote once at startup and never again (r=bsmedberg) 2013-12-12 14:13:20 -08:00
Benoit Jacob
42e7c9fc5a Bug 897452 - Part 15 - Introduce a AtomicRefCountedWithFinalize class to factor our custom-refcounting needs - r=nical 2013-12-11 13:05:37 -05:00
Benoit Jacob
89e20e13a1 Bug 897452 - Part 14 - Implement CompositableChild::ActorDestroy clearing the back-reference to it - r=nical 2013-12-11 13:05:35 -05:00
Benoit Jacob
e0cf389a4b Bug 897452 - Part 13 - Host-side cleanup: remove OnActorDestroy and DestroyTextureHost* - r=nrc 2013-12-11 13:05:34 -05:00
Benoit Jacob
ad578d9a57 Bug 897452 - Part 12 - remove CompositableClient::OnActorDestroy - r=nrc 2013-12-11 13:05:32 -05:00
Benoit Jacob
448c42bafe Bug 897452 - Part 11 - remove TextureClient::OnActorDestroy - r=nrc 2013-12-11 13:05:29 -05:00
Benoit Jacob
2c56c71b5c Bug 897452 - Part 10 - adapt post landing of bug 893301 - r=nical,nrc 2013-12-11 13:05:27 -05:00
Benoit Jacob
3f6accaff7 Bug 897452 - Part 9 - Check for null buffer in BufferTextureHost::Upload - r=nical 2013-12-11 13:05:25 -05:00
Benoit Jacob
c99996909d Bug 897452 - Part 8 - fix TextureParent::ActorDestroy - r=nical 2013-12-11 13:05:23 -05:00
Benoit Jacob
513ae59f87 Bug 897452 - Part 7 - Implement TextureChild::ActorDestroy to notify its TextureClient - r=nical 2013-12-11 13:05:21 -05:00
Benoit Jacob
124e78fd76 Bug 897452 - Part 6 - assert that the forwarder we're initializing our TextureChild with is non null - r=nical 2013-12-11 13:05:19 -05:00
Nicolas Silva
f87e0fdc23 Bug 897452 - Part 5 - Fix a TextureClient gtest crash - r=BenWa 2013-12-11 13:05:17 -05:00
Nicolas Silva
c546c5862a Bug 897452 - Part 4 - Make sure we release all GL resources asap when shutting down the communication channel - r=bjacob 2013-12-11 13:05:15 -05:00
Nicolas Silva
e3132d6da3 Bug 897452 - Part 3 - Clean up some unused code after PTexture change - r=mattwoodrow 2013-12-11 13:05:13 -05:00
Nicolas Silva
d624f90dd5 Bug 897452 - Part 2 - PTexture deallocation logic - r=sotaro,bjacob 2013-12-11 13:05:11 -05:00
Nicolas Silva
01cd073429 Bug 897452 - Part 1 - Implement the PTexture protocol - r=mattwoodrow 2013-12-11 13:05:09 -05:00
Nicolas Silva
171c6f13c2 Bug 897452 - Part 0.2 - Make sure the texture host has a compositor - r=mattwoodrow 2013-12-11 13:05:07 -05:00
Nicolas Silva
85c56fc061 Bug 897452 - Part 0.1 - Make it possible for TextureClient to call virtual methods just before its destructor. r=bjacob 2013-12-11 13:05:05 -05:00
Nicolas Silva
7841da0a81 Bug 948955 - AddMaskEffect handles locking failure. r=bjacob 2013-12-11 18:32:41 +01:00
Vivien Nicolas
f20d4af270 Bug 946999 - [Homescreen] With APZ turned on the homescreen is not rendered until you touch the screen in certain conditions. r=kats 2013-12-12 11:41:47 +01:00
Wes Kocher
df8b1437b6 Backed out 6 changesets (bug 877115) for mochitest-1 and reftest orange on this CLOSED TREE 
Backed out changeset 65ad9d8860d6 (bug 877115)
Backed out changeset bf8095c168fb (bug 877115)
Backed out changeset 290ad5863615 (bug 877115)
Backed out changeset 4488ec28910e (bug 877115)
Backed out changeset 45f8859c6fd6 (bug 877115)
Backed out changeset 111cc426fa9e (bug 877115)
 2013-12-16 16:33:07 -08:00
Andreas Pehrson
2d0ad0d42d Bug 877115 - [Moz2Dify] Part 6. Moz2Dify SharedSurface_EGLImage::GetPixels. r=nical 2013-12-16 15:50:53 -05:00
Andreas Pehrson
96f82c49cb Bug 877115 - [Moz2Dify] Part 5. Minimize gfxIntSize usage in GLContext. r=nical 2013-12-10 17:12:42 +01:00
Andreas Pehrson
4372b58d1c Bug 877115 - [Moz2Dify] Part 4. Change gfxIntSize to gfx::IntSize in GLScreenBuffer and friends. (carries r=nical) 2013-12-10 17:12:18 +01:00
Andreas Pehrson
2fdd39a52c Bug 877115 - [Moz2Dify] Part 3. Change gfxIntSize to gfx::IntSize in GLContext::OffscreenSize and dependendent classes. r=nical 2013-12-10 17:11:58 +01:00
Andreas Pehrson
99e812a782 Bug 877115 - [Moz2Dify] Part 2. Moz2Dify GLContext::ResizeOffscreen signature. (carries r=nical) 2013-12-10 17:11:11 +01:00
Andreas Pehrson
a5a5fddae5 Bug 877115 - [Moz2Dify] Part 1. Remove ImageFormat typedef from GLContext. (r=nical) 2013-12-10 17:10:41 +01:00
Ryan VanderMeulen
613401daac Merge m-c to inbound. 2013-12-16 16:59:33 -05:00
Jeff Muizelaar
d3040f3cad Bug 948128. Add StackArray helper. r=Bas 
This is helpful for when we want to convert between
different types and we need a short lived piece of memory.

--HG--
extra : rebase_source : b841a535cb1ddd837df4b34949bd34054c438c67
 2013-12-09 17:07:13 -05:00
Geoff Brown
dcefecb5e4 Bug 936226 - (4) Adjust crashtest manifest for Android x86; r=dminor 2013-12-06 16:02:48 -07:00
Trevor Saunders
d43c55ca0e bug 949821 - use MOZ_UTF16 more and NS_LITERAL_STRING less r=froydnj 2013-12-12 20:50:01 -05:00
Chris Peterson
d7d012bff7 Bug 949360 - Check for Image AllocateBuffer() failures. r=nical 
Relanded on a CLOSED TREE
 2013-12-10 22:58:51 -08:00
Ehsan Akhgari
e9e9c7d188 Backed out changeset 6d9cf51a012a (bug 949360) because of mochitest-3 timeouts on a CLOSED TREE 2013-12-12 11:26:24 -05:00
Chris Peterson
8b72ea8324 Bug 949360 - Check for Image AllocateBuffer() failures. r=nical 2013-12-10 22:58:51 -08:00
Robert O'Callahan
182a8c2ebe Bug 945634. The fixed-pos anchor point should be in the layer's coordinate system, whose 0,0 is the top-left of the fixed-pos frame. r=mattwoodrow 2013-12-13 01:33:02 +13:00
Ryan VanderMeulen
839040eeee Merge m-c to inbound. 2013-12-06 16:13:37 -05:00
Ryan VanderMeulen
e837de97ec Merge b2g-inbound to m-c. 2013-12-06 15:56:46 -05:00
David Keeler
6420b4588d bug 946791 - remove unused GLContextGLX::mLibType (leaving GLXLibrary::mLibType alone) r=bjacob 2013-12-06 11:59:26 -08:00
Vivien Nicolas
1fad3297b3 Bug 946955 - Set the default friction of Axis.cpp to 0.002. r=kats 2013-12-06 18:51:10 +01:00
Dan Glastonbury
aef4e1d147 Bug 945023 - Extract CreateTextureXXX and CreateRenderbufferXXX from GLContext. r=bjacob 2013-12-06 10:36:13 -05:00
Nicolas Silva
711566e4d8 Bug 943392 - Let MemoryTextureClient use a fallible allocation. r=BenWa 2013-12-06 16:30:50 +01:00
Dan Glastonbury
1a74976806 Bug 942507 - GLContext doesn't need to have userdata. r=bjacob 2013-12-06 10:23:16 -05:00
Chris Lord
57659368a9 Bug 943846 - Make APZC's generated display port contain the composition bounds. r=kats 
A bug in layout means that setting a displayport on an element that doesn't
contain its scroll frame may cause the display item to be optimised away
(bug 936500).
 2013-12-06 13:15:58 +00:00
Carsten "Tomcat" Book
218b967877 Merge m-c to mozilla-inbound 2013-12-06 07:38:31 +01:00
John Daggett
eca4a4d041 Bug 947025 - Limit the time spent in RunLoader to avoid chrome hang. r=roc 2013-12-06 12:47:46 +09:00
Anthony Jones
dc434fe6a9 Bug 839911 - Separate animation out from layer code; r=kats 2013-12-06 16:21:39 +13:00
Benoit Girard
e437a282e0 Bug 940706 - Fix gesture detection transformation with APZC. r=kats,botond 2013-12-05 18:17:37 -05:00
Ryan VanderMeulen
92933e2af0 Merge m-c to inbound. 2013-12-05 17:56:44 -05:00
Ryan VanderMeulen
84787e77aa Merge b2g-inbound to m-c. 2013-12-05 17:53:41 -05:00
Ryan VanderMeulen
b9c8c56382 Merge inbound to m-c. 2013-12-05 17:29:03 -05:00
Carsten "Tomcat" Book
329dc1fc63 merge b2g-inbound to m-c 2013-12-05 12:57:24 +01:00
Andreas Gal
62ef63ce40 Bug 946541 - Fix Skia cache purging. r=gw280 2013-12-04 23:52:03 -05:00
Nicholas Nethercote
b413e441cf Bug 943660 (part 2) - Remove remnants of Remove nsIMemoryReporter::name. 
--HG--
extra : rebase_source : 900bd1c641b26623cccf14d952b5387223b489eb
 2013-12-03 20:01:24 -08:00
Ryan VanderMeulen
b641f5ee20 Backed out changeset 8b33af450fc6 (bug 945632) for OSX asserts. 
CLOSED TREE
 2013-12-04 22:03:29 -05:00
Jim Chen
e72ffaed40 Bug 940737 - Monitor Compositor thread hangs using BackgroundHangMonitor; r=bsmedberg r=BenWa 2013-12-04 21:24:28 -05:00
Ryan VanderMeulen
8648eb6908 Backed out changeset 9d673e562fa6 (bug 945023) for OSX bustage. 2013-12-04 20:42:55 -05:00
Botond Ballo
1576a91e09 Bug 942754 - Propagate zoom constraints from parent to child APZCs. r=kats 
--HG--
extra : rebase_source : 92c3dcac3db2cd457d650ec08abfbab03c9517ce
 2013-12-02 18:01:19 -05:00
Benoit Girard
27592060c0 Bug 904227 - Disable gfxWordCacheTest.cpp to see if it helps with gtest crashes. r=bjacob 2013-12-05 11:36:04 -05:00
Vivien Nicolas
dc2522ad94 Bug 938312 - Wrong orientation when starting browser in landscape mode. r=kats 2013-12-05 16:15:39 +01:00
Sotaro Ikeda
cd9b41c6cb Bug 944420 - Create TextureHostOGL when Compositor is not present on gonk. r=nical 
--HG--
extra : rebase_source : 289bb433a863d22c16ad8aacb727f2f52f7a81f3
 2013-12-04 17:46:03 -05:00
Mike Hommey
47bcdc4d05 Bug 946579 - Fix non-unified build in gfx/gl after bug 942505. r=bjacob 2013-12-06 08:45:29 +09:00
Kyle Huey
a4bc193dab Bug 910878 - Remove gl.blit-draw-not-copy preference. r=gal 2013-12-05 09:37:37 -05:00
Nicholas Cameron
054d6a53e6 Bug 945632. Assert we don't leak on the host side. r=nical 2013-12-05 14:21:15 +13:00
Dan Glastonbury
6377363d81 Bug 945023 - Extract CreateTextureXXX and friends from GLContext. r=bjacob 2013-12-04 15:41:22 +10:00
Morris
4ca7fd46aa Bug 938528 - Check if data in the layer is still valid. r=gw280, r=snorp 2013-12-04 17:46:20 -05:00
Ryan VanderMeulen
8c89455659 Merge inbound to m-c on a CLOSED TREE. 2013-12-04 17:35:44 -05:00
Benoit Jacob
12ae30d582 Back out bug 893301 for accidentally disabling gralloc for thebes layers on B2G - no review, bustage fix on a CLOSED TREE 2013-12-04 12:19:50 -05:00
Jacek Caban
05a5241c15 Bug 848491 - Fixed cross compilation with mingw. 2013-12-04 13:25:41 +01:00
Jonathan Kew
f2d9c8189f bug 941470 - update harfbuzz to latest upstream commit (205bf834...), to pick up plan-caching for user features and misc fixes. r=jdaggett 2013-12-04 07:07:44 +00:00
Nicholas Cameron
7579d5e3ae Bug 946031. Fix a warning in DeprecatedContentClientSingleBuffered::SyncFrontBufferToBackBuffer. r=mattwoodrow 2013-12-04 17:33:16 +13:00
David Anderson
15ea1ba33f Support MacIOSurface textures in the basic compositor (bug 942358, r=mattwoodrow). 2013-12-03 16:20:04 -08:00
Andreas Pehrson
e51a2e7fbb Bug 944679 - Do not return nullptr in DeprecatedTextureHostBasic::GetAsSurface. r=nical 2013-11-29 13:39:52 +01:00
Nicholas Cameron
252dc1e208 Bug 893301. Don't use new textures content on b2g. r=bjacob,nical 2013-12-06 07:39:22 +13:00
Nicholas Cameron
6083fff067 Bug 893301. Rollup patch - new textures content. r=nical,nrc 2013-12-06 07:39:22 +13:00
Nicholas Cameron
68f0c59c0c No bug. Remove an erroneous comment. r=me. DONTBUILD 2013-12-04 12:28:36 +13:00
Benoit Girard
8a7a10f03a Bug 944866 - Bustage Intermittent failure. r=bustage on a CLOSED TREE 2013-12-03 15:04:47 -05:00
Benoit Girard
35f400bc25 Bug 944866 - Bustage fix for gfx::pint. r=bustage on a CLOSED TREE 2013-12-03 14:07:26 -05:00
Benoit Jacob
6ffd3ab0a6 Bug 942499 - Part 3: Move CanReadSRGBFromFBOTexture out of GLContext - r=gal,jgilbert 2013-12-03 13:44:38 -05:00
Benoit Jacob
6896c52e8a Bug 942499 - Part 2: Move CanUploadNonPowerOfTwo out of GLContext; remove the gfx.textures.poweroftwo.force-enabled preference - r=gal,BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
30d72ed7e8 Bug 942499 - Part 1: Move CanUploadSubTextures and WantsSmallTiles out of GLContext - r=BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
b56cec3f0a Bug 942500 - Move GLContext::TexImage2D and friends out of GLContext - r=jgilbert 2013-12-03 13:44:38 -05:00
Benoit Jacob
884f878ce5 Bug 942509 - Move Upload* functions to new GLUploadHelpers files - r=gal,jgilbert 2013-12-03 13:44:38 -05:00
Benoit Jacob
988099a6e9 Bug 942501 - Part 3: move CreateTextureImage and TileGenFunc out of GLContext - r=BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
6e3c0e9b4b Bug 942501 - Part 2: move TextureImageCGL to separate files - r=BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
4513257f15 Bug 942501 - Part 1: remove some dead code around TextureImage functions - r=BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
16bf395b6f Bug 944703 - Part 8: make ShmemTextureClient hold a strong reference to its ISurfaceAllocator - r=nical 2013-12-03 13:44:38 -05:00
Benoit Jacob
ddb176c17b Bug 944703 - Part 7: make DeprecatedSharedRGBImage hold a strong reference to its ISurfaceAllocator - r=nical 2013-12-03 13:44:38 -05:00
Benoit Jacob
172bcf7d70 Bug 944703 - Part 6: make DeprecatedSharedPlanarYCbCrImage hold a strong reference to its ISurfaceAllocator - r=nical 2013-12-03 13:44:38 -05:00
Benoit Jacob
449cdb54de Bug 944703 - Part 5: make AllocShmemParams hold a strong reference to its ISurfaceAllocator - r=nical 2013-12-03 13:44:38 -05:00
Benoit Jacob
036aec2ce9 Bug 944703 - Part 4: make ContentHost hold a strong reference to its ISurfaceAllocator - r=nical 2013-12-03 13:44:38 -05:00
Benoit Jacob
5d67536954 Bug 944703 - Part 3: make TextureHost hold a strong reference to its ISurfaceAllocator - r=nical 2013-12-03 13:44:38 -05:00
Benoit Jacob
229f8e5ad2 Bug 944703 - Part 2: make gfxReusableSharedImageSurfaceWrapper hold a strong reference to its ISurfaceAllocator - r=BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
04c02eb28e Bug 944703 - Part 1: make SurfaceCaps hold a strong reference to its ISurfaceAllocator - r=jgilbert 2013-12-03 13:44:38 -05:00
Benoit Jacob
41b5c423b1 Bug 942505 - Move everything SharedHandle-related out of GLContext - r=jgilbert 2013-12-03 13:44:38 -05:00
Benoit Girard
48786b9c7c Bug 944866 - Part 2: Add layers.scroll-graph. r=gal 
--HG--
extra : rebase_source : b517f110b09056b3037f9bfae609ff14e6af3859
 2013-12-03 10:49:46 -05:00
Stephen Pohl
39d5592298 Bug 934811 - Ensure that no scrollbars are displayed for touch input. r=jimm,tn 2013-12-03 13:21:09 -05:00
Benoit Girard
927a3de097 Bug 904227 - Ignore gmock warnings from MockContentController. r=kats 2013-11-18 20:54:22 -05:00
Ehsan Akhgari
67f01aceb5 Bug 945588 - Add include guards to SkConfig8888.h 2013-12-03 11:09:56 -05:00
Kevin Simons
8c7b534e33 Bug 945314 - Workaround crash with Cairo surfaces in Skia backend. r=mstange 
A patch for bug 924102 introduced a MOZ_CRASH assertion for surfaces
of type other than SURFACE_SKIA or SURFACE_DATA being passed to
DrawSurface. Previously surfaces of other types were simply ignored.
On Linux, there are still several hardcoded surfaces of type Cairo
(found in gfxXlibNativeRenderer and friends) and as a result, the
Skia backend crashes always on Linux currently.

This workaround ignores Cairo surfaces passed to DrawSurface.
 2013-12-03 08:52:06 -05:00
Dan Glastonbury
a7f3af433e Bug 921215 - Handle being passed NULL ptr for either surface or gl to SharedSurface_IOSurface::Create by returning NULL. r=mattwoodrow 2013-12-03 13:11:27 +10:00
Nicolas Silva
3b387245d0 Bug 929506 - fix context bug in BasicTextureImage. r=bjacob 2013-12-03 11:44:49 +01:00
Nicolas Silva
ad0f0f87ff Bug 929506 - Check that gl->MakeCurrent returns true when using OpenGL on the Compositor side. r=bjacob 2013-12-03 11:44:46 +01:00
Nicolas Silva
da4c52ba6c Bug 929506 - Check that the GLContext is not destroyed in MakeCurrent. r=bjacob 2013-12-03 11:44:37 +01:00
Nicholas Cameron
6b5c57b8c4 Bug 893301. Some rebasing fixes. r=nical 2013-11-28 10:16:35 +13:00
Nicholas Cameron
ee46d57bdc Bug 893301. Remove AccessMode use in ContentClient. r=nical 2013-11-28 10:16:35 +13:00
Nicolas Silva
961a970469 Bug 893301. Fix alpha corruptions. r=nrc 2013-11-08 18:53:16 +01:00
Nicholas Cameron
302a5f0e82 Bug 893301. Rename BufferProviders. r=mattwoodrow 2013-11-28 10:16:35 +13:00
Nicholas Cameron
e310d54bf8 Bug 893301. Renaming and indentation fixes. r=nical 2013-11-28 10:16:35 +13:00
Nicholas Cameron
fa531df385 Bug 893301. Tweeks to TextureHost. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
22e967bd94 Bug 893301. Reviewer changes. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
26fc6718f4 Bug 893301. Content hosts. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
598ae4efa7 Bug 893301. Content clients. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
5ea6b5881d Bug 893301. Changes to texture clients. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
5a1d79d689 Bug 893301. Add a path to RotatedContentBuffer for new textures. r=mattwoodrow 2013-11-28 10:16:33 +13:00
Nicholas Cameron
9c49a04d55 Bug 893301. Rename GetTextureHost to GetAsTextureHost. r=nical 2013-11-28 10:16:33 +13:00
Ehsan Akhgari
a253b73ee7 Bug 945509 - Include 2D.h in gfxFont.h because it uses ScaledFont; r=glandium 2013-12-02 18:53:14 -05:00
Ryan VanderMeulen
4829857b56 Merge m-c to inbound. 2013-12-02 16:58:15 -05:00
Ryan VanderMeulen
3c8b758627 Merge inbound to m-c. 2013-12-02 16:39:00 -05:00
Mike Hommey
881a7c1554 Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense). r=mshal 2013-12-03 06:34:21 +09:00
Edwin Flores
0d6eeab31d Bug 934412 - Add header offset in SharedRGBImage::GetBuffer r=nical 2013-12-03 10:25:27 +13:00
Benoit Girard
55a288a123 Bug 944866 - Pat 1: Add DrawLines to Compositor.h and implement for OGL. r=gal 2013-12-01 15:54:46 -05:00
Botond Ballo
a7a41dc53a Bug 944521 - Scroll-grabbing elements shouldn't grab tap gestures. r=Cwiiis 2013-11-29 16:40:21 -05:00
Kevin Simons
2d12d37e18 Bug 944412 - Fix an issue with the stride in SourceSurfaceSkia::InitFromData. r=gal 
After calling SkBitmap::copyTo, the InitFromData method assumed
that the stride of the destination SkBitmap was now the same as the
stride of the source bitmap. This was, however, not the case. Now
the stride is read back out of the destination bitmap.

This was causing a crash due to memory corruption for FORMAT_B8G8R8X8
surfaces.
 2013-12-02 11:03:13 -05:00
Dan Glastonbury
7f73b68e55 Bug 830881 - Port layerscope GL changes to new layers. r=vlad 2013-11-29 14:11:49 +10:00
Dan Glastonbury
a940e05e20 Bug 830881 - Wrap debug functions in MOZ_ENABLE_GL_TRACKING define. r=vlad 2013-11-29 14:16:40 +10:00
Robert O'Callahan
3f4000a94e Bug 942672. When a gfxContext has a DrawTarget there's an extra device transform that we need to take account of here. r=mattwoodrow 
--HG--
extra : rebase_source : 0b4c182ea6b1934b3136623539e4b8482de1481f
 2013-12-02 10:10:50 +13:00
Benoit Jacob
0e0187e777 Bug 944571 - Fix the non-unified build of gfxBlur.cpp - no review, trivial compilation fix 2013-11-30 21:21:03 -05:00
Mike Hommey
8f35911c9c Bug 944830 - Fix non-unified build in gfx after bug 942492, bug 943293 and bug 944172. r=bjacob 2013-12-01 07:20:57 +09:00
Mats Palmgren
4d5e4902f6 Bug 943448 - Remove useless warnings about nscoord overflow in clamping functions. r=roc 2013-11-30 21:45:20 +00:00
Chris Peterson
c94a0e8c44 Bug 944257 - Fix warning by removing unused ContentClientBasic member variable mManager. r=gal 2013-11-27 19:19:56 -08:00
Matt Woodrow
3b444e24fd Bug 944571 - Part 1: Convert gfxAlphaBoxBlur to use Moz2D surfaces instead of Thebes. r=Bas 2013-10-02 17:20:47 +13:00
Benoit Jacob
d28efc79a6 Bug 942492 - Add a missing #include to a header that really needs it - no review, trivial compilation fix 2013-11-29 11:31:46 -05:00
Ms2ger
9d06a0c27f Merge mozilla-inbound to mozilla-central. 2013-11-29 09:54:12 +01:00
Ms2ger
5f5ee19894 Bug 937258 - Part b: Remove gfx/tests/gtest/Makefile.in; r=gps 
CXXFLAGS is only taken into account when set *after* the rules.mk inclusion,
so it is useless here.
 2013-11-28 15:25:41 +01:00
Ms2ger
4c502efb62 Bug 937224 - Part a: Move LOCAL_INCLUDES to moz.build in gfx/; r=mshal 2013-11-28 15:10:38 +01:00
Ms2ger
e941e4dc7b Bug 939271 - Part g: move mochitests to manifests in gfx/tests; r=roc 2013-11-28 15:03:17 +01:00
Mike Hommey
8fd06cf41b Bug 874266 - Move all DEFINES that can be moved to moz.build. r=mshal 2013-11-27 22:55:07 +09:00
Dan Glastonbury
47033c5692 Bug 942492 - Move ScopedGL* RAII helpers out of GLContext.* - r=bjacob 2013-11-26 13:25:25 +10:00
Benoit Jacob
1095b2aa48 Bug 942503 - Move BlitTextureImage out of GLContext - r=jgilbert 2013-11-28 15:57:19 -05:00
Benoit Jacob
cbc3e900a8 Bug 942503 - Move Blit* functions out of GLContext, except for BlitTextureImage - r=jgilbert 2013-11-28 15:57:19 -05:00
Benoit Jacob
3b791ff17d Bug 944172 - Move DecomposeIntoNoRepeatTriangles out of GLContext - r=BenWa 2013-11-28 15:57:19 -05:00
Ehsan Akhgari
4d0ff2bfa2 Bug 943983 - Build gfx/tests/gtest in unified mode; r=BenWa 2013-11-28 14:10:33 -05:00
Mike Hommey
b32a4ed166 Backout changeset 3fd4b546eed4 (bug 874266) and changeset a35d2e3a872f (bug 942043) for ASAN build bustage and Windows test bustage 
--HG--
extra : amend_source : f20d09aeff1c8b5cbd0f1d24c7ce04e86f3aed1d
 2013-11-28 14:24:05 +09:00
Markus Stange
b1fa2b9e41 Bug 944383 - Pass around SourceSurfaces instead of gfxASurfaces for feImage input images. r=jwatt 2013-11-28 15:38:43 +01:00
Ehsan Akhgari
e9414f09ea Bug 944209 - Build gfx/src in unified mode; r=BenWa 2013-11-27 21:11:07 -05:00
Andreas Pehrson
22bc27eb6f Bug 907292 - Change gfxImageSurface to gfx::DataSourceSurface in TextureHost et al 2013-11-27 10:59:01 +01:00
Andreas Pehrson
301516aa6b Bug 943293 - Add ReadBackSurface helper in GLContextUtils 2013-11-27 15:04:33 +01:00
Andreas Pehrson
265f17f747 Bug 943293 - Add CopyTo in gfxImageSurface to copy to a DataSourceSurface 2013-11-27 11:03:36 +01:00
Mike Hommey
a1486ce449 Bug 942043 - Straighten up zlib linkage wrt shared js and system zlib. r=gps,r=ted 2013-11-22 23:03:21 +09:00
Nicholas Nethercote
39004db706 Bug 936964 (part 7, attempt 2) - Make lots of classes report their own memory consumption, instead of using a separate reporter class. r=mccr8,sr=bz. 
* * *
Bug 936964 (part 7b) - Fix a use-after-free found by ASan.

--HG--
extra : rebase_source : d38ab6b63e9d576773baf8e55fa4f7182c33915e
 2013-11-07 16:35:30 +11:00
Mike Hommey
682364d535 Bug 874266 - Move all DEFINES that can be moved to moz.build. r=mshal 2013-11-28 13:08:16 +09:00
Mike Hommey
0a1fb8d11c Bug 942043 - Straighten up zlib linkage wrt shared js and system zlib. r=gps,r=ted 2013-11-28 12:49:43 +09:00
Ehsan Akhgari
a903aefdc0 Backed out 9 changesets (bug 943660, bug 936964) because of ASAN use-after-free crashes on browser-chrome and mochitest-other 
Backed out changeset 85486c4aa3d8 (bug 936964)
Backed out changeset 25312eb71998 (bug 936964)
Backed out changeset 6dbb8333960c (bug 936964)
Backed out changeset da6465ad476f (bug 936964)
Backed out changeset a87ffc992f38 (bug 936964)
Backed out changeset 4ae3a61182db (bug 936964)
Backed out changeset 34e9c3137804 (bug 936964)
Backed out changeset fd1459e71585 (bug 936964)
Backed out changeset 3e8a701d8bdc (bug 943660)

Landed on a CLOSED TREE

--HG--
rename : content/canvas/src/WebGLMemoryTracker.h => content/canvas/src/WebGLMemoryReporterWrapper.h
 2013-11-27 20:05:00 -05:00
Nicholas Cameron
a92b7f186c merge backout 2013-11-28 12:32:24 +13:00
Nicholas Cameron
0a2a18e774 Backout bug 893301 for b2g bustage r=me 2013-11-28 12:31:31 +13:00
Nicholas Cameron
8c5eb6d31b Bug 893301. Some rebasing fixes. r=nical 2013-11-28 10:16:35 +13:00
Nicholas Cameron
c85dfc76bf Bug 893301. Remove AccessMode use in ContentClient. r=nical 2013-11-28 10:16:35 +13:00
Nicholas Cameron
3880d465ad Bug 893301. Rename BufferProviders. r=mattwoodrow 2013-11-28 10:16:35 +13:00
Nicholas Cameron
5e6740776c Bug 893301. Renaming and indentation fixes. r=nical 2013-11-28 10:16:35 +13:00
Nicholas Cameron
54312ee7d4 Bug 893301. Tweeks to TextureHost. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
20930af1e8 Bug 893301. Reviewer changes. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
f670bda8f3 Bug 893301. Content hosts. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
097d6fd331 Bug 893301. Content clients. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
9de2acbf91 Bug 893301. Changes to texture clients. r=nical 2013-11-28 10:16:34 +13:00
Nicholas Cameron
d5cf63f5a2 Bug 893301. Add a path to RotatedContentBuffer for new textures. r=mattwoodrow 2013-11-28 10:16:33 +13:00
Nicholas Cameron
12eee2badb Bug 893301. Rename GetTextureHost to GetAsTextureHost. r=nical 2013-11-28 10:16:33 +13:00
Nicholas Nethercote
bc475c75df Bug 936964 (part 7) - Make lots of classes report their own memory consumption, instead of using a separate reporter class. r=mccr8,sr=bz. 
--HG--
rename : content/canvas/src/WebGLMemoryReporterWrapper.h => content/canvas/src/WebGLMemoryTracker.h
extra : rebase_source : 611e8d35907959b163aeced1c4ffe1d265048fe6
 2013-11-07 16:35:30 +11:00
Anthony Jones
6c22443aea Bug 888084 - Use RollingMean to calculate mean; r=BenWa 2013-09-25 12:13:33 +12:00
Chris Lord
9afd262a59 Bug 931823 - Fix calculation of tiled update data and convert to typed units. r=kats,botond 
Various changes to FrameMetrics and such have causes the tile coherency checks
to end up with nonsense values, meaning updates are always happening a tile at
a time.

This fixes the calculation of those values, adds some documentation and
converts a large part of it to using typed units, to make it easier to
understand what's happening.
 2013-11-27 17:33:27 +00:00
Benoit Jacob
50940bf209 Bug 933082 - Part 4: let ClientLayerManager hold a ShadowLayerForwarder instead of inheriting from ShadowLayerForwarder. Make ISurfaceAllocator refcounted. Make SharedSurface_Gralloc keep its mAllocator alive - r=nical 2013-11-27 10:19:34 -05:00
Benoit Jacob
922041ff3c Bug 933082 - Part 3: let ShadowLayerForwarder hold a strong ref to its LayerTransactionChild - r=nical 2013-11-27 10:18:38 -05:00
Benoit Jacob
a1decdf354 Bug 933082 - Part 2: propagate the mIPCOpen flag, avoid crashing in DestroySharedSurface on a dead channel - r=nical 2013-11-27 10:18:38 -05:00
Benoit Jacob
927f3a5008 Bug 933082 - Part 1: make LayerTransactionChild reference-counted - r=nical 2013-11-27 10:18:38 -05:00
Brad Lassey
5a78ec0d22 Bug 915673 - Only use tiled layers for scrollable layers on b2g. r=tn,bgirard 
Introduce a constructor for thebes layers that can take a hint about what the
layer will be used for, and use that hint to only create tiled layers when
the layer represents scrollable content.
 2013-09-17 13:55:09 -04:00
Chris Lord
2b33da1618 Bug 907743 - Align display port to tile boundaries when tiles are enabled. r=botond,kats 
This aligns display ports to tile boundaries, taking care to compensate for
the difference between the requested scroll position and the actual scroll
position.
 2013-09-10 18:21:04 -04:00
Ehsan Akhgari
3e096d9c3d Bug 939585 - Build gfx/thebes in unified mode; r=BenWa 2013-11-27 08:03:04 -05:00
Markus Stange
513b0bcce1 Bug 924103 - Add a FilterDescription data structure and code that can create FilterNodes from it. r=roc 2013-11-27 12:25:28 +01:00
Bas Schouten
758b8fda77 Bug 924102 - Add support for filters to DrawTargetRecording. r=mstange 2013-11-27 12:25:28 +01:00
Bas Schouten
a7185ffe65 Bug 924102 - Use FilterNodeSoftware for filter drawing in DrawTargetSkia. r=mstange 2013-11-27 12:25:28 +01:00
Bas Schouten
78ae2460a4 Bug 924102 - Make DrawTargetSkia::DrawSurface support non-Skia DataSourceSurfaces. r=mstange 2013-11-27 12:25:27 +01:00
Markus Stange
77c6c600d7 Bug 924102 - Add transform filter and remove offset filter. r=Bas 2013-11-27 12:25:27 +01:00
Markus Stange
9e0156f03c Bug 924102 - Add a FilterNode implementation that uses Direct2D 1.1 effects. Most of this patch was written by Bas. r=mstange, r=Bas 2013-11-27 12:25:16 +01:00
Markus Stange
8db97bd05e Bug 924102 - Implement DrawTarget filter APIs with FilterNodeSoftware for Cairo, CG, D2D, D2D1 and Dual. r=Bas 2013-11-27 12:22:56 +01:00
Markus Stange
7db701d658 Bug 924102 - Add a software FilterNode implementation. r=Bas 2013-11-27 12:22:46 +01:00
Markus Stange
db30cb1dcb Bug 924102 - Let AlphaBoxBlur take separate blur radius parameters for X and Y. r=Bas 2013-11-27 12:22:36 +01:00
Markus Stange
24d033e113 Bug 924102 - Add filter processing code for many SVG filters. r=Bas 2013-11-27 12:22:27 +01:00
Markus Stange
141e600367 Bug 924102 - Add a class that renders turbulence as specified for SVG filters. r=Bas 2013-11-27 12:22:21 +01:00
Markus Stange
c001ff8d47 Bug 924102 - Add a SIMD.h header that implements some SIMD functions with SSE2 and scalar code. r=Bas 2013-11-27 12:22:13 +01:00
Markus Stange
b5eb1563f1 Bug 924102 - Add filter API to Moz2D. r=Bas, r=mattwoodrow 2013-11-27 12:22:07 +01:00
Markus Stange
46bb478bac Bug 924102 - Add the types Point3D and Matrix5x4. r=Bas 2013-11-27 12:22:02 +01:00
Bas Schouten
7e6095b9db Bug 937145 - Allow Moz2D recordings to grab the existing content of a DrawTarget. r=BenWa 2013-11-27 12:21:57 +01:00
Bas Schouten
823e01695d Bug 942268 - Add RecordedEvent::GetEventName. r=mstange 2013-11-27 12:21:49 +01:00
Markus Stange
976a163b61 Bug 930956 - Make DrawTargetCG::DrawSurface support painting a DataSourceSurface that is not a DataSourceSurfaceCG. r=jrmuizel, r=Bas 2013-11-27 12:21:43 +01:00
Markus Stange
aa00fefb46 Bug 943614 - Make sure that SourceSurfaceCG::GetDataSurface always returns a surface that has GetType() == SURFACE_DATA. r=Bas 2013-11-27 12:21:34 +01:00
Markus Stange
452f4eb345 Bug 943614 - Make sure that SourceSurfaceCairo::GetDataSurface always returns a surface that has GetType() == SURFACE_DATA. r=Bas 2013-11-27 12:21:27 +01:00
Markus Stange
17bb2336a1 Bug 943614 - Make sure that DataSourceSurface::GetDataSurface always returns a surface that has GetType() == SURFACE_DATA. r=Bas 2013-11-27 12:21:21 +01:00
Jonathan Kew
adbf23aea1 bug 943319 - use our standard ArrayLength() instead of a custom macro. r=jdaggett 2013-11-27 11:03:43 +00:00
Jonathan Kew
f09f6e8250 bug 943270 - use EncodingUtils::DecoderForEncoding instead of nsICharsetConverterManager::GetUnicodeDecoderRaw when decoding font names. r=jdaggett 2013-11-27 11:03:02 +00:00
Markus Stange
3ba56fecc6 Bug 943041 - Don't delay compositing on the compositor thread in ASAP mode (layout.frame_rate == 0). r=BenWa 2013-11-27 08:33:39 +01:00
Markus Stange
30aeb02de9 Bug 920123 - Make Start/Stop FrameTimeRecording work with OMTC and remove paint time recording. r=mattwoodrow 2013-11-27 08:32:19 +01:00
Wes Kocher
972b1b5614 Merge m-c to inbound 2013-11-26 20:05:18 -06:00
Wes Kocher
7815ce9f0b Merge fx-team to m-c 2013-11-26 19:51:52 -06:00
Nicholas Cameron
d265676d31 Bug 932888. Rename ThebesLayerBuffer. r=mattwoodrow 
--HG--
rename : gfx/layers/ThebesLayerBuffer.cpp => gfx/layers/RotatedBuffer.cpp
rename : gfx/layers/ThebesLayerBuffer.h => gfx/layers/RotatedBuffer.h
 2013-11-27 13:29:46 +13:00
Nicholas Cameron
0e18340ba9 Bug 932888. Remove some now unnecessary includes. r=mattwoodrow 2013-11-27 13:29:46 +13:00
Nicholas Cameron
4b2ddbab23 Bug 932888. Azurify some intermediate surfaces in BasicLayerManager. r=mattwoodrow 2013-11-27 13:29:45 +13:00
Nicholas Cameron
176a56a656 Bug 932888. Remove thebes paths from ThebesLayerBuffer (part 1). r=mattwoodrow 2013-11-27 13:29:45 +13:00
Jim Mathies
77bdf172ee Bug 940952 - Replace apzc GeckoContentController pan notifications with more general purpose transform notifications. r=botond 2013-11-26 14:14:39 -06:00
Ryan VanderMeulen
1c086f8129 Backed out changesets 7caa8e80b06a, 1509f8be5df3, a249bd79e71a, and 9cc4a77561e8 (bug 933082) for mochitest asserts on a CLOSED TREE. 2013-11-26 14:58:09 -05:00
Carsten "Tomcat" Book
8fdb691147 merge b2g-inbound to mozilla-central 2013-11-26 12:40:07 +01:00
Botond Ballo
191d81b8c4 Bug 942535 - Fix a compiler warning about signed/unsigned comparison in APZ. r=dholbert 
--HG--
extra : rebase_source : 816fc31c43178e1b5841c3a49cd71d2c08751331
 2013-11-25 14:29:41 -05:00
Ryan VanderMeulen
90315d8451 Backed out changeset de63b66f3d12 (bug 907743) for Windows bustage. 
CLOSED TREE
 2013-11-26 14:12:05 -05:00
Benoit Jacob
0a41dbbab1 Bug 933082 - Part 4: let ClientLayerManager hold a ShadowLayerForwarder instead of inheriting from ShadowLayerForwarder. Make ISurfaceAllocator refcounted. Make SharedSurface_Gralloc keep its mAllocator alive - r=nical 2013-11-26 14:00:29 -05:00
Benoit Jacob
e84c1481d6 Bug 933082 - Part 3: let ShadowLayerForwarder hold a strong ref to its LayerTransactionChild - r=nical 2013-11-26 14:00:07 -05:00
Benoit Jacob
74c5d8e760 Bug 933082 - Part 2: propagate the mIPCOpen flag, avoid crashing in DestroySharedSurface on a dead channel - r=nical 2013-11-26 13:59:48 -05:00
Benoit Jacob
930be8d6aa Bug 933082 - Part 1: make LayerTransactionChild reference-counted - r=nical 2013-11-26 13:59:28 -05:00
Steven Michaud
a87ba6b69f Bug 925448 - Stop CGImageRef external data being deleted prematurely. r=bgirard,bas 2013-11-26 12:41:32 -06:00
Matt Brubeck
fa697d2df2 Bug 942689 - Include modifer info in tap gesture events [r=roc,jimm,botond] 2013-11-25 20:30:26 -08:00
Mike Hommey
43d177307e Bug 940407 - Kill GTEST_SOURCES. r=gps 2013-11-26 11:48:58 +09:00
Benoit Jacob
a6c63323bb Bug 834243 - Add fatal assertions in CreateForWindow to get better crash reports - r=BenWa 2013-11-25 21:48:27 -05:00
Nicholas Cameron
2a963b34cd Bug 943122. Don't repeat 'Mask layer:' in layer dumps. r=BenWa 2013-11-26 15:07:44 +13:00
Nicholas Cameron
e3cb6e45db Bug 943110. Don't use fputc in display list/layers dumps. r=BenWa 2013-11-26 15:07:41 +13:00
Matt Woodrow
6aa23543fa Bug 940845 - Follow-up to add comments that got missed when rebasing. 2013-11-26 12:29:20 +13:00
David Anderson
4747487fcb Remove unnecessary Lock() calls from BasicCompositor (bug 942318, r=mattwoodrow). 2013-11-25 15:15:03 -08:00
Matt Woodrow
e464096b18 Bug 940845 - Part 5: Propogate the blur standard deviation up instead of the blur radius. r=roc 2013-11-26 12:09:04 +13:00
Matt Woodrow
cf7881aa40 Bug 940845 - Part 4: Add BlurRectangle to gfxAlphaBoxBlur and use it. r=roc 2013-11-26 12:08:29 +13:00
Matt Woodrow
701b35213b Bug 940845 - Part 1: Remove unused offset parameter from gfxAlphaBoxBlur. r=roc 2013-11-26 12:05:36 +13:00
Nicholas Cameron
055bf4fa39 Bug 942819. Check the return value of GetD3D9DeviceManager. r=mattwoodrow 2013-11-26 10:54:13 +13:00
Birunthan Mohanathas
1e8f99fd01 Bug 784739 - Switch from NULL to nullptr in miscellaneous directories; r=ehsan 
--HG--
extra : rebase_source : 8ace754e117a12e2599f5a90030f13a3a7064fed
 2013-11-25 14:02:47 -05:00
Andreas Gal
f3a2bc3a94 Bug 933567 - Clean up Mask implementation a bit. r=mattwoodrow 2013-11-25 09:22:33 -05:00
Kevin Simons
b95c755355 Bug 933567 - Implement MaskSurface for Skia. r=mattwoodrow 2013-11-25 09:20:56 -05:00
John Daggett
11931c9dfc Bug 934710 - add various text performance metrics and a log to handle these. r=jfkthame 2013-11-25 13:59:56 +09:00
Phil Ringnalda
022d398c91 Back out d280a1c64f76 (bug 939585) for Mac build bustage 
CLOSED TREE
 2013-11-24 18:02:14 -08:00
Benoit Girard
49ae528201 Bug 939585 - Build gfx/thebes in unified mode. r=ehsan,bjacob 2013-11-21 14:22:45 -05:00
Benoit Girard
a735170d84 Bug 942483 - Port paint-dumping to android/b2g. r=gal 2013-11-23 17:44:18 -05:00
Mike Hommey
aaacc118f4 Bug 941450 - Add some GENERATED_FILES to moz.build. r=gps 2013-11-22 08:16:18 +09:00
Jonathan Kew
edffd828e9 bug 941940 - don't render stray <CR> characters (&#13; entities) in the DOM as hexboxes, just leave them invisible. r=roc 2013-11-22 21:43:36 +00:00
Ryan VanderMeulen
6777d0901e Merge m-c to inbound. 2013-11-22 15:37:03 -05:00
Ryan VanderMeulen
6789e60ca8 Merge b-i to m-c. 2013-11-22 15:35:31 -05:00
Ed Morley
1a9ee1c710 Backed out changeset c30371a66429 (bug 941450) 2013-11-22 15:59:22 +00:00
Botond Ballo
21a74823a2 Bug 912666 - Implement scroll grabbing in APZ. r=kats,Cwiiis 2013-11-21 17:38:00 -05:00
Trevor Saunders
9f254378b2 bug 938025 - part 1 - get rid of some static constructors r=bz r=bjacob 2013-11-22 14:45:50 -05:00