Ryan VanderMeulen
60176ce528
Backed out changesets 23ab61f4bba1, d0f6a0106f43, and 9b656ca5ec50 (bug 974575) for Linux crashtest asserts.
2014-03-05 15:23:26 -05:00
Jonathan Watt
4b64c371e1
Bug 950368 - Make nsWindowsShellService's WriteBitmap act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow
2014-03-04 16:56:44 +00:00
Andreas Gal
044a8b635b
Bug 975772 - Cleanup RectTriangles and allow DrawQuads to take triangles or triangle strips. r=bjacob
2014-03-05 14:18:38 -05:00
John Daggett
4501b2709a
Bug 969388 - Null-check the bundle ID to avoid 10.9 crash in CTFontManagerSetAutoActivationSetting. r=smichaud
2014-03-05 14:18:38 -05:00
Jonathan Kew
0eac36cf9f
bug 970891 - don't assume the primary font will always support the <space> character - fall back down the font stack if necessary. r=roc
2014-02-11 15:28:21 +00:00
Jonathan Kew
108ae026f2
bug 974575 - support color glyphs in cairo_image_surface's _composite_glyphs function. r=jrmuizel
2014-03-05 18:33:21 +00:00
Jonathan Kew
543520fd62
bug 974575 - correction for bad commit (a0f556f37fb7016aa304b7cf0e811c0d38f0b969) ported from upstream. r=jrmuizel
2014-03-05 18:33:21 +00:00
Jonathan Kew
3d7e176399
bug 974575 - backport Behdad's patches for color bitmap glyph support from current cairo trunk. r=jrmuizel
...
* * *
[ft] Fix resizing of bitmap fonts
From b94a519aad3d5b50aa6de47ee16ee6a099de9791 Mon Sep 17 00:00:00 2001
Say, you were asking cairo for a font at 200px. For bitmap-only fonts,
cairo was finding the closes strike size and using it. If the strike
was at 20px, well, that's what you were getting. We now scale that 20px
strike by a factor of 10 to get the correct size rendering.
Note that by itself this patch doesn't change much on the Linux desktop.
The reason is that the size you are interested in (eg. 200px) is lost by
fontconfig. When you request a font at 200px, fontconfig returns a font
pattern that says 20px, and so the next layers thing you want a font at
20px. To address that, one also needs a piece of fontconfig config that
puts the 200 back into the pixelsize. Something like this:
<match target="font">
<test name="scalable" mode="eq">
<bool>false</bool>
</test>
<edit name="pixelsize" mode="assign">
<times>
<name>size</name>
<name>dpi</name>
<double>0.0138888888888</double> <!--1/72.-->
</times>
</edit>
</match>
I'm going to try to upstream this config so it will be enabled by
default. The config can be a bit smarter. For example, if
metricshinting is enabled and the size difference is small, we may as
well not scale.
The nice thing about this is that the configuration of whether and when
to scale bitmaps will be done in fontconfig, not cairo / Qt / ... code.
---
* * *
[FT] Prefer downscaling bitmap glyphs to upscaling
From a8f1b456db744e33a10b2301df03528787e5b1ca Mon Sep 17 00:00:00 2001
Say, you have bitmap strikes for sizes 50ppem and 100ppem.
To render at 60ppem, it's much better to downscale the 100ppem
bitmap than upscale 50ppem one. Prefer downscaling.
---
* * *
[ft] I meant fabs(), not abs()
From 13bd8d09b44e50649f6fc4d58d036bc32c1d5c5b Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix memory bug in copying bitmaps
From a0f556f37fb7016aa304b7cf0e811c0d38f0b969 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix wrong assumptions
From e738079302a968b7b1fb9101cd4d92a8887bedce Mon Sep 17 00:00:00 2001
If subpixel rendering is enabled, but FT returns a 8bit gray bitmap
(perhaps because the font has 8bit embedded bitmaps) we were hitting
the assertions because the assumptions made were wrong. Fix up.
---
* * *
Towards support loading color glyphs from FreeType
From 2cc353c3dbe01b4d8f65d6de800f2b1d6004a1c2 Mon Sep 17 00:00:00 2001
See comments.
---
* * *
Support 2bit and 4bit embedded bitmaps
From 9444ef09ccde2735258cc1bd2f1912119a32dd88 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix math
From 7d26341072b13a78d4b3fe58779057ac020be487 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Add missing include
From 0554d76402321b25cc952180e4d19436a9038d1a Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix alignment
From 34a747e7bdeba1cfe17318f80fbe6720d47bc023 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Ensure alignment of bitmaps received from FreeType
From 46d9db96d460fea72f0420102e8a90c6a7231f79 Mon Sep 17 00:00:00 2001
---
2014-03-05 18:33:21 +00:00
Markus Stange
bbba5bf0c3
Bug 960178 - Fix lighting filter PowCache. r=Bas
2014-03-05 18:41:38 +01:00
Markus Stange
7943eaee0d
Bug 963086 - Detect filter rect XMost()/YMost() overflow and protect against out-of-range data acess. f=dholbert, r=Bas
2014-03-05 18:41:19 +01:00
Ed Morley
f06539de43
Backed out changeset fe2afc55a0d1 (bug 950368) for shutdown crashes on B2G
2014-03-05 17:10:38 +00:00
Jonathan Watt
3e5e0bad51
Bug 950368 - Make nsWindowsShellService's WriteBitmap act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow
2014-03-04 16:56:44 +00:00
Ryan VanderMeulen
0d7b59001e
Backed out changeset 6f05267b4afc (bug 798033) for Android bustage.
2014-03-05 09:55:52 -05:00
Sushil Chauhan
9443c9c242
Bug 978341 - CompositorOGL::clearFBRect api needs to map the rect to OGL coordinates. r=jgilbert
2014-03-04 18:07:32 -08:00
snigdha
a441998156
Bug 798033 - Headers should generally not do "using namespace" at file scope. r=jib, r=jmathies, r=rjesup, r=ekr, r=ncameron, r=blassey
2014-03-05 08:47:45 -05:00
Carsten "Tomcat" Book
46a7d98005
merge b2g-inbound to mozilla-central
2014-03-05 13:24:51 +01:00
L. David Baron
e80d256f0e
Bug 828173 patch 3: Add a concept of pending animations to Layer, like pending transform. r=mattwoodrow
2014-03-04 20:13:21 -08:00
L. David Baron
806b550de7
Bug 828173 patch 2: Make Layer::AddAnimation have the caller fill in the data instead of taking parameters. r=mattwoodrow
...
(This is a bigger simplification later in the patch queue, when I add a
variant of AddAnimation called AddAnimationForNextTransaction.)
2014-03-04 20:13:21 -08:00
Brian Birtles
9ee5e63199
Bug 972199 part 1 - Make SampleAnimations filter out animations that are yet to start; r=nrc
...
When restoring the refresh driver after testing we can arrive at a situation
where a layer has an animation that has yet to start. However, calling
ElementAnimations::GetPositionInIteration with a negative value from the
compositor thread is an error.
This patch detects animations on the compositor thread that are yet-to-start and
skips them when sampling. It also moves the activeAnimations = true line up as
otherwise we would need special logic to wake up the compositor after the delay
has finished.
2014-03-05 10:19:15 +09:00
Ehsan Akhgari
17f4a32d8b
Bug 976896 - Port STL_FLAGS to moz.build; r=mshal
2014-03-04 19:39:06 -05:00
Milan Sreckovic
2b8bd73400
Bug 978274: Initialize gfxPrefs earlier, rename some methods, delete MigratePrefs from gfxPlatform. r=bgirard.
2014-03-04 12:26:33 -05:00
Ehsan Akhgari
667b4bc049
Bug 978594 - Part 3: Port some of the per-source flags to moz.build; r=glandium
...
--HG--
extra : rebase_source : fe4cd059eddda221af420e1517250772816d7ee8
2014-03-02 15:41:32 -05:00
Dan Glastonbury
105377fc80
Bug 975824 - Disable S3TC compressed texture support on VMware Gallium 0.4 with
...
llvmpipe. r=jgilbert
2014-02-28 16:57:03 +10:00
Phil Ringnalda
e17aa09c58
Back out bbd7b1da5d36:b0d1c4456b73 (bug 974575) and 6e8140ae4961 (bug 969814) for ASan bustage
2014-03-03 22:40:07 -08:00
Jonathan Kew
3a0e99a68b
bug 974575 - support color glyphs in cairo_image_surface's _composite_glyphs function. r=jrmuizel
2014-03-04 05:37:40 +00:00
Jonathan Kew
fa0a7c6033
bug 974575 - backport Behdad's patches for color bitmap glyph support from current cairo trunk. r=jrmuizel
...
* * *
[ft] Fix resizing of bitmap fonts
From b94a519aad3d5b50aa6de47ee16ee6a099de9791 Mon Sep 17 00:00:00 2001
Say, you were asking cairo for a font at 200px. For bitmap-only fonts,
cairo was finding the closes strike size and using it. If the strike
was at 20px, well, that's what you were getting. We now scale that 20px
strike by a factor of 10 to get the correct size rendering.
Note that by itself this patch doesn't change much on the Linux desktop.
The reason is that the size you are interested in (eg. 200px) is lost by
fontconfig. When you request a font at 200px, fontconfig returns a font
pattern that says 20px, and so the next layers thing you want a font at
20px. To address that, one also needs a piece of fontconfig config that
puts the 200 back into the pixelsize. Something like this:
<match target="font">
<test name="scalable" mode="eq">
<bool>false</bool>
</test>
<edit name="pixelsize" mode="assign">
<times>
<name>size</name>
<name>dpi</name>
<double>0.0138888888888</double> <!--1/72.-->
</times>
</edit>
</match>
I'm going to try to upstream this config so it will be enabled by
default. The config can be a bit smarter. For example, if
metricshinting is enabled and the size difference is small, we may as
well not scale.
The nice thing about this is that the configuration of whether and when
to scale bitmaps will be done in fontconfig, not cairo / Qt / ... code.
---
* * *
[FT] Prefer downscaling bitmap glyphs to upscaling
From a8f1b456db744e33a10b2301df03528787e5b1ca Mon Sep 17 00:00:00 2001
Say, you have bitmap strikes for sizes 50ppem and 100ppem.
To render at 60ppem, it's much better to downscale the 100ppem
bitmap than upscale 50ppem one. Prefer downscaling.
---
* * *
[ft] I meant fabs(), not abs()
From 13bd8d09b44e50649f6fc4d58d036bc32c1d5c5b Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix memory bug in copying bitmaps
From a0f556f37fb7016aa304b7cf0e811c0d38f0b969 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix wrong assumptions
From e738079302a968b7b1fb9101cd4d92a8887bedce Mon Sep 17 00:00:00 2001
If subpixel rendering is enabled, but FT returns a 8bit gray bitmap
(perhaps because the font has 8bit embedded bitmaps) we were hitting
the assertions because the assumptions made were wrong. Fix up.
---
* * *
Towards support loading color glyphs from FreeType
From 2cc353c3dbe01b4d8f65d6de800f2b1d6004a1c2 Mon Sep 17 00:00:00 2001
See comments.
---
* * *
Support 2bit and 4bit embedded bitmaps
From 9444ef09ccde2735258cc1bd2f1912119a32dd88 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix math
From 7d26341072b13a78d4b3fe58779057ac020be487 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Add missing include
From 0554d76402321b25cc952180e4d19436a9038d1a Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix alignment
From 34a747e7bdeba1cfe17318f80fbe6720d47bc023 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Ensure alignment of bitmaps received from FreeType
From 46d9db96d460fea72f0420102e8a90c6a7231f79 Mon Sep 17 00:00:00 2001
---
2014-03-04 05:37:40 +00:00
Ehsan Akhgari
137fa8efb9
Bug 978594 - Part 1: Remove the old code to support MSVC 2005 and 2008 from gfx/cairo/libpixman/src/Makefile.in; r=glandium
2014-03-03 22:47:56 -05:00
Jeff Gilbert
3a7ff29a22
Bug 978414 - GLContextCGL::IsDoubleBuffered should be const at definition. - r=bustage on a CLOSED TREE
2014-03-03 19:13:34 -08:00
Jeff Gilbert
ecac7faae3
Bug 978414 - Mark GLContext virtuals const and MOZ_OVERRIDE where appropriate. - r=bjacob
2014-03-03 18:47:43 -08:00
Ehsan Akhgari
333c57cfd9
Fix the merge conflict of bug 958596 and bug 978776
2014-03-03 18:24:04 -05:00
Ryan VanderMeulen
47f9e25a13
Merge m-c to inbound.
2014-03-03 17:23:35 -05:00
Ryan VanderMeulen
a1a491b145
Merge inbound to m-c.
2014-03-03 17:00:34 -05:00
Milan Sreckovic
ee769ba5b5
Bug 971943: 5. Add float support to gfxPrefs. apz.max_event_acceleration, apz.fling_friction, apz.fling_stopped_threshold, apz.max_velocity_queue_size, apz.max_velocity_pixels_per_ms preferences moved to gfxPrefs. r=kgupta.
2014-03-03 11:53:21 -05:00
Ryan VanderMeulen
88addeaaa1
Backed out changeset 9024f38e3809 (bug 843666) for bustage.
2014-03-03 11:21:10 -05:00
Jeff Gilbert
933c8042ae
Bug 843666 - Implement color-buffer-(half-)float for WebGL. r=kamidphish
2014-03-03 10:36:52 -05:00
Milan Sreckovic
644e4b482a
Bug 971943: 6. gfx.android.rgb16.force (startup only), gfx.gralloc.fence-with-readpixels (changing during session) moved to gfxPrefs. r=sikeda.
2014-03-03 17:11:06 -05:00
Ehsan Akhgari
02f08d28b2
Bug 978626 - Stop exporting the skia symbols from xul.dll; r=jrmuizel
2014-03-03 16:39:31 -05:00
Ehsan Akhgari
4e89716e1a
Bug 978776 - Stop exporting moz2d symbols from xul.dll; r=jrmuizel
2014-03-03 14:38:33 -05:00
Ed Morley
4710eb7187
Merge mozilla-central and inbound
2014-03-03 14:50:56 +00:00
Ed Morley
46cd2a9fc8
Merge latest green b2g-inbound changeset and mozilla-central
2014-03-03 14:45:43 +00:00
Markus Stange
efeee09152
Bug 975773 - Filter primitives in error states can have inputs. r=roc
2014-03-03 14:31:27 +01:00
L. David Baron
e0a398ba03
Bug 978603: Make sure implicit copy constructors and assignment operators aren't invoked for gfxGlyphExtents (which would at least mess up leak statistics if not actually leak). r=jfkthame
...
Originally written while investigating bug 435138.
2014-03-03 00:54:39 -08:00
L. David Baron
2521e72b74
Bug 978608: Shut down pango's fontmap cleanly and shut down fontconfig, #if CLEANUP_MEMORY. r=karlt
...
This bumps the minimum required pango version to 1.22, released 29 Sep 2008.
2014-03-03 00:54:38 -08:00
Thomas Zimmermann
017247c471
Bug 978086: Fix initialization order in LayerRenderState, r=nical
...
C++ requires constructors to initialize fields in the order of the
fields' definitions.
2014-03-03 09:15:00 +01:00
Jonathan Kew
c268624e75
bug 978313 - initialize matchType appropriately for run-initial control chars that default to the primary font. r=jdaggett
2014-03-03 08:02:05 +00:00
Matt Woodrow
d72b420dc7
Bug 977891 - Move the ForceComposite message to PLayerTransaction so that we can identify the right compositor with e10s. r=nical
2014-03-03 13:59:58 +13:00
Ryan VanderMeulen
1b75e0c4c8
Merge inbound to m-c.
2014-02-28 16:03:19 -05:00
Ryan VanderMeulen
c18c88fc4e
Merge m-c to b2g-inbound.
2014-02-28 10:16:37 -05:00
Carsten "Tomcat" Book
0983fbe801
merge b2g-inbound to mozilla-central
2014-02-28 14:42:11 +01:00
Wes Kocher
811e00ebb5
Merge m-c to b2g-inbound
2014-02-27 17:47:32 -08:00
Wes Kocher
1793a448b8
Merge inbound to m-c
2014-02-27 16:52:51 -08:00
Ryan VanderMeulen
8e1451ad9a
Merge m-c to b2g-inbound.
2014-02-27 17:34:25 -05:00
Ryan VanderMeulen
6435a8a9dd
Merge inbound to m-c.
2014-02-27 16:55:18 -05:00
Sotaro Ikeda
9b4a9e519a
Bug 977596 - Fix build failure on flatfish r=jmuizelaar
2014-02-27 13:26:22 -08:00
Sushil Chauhan
a0bfa0aca9
Bug 976717 - Pass the Framebuffer rectangle to be cleared to LayerComposite. r=ncameron
2014-02-27 11:07:34 -08:00
stefanh@inbox.com
e25b790a1a
Bug 970079 - Native theming for MacOS X help buttons, widget part. r=mstange, roc.
2014-02-27 18:12:16 +01:00
Horia Iosif Olaru
8a23829dd1
Bug 952051 - Change the GetOperator call in FlushGroup to take into account the mix-blend-mode operator for the group. r=roc
...
Create a new GetEffectiveOperator function that also takes into acount the mix-blend-mode operator for basic layers. Replace logic that chooses between the effective mix blend mode and the operator returned by GetOperator, with calls to this function.
2014-02-27 11:56:48 -05:00
Benjamin Bouvier
460c4df9b5
Bug 939843: Required changes in the rest of the tree; r=froydnj
...
--HG--
extra : rebase_source : 5757eb2b73755c8da08112b91b025a8fa860d7e8
2014-02-27 16:23:16 +01:00
Ehsan Akhgari
9f44a4933c
Bug 977279 - Add a missing initguid.h include to DrawTargetD2D.cpp
2014-02-28 10:42:23 -05:00
L. David Baron
8fbb96f3fb
Bug 978495: Initialize mozilla::layers::TextureClientX11::mLocked. r=nical
2014-03-02 10:29:06 -08:00
Jonathan Kew
4957ed89eb
bug 978129 - don't assert when decoding empty 'name' table strings. r=jdaggett
2014-03-02 14:52:12 +00:00
Kyle Huey
a10bc216e9
No bug: dos2unix GLTextureImage.cpp. r=me
...
DONTBUILD
2014-02-28 17:32:07 -08:00
Milan Sreckovic
54894b20da
Bug 977833 - Initialize gfxPrefs so that the tests have access to preferences evaluated that way. r=bgirard
2014-02-28 12:45:27 -05:00
Geoff Brown
0175d25ca3
Bug 978277 - Disable gfx/tests/crashtests/815489.html on Android 2.3
2014-02-28 14:58:39 -07:00
Carsten "Tomcat" Book
01f93d64ea
Merge mozilla-central to b2g-inbound
2014-02-27 15:59:39 +01:00
Sotaro Ikeda
35e512d271
Bug 975384 - Add pointer check to GrallocTextureHostOGL r=nical
2014-02-27 06:40:48 -08:00
Phil Ringnalda
46aa0c9eda
Merge m-c to m-i
2014-02-26 21:28:10 -08:00
Ryan VanderMeulen
8d98e3613b
Backed out changeset 0569a8a2f83d (bug 958727) for causing performance regressions.
2014-02-26 20:48:41 -05:00
Sotaro Ikeda
597733983b
Bug 977393 - Fix build failure on gonk KK r=pchang
2014-02-26 17:46:34 -08:00
Vivien Nicolas
ab4d18e9fd
Bug 977207 - The fps counter requires a restart to be displayed. r=bgirard
2014-02-26 23:12:35 +01:00
Ryan VanderMeulen
d6ce6b9120
Merge m-c to b2g-inbound.
2014-02-26 16:43:08 -05:00
Sotaro Ikeda
11b8051865
Bug 976766 - Clear layer's buffers when ClearCachedResources() r=nical
2014-02-26 13:41:17 -08:00
Sotaro Ikeda
27b7fe9eb2
Bug 974629 - Add pointer check to TextureClient::Finalize() r=nical
2014-02-26 13:34:41 -08:00
Ehsan Akhgari
9c823473c2
Bug 935778 - Part 0.7: Emit the correct type name from FilterNodeLightingSoftware; r=jrmuizel, parts r=dbaron
2014-02-26 10:13:48 -05:00
Morris Tseng
520fcc9bd4
Bug 975937 - Crash in mozilla::layers::ShaderProgramOGL::Activate(). r=gal
2014-02-26 09:04:47 -05:00
Phil Ringnalda
71d2221ff0
Back out d0b4c5c28fb0 (bug 956993) for Android test failures
...
CLOSED TREE
2014-02-27 20:25:55 -08:00
James Willcox
6dc4d165a4
Bug 956993 - Rely on OES_EGL_image_external for SharedSurface_EGLImage r=jgilbert
2014-02-27 20:48:38 -06:00
Ehsan Akhgari
079e0583e9
Bug 977701 - Move skia, cairo and pixman to libxul; r=jrmuizel
2014-02-27 21:14:54 -05:00
Matt Woodrow
44035d8417
Bug 970294 - Set our surface offset as a gfxContext device offset instead of a transform so that other callers don't accidentally overwrite it. r=nrc
2014-02-28 12:32:38 +13:00
Ryan VanderMeulen
5fcc92f054
Merge m-c to inbound.
2014-02-27 17:33:47 -05:00
Ryan VanderMeulen
7f24b975f1
Merge m-c to inbound on a CLOSED TREE.
2014-02-28 16:06:20 -05:00
Matt Woodrow
34ea3f441f
Bug 971720 - Adjust the source pattern transform when masking with RotatedBuffer to take the mask transform into account. r=roc
2014-03-01 08:51:17 +13:00
Matt Woodrow
e38c52eda7
Bug 976877 - Don't simplify invalidation regions since it leads to poor results. r=roc
2014-03-01 08:49:05 +13:00
Milan Sreckovic
bf1ec2c1ca
Bug 971943: 4. gfx.layerscope.port and gfx.layerscope.enabled moved to gfxPrefs. r=dglastonbury
2014-02-28 12:59:38 -05:00
Milan Sreckovic
3236414e71
Bug 971943: 3. gfx.apitrace.enabled (ANDROID only) preference moved to gfxPrefs. r=gwright
2014-02-28 12:59:38 -05:00
Milan Sreckovic
2d75d8ad7c
Bug 971943: 2. webgl.force-layers-readback preference moved to gfxPrefs. r=gw280
2014-02-28 12:59:37 -05:00
Milan Sreckovic
859c5b0464
Bug 971943: 1. Remove unused variable. r=me.
2014-02-28 12:59:35 -05:00
Andrew McCreight
0353960345
Bug 962608 - Make PL_DHashTableInit infallible by default. r=briansmith,bsmedberg,ehsan,froydnj,jduell,jfkthame,roc,smaug
2014-02-27 10:04:09 -08:00
Sotaro Ikeda
bc248d7442
Bug 975146 - Do not use hw composer for screenshot r=bas
2014-03-04 14:36:52 -08:00
Ryan VanderMeulen
8703831edb
Merge m-c to b2g-inbound.
2014-03-04 17:25:07 -05:00
Ben Kelly
2c21d8f638
Bug 977975: Improve composition thread warning debug. r=benwa
2014-03-04 14:41:24 -05:00
Botond Ballo
0028367a68
Bug 958596 - Print ScrollableLayerGuids of APZCs when printing the tree. r=kats
2014-01-22 18:44:59 -05:00
Botond Ballo
e2ac4d85b6
Bug 958596 - Allow gfx logging of long long. r=Bas
2014-01-22 18:38:31 -05:00
Botond Ballo
fdae9a67f9
Bug 958596 - Print the APZC tree for debugging. r=kats
2014-01-22 15:09:03 -05:00
Botond Ballo
47e99a4731
Bug 958596 - Add a content description field to FrameMetrics and populate it if the apz.printtree pref is on. r=kats,tn
2014-01-22 16:37:57 -05:00
Botond Ballo
f04e527185
Bug 958596 - Allow TreeLog logging to be conditioned on a pref. r=Bas
2014-01-22 15:19:01 -05:00
Botond Ballo
ecd9186cdc
Bug 958596 - Add support a tree logging utility. r=Bas
2014-01-21 20:14:47 -05:00
Botond Ballo
7412571303
Bug 958596 - Allow writing a log statement that does not end in a newline. r=Bas
2014-01-21 18:59:17 -05:00
Botond Ballo
fb245221ef
Bug 958596 - Allow gfx logging of any rect, size, and point. r=Bas
2014-01-21 18:38:34 -05:00
Botond Ballo
af90204ad9
Bug 958596 - Add gfx logging support for 'char'. r=Bas
2014-01-21 20:26:00 -05:00
Botond Ballo
c021a65b4f
Bug 958596 - Add support for gfx logging on android and b2g. r=Bas
2014-01-21 20:11:52 -05:00
Botond Ballo
f6d0d6ba20
Bug 958596 - Allow gfx/2d/Logging.h to be used outside of gfx/2d. r=Bas
2014-02-18 21:59:34 -05:00
Ehsan Akhgari
54e12e450a
Bug 976392 - Move moz2d to libxul; r=jrmuizel
2014-02-25 15:42:23 -05:00
Ed Morley
4debeeb3cb
Backed out changeset 07f3cfaa7900 (bug 958596) for build failures on Windows
2014-02-25 17:17:47 +00:00
Ed Morley
7f5fb11b90
Backed out changeset dfadc8e2c38e (bug 958596)
2014-02-25 17:17:26 +00:00
Ed Morley
2879a524c6
Backed out changeset b190a7268dd4 (bug 958596)
2014-02-25 17:17:23 +00:00
Ed Morley
9cc46c13ce
Backed out changeset b228fa36e700 (bug 958596)
2014-02-25 17:17:19 +00:00
Ed Morley
50c5811970
Backed out changeset ff5de50c1333 (bug 958596)
2014-02-25 17:17:16 +00:00
Ed Morley
c9d104b0ea
Backed out changeset eb4286cfa305 (bug 958596)
2014-02-25 17:17:12 +00:00
Ed Morley
7583c4224e
Backed out changeset c88e6d34fe90 (bug 958596)
2014-02-25 17:17:09 +00:00
Ed Morley
2cbe207bfb
Backed out changeset a29e486e2214 (bug 958596)
2014-02-25 17:17:02 +00:00
Ed Morley
798cb623a9
Backed out changeset 7a16622e6b38 (bug 958596)
2014-02-25 17:16:59 +00:00
Ed Morley
a7130bf842
Backed out changeset 8e8db64bbaba (bug 958596)
2014-02-25 17:16:55 +00:00
Ed Morley
f20cd4876b
Backed out changeset 63d96f3e3e42 (bug 958596)
2014-02-25 17:16:52 +00:00
Botond Ballo
cde3a3dad9
Bug 958596 - Print ScrollableLayerGuids of APZCs when printing the tree. r=kats
...
--HG--
extra : rebase_source : cc3688109bb8a8a074e24b2f0268fdc556f05c1f
2014-02-25 10:56:46 -05:00
Botond Ballo
c3ba42c967
Bug 958596 - Allow gfx logging of long long. r=Bas
...
--HG--
extra : rebase_source : c65c224a3ce6f09636be594eb68a95cc791841f7
2014-01-22 18:38:31 -05:00
Botond Ballo
194c16f39c
Bug 958596 - Print the APZC tree for debugging. r=kats
...
--HG--
extra : rebase_source : bac86951246ba92f983a2ced3f7079143b5d42a1
2014-01-22 15:09:03 -05:00
Botond Ballo
e700ca83a9
Bug 958596 - Add a content description field to FrameMetrics and populate it if the apz.printtree pref is on. r=kats,tn
...
--HG--
extra : rebase_source : f009ad9d779fb1a3afa525fe7e5eb3a399aee628
2014-01-22 16:37:57 -05:00
Botond Ballo
d2592fde93
Bug 958596 - Allow TreeLog logging to be conditioned on a pref. r=Bas
...
--HG--
extra : rebase_source : 4390b6b07ec6cf195839f6e8386c769a8b234dd0
2014-01-22 15:19:01 -05:00
Botond Ballo
ad7f84f5b3
Bug 958596 - Add support a tree logging utility. r=Bas
...
--HG--
extra : rebase_source : 1bb9385ea2f9ce653ec0d5acd529edb63a385117
2014-01-21 20:14:47 -05:00
Botond Ballo
2b335299be
Bug 958596 - Allow writing a log statement that does not end in a newline. r=Bas
...
--HG--
extra : rebase_source : a26166451eb22c50b6bb32c2728bd07bdbf6e859
2014-01-21 18:59:17 -05:00
Botond Ballo
a72dd0471d
Bug 958596 - Allow gfx logging of any rect, size, and point. r=Bas
...
--HG--
extra : rebase_source : b884b10446f5bc026285e6b16c202c7d9a2c377b
2014-01-21 18:38:34 -05:00
Botond Ballo
b3607d2320
Bug 958596 - Add gfx logging support for 'char'. r=Bas
...
--HG--
extra : rebase_source : 2938fc27a6541fd5dd5ac1cf94f3e69ed3997ecc
2014-01-21 20:26:00 -05:00
Botond Ballo
5742b5c647
Bug 958596 - Add support for gfx logging on android and b2g. r=Bas
...
--HG--
extra : rebase_source : 8d5a1c0dfc4f5f74e8417531b1f9f39c54e85d49
2014-01-21 20:11:52 -05:00
Botond Ballo
2a2b1be83a
Bug 958596 - Allow gfx/2d/Logging.h to be used outside of gfx/2d. r=Bas
...
--HG--
extra : rebase_source : 7c99fccae55d8116f12b52ed74e178590c2c7414
2014-02-18 21:59:34 -05:00
Carsten "Tomcat" Book
a965a12333
Merge mozilla-central to mozilla-inbound
2014-02-25 15:18:06 +01:00
Carsten "Tomcat" Book
b890bb080b
merge b2g-inbound to mozilla-central
2014-02-25 14:30:13 +01:00
John Daggett
6b1059d859
Bug 975460 - check for null CTFontRef after creation. r=jfkthame
2014-02-25 16:37:26 +09:00
Benoit Jacob
9d5a6c1114
Bug 974356 - 4/4 - make CreateIPDLActor error out if TextureParent::Init() failed - r=nical
2014-02-25 08:12:50 -05:00
Benoit Jacob
f095290ef2
Bug 974356 - 3/4 - Make TextureHost::CreateIPDLActor check for bad MemoryTextures - r=nical
2014-02-25 08:12:49 -05:00
Benoit Jacob
522c9a1fee
Bug 974356 - 2/4 - add an IsSameProcess method to ISurfaceAllocator - r=nical
2014-02-25 08:12:49 -05:00
Phil Ringnalda
478c62f613
Back out b157f5d0c235 (bug 974197) for b2g reftest-4 and reftest-6 failures
...
CLOSED TREE
2014-02-24 21:06:18 -08:00
Ryan VanderMeulen
e151bee907
Backed out changeset 96f2905b175d (bug 978479) for OSX reftest failures.
...
CLOSED TREE
2014-03-06 14:14:52 -05:00
Andreas Gal
eea7eaf509
Bug 978479 - Remove flipped quad texture from mQuadVBO. r=bjacob
2014-03-06 12:50:29 -05:00
Ryan VanderMeulen
2e28589dc1
Backed out changesets e7c4304d45d7 and 75d3146ac0d3 (bug 970891) for Android reftest failures.
...
CLOSED TREE
2014-03-06 11:00:26 -05:00
Jonathan Kew
4179d8cb75
bug 970891 - don't assume the primary font will always support the <space> character - fall back down the font stack if necessary. r=roc
2014-02-11 15:28:21 +00:00
Ehsan Akhgari
4588178db3
Fix up skia's generate_mozbuild.py to make it match the moz.build file, no bug, DONTBUILD
2014-03-06 08:58:52 -05:00
Jonathan Kew
a6dad90e47
bug 974575 - support color glyphs in cairo_image_surface's _composite_glyphs function. r=jrmuizel
2014-03-06 12:29:23 +00:00
Jonathan Kew
2b7b569692
bug 974575 - correction for bad commit (a0f556f37fb7016aa304b7cf0e811c0d38f0b969) ported from upstream. r=jrmuizel
2014-03-06 12:29:23 +00:00
Jonathan Kew
d9227c7961
bug 974575 - backport Behdad's patches for color bitmap glyph support from current cairo trunk. r=jrmuizel
...
* * *
[ft] Fix resizing of bitmap fonts
From b94a519aad3d5b50aa6de47ee16ee6a099de9791 Mon Sep 17 00:00:00 2001
Say, you were asking cairo for a font at 200px. For bitmap-only fonts,
cairo was finding the closes strike size and using it. If the strike
was at 20px, well, that's what you were getting. We now scale that 20px
strike by a factor of 10 to get the correct size rendering.
Note that by itself this patch doesn't change much on the Linux desktop.
The reason is that the size you are interested in (eg. 200px) is lost by
fontconfig. When you request a font at 200px, fontconfig returns a font
pattern that says 20px, and so the next layers thing you want a font at
20px. To address that, one also needs a piece of fontconfig config that
puts the 200 back into the pixelsize. Something like this:
<match target="font">
<test name="scalable" mode="eq">
<bool>false</bool>
</test>
<edit name="pixelsize" mode="assign">
<times>
<name>size</name>
<name>dpi</name>
<double>0.0138888888888</double> <!--1/72.-->
</times>
</edit>
</match>
I'm going to try to upstream this config so it will be enabled by
default. The config can be a bit smarter. For example, if
metricshinting is enabled and the size difference is small, we may as
well not scale.
The nice thing about this is that the configuration of whether and when
to scale bitmaps will be done in fontconfig, not cairo / Qt / ... code.
---
* * *
[FT] Prefer downscaling bitmap glyphs to upscaling
From a8f1b456db744e33a10b2301df03528787e5b1ca Mon Sep 17 00:00:00 2001
Say, you have bitmap strikes for sizes 50ppem and 100ppem.
To render at 60ppem, it's much better to downscale the 100ppem
bitmap than upscale 50ppem one. Prefer downscaling.
---
* * *
[ft] I meant fabs(), not abs()
From 13bd8d09b44e50649f6fc4d58d036bc32c1d5c5b Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix memory bug in copying bitmaps
From a0f556f37fb7016aa304b7cf0e811c0d38f0b969 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix wrong assumptions
From e738079302a968b7b1fb9101cd4d92a8887bedce Mon Sep 17 00:00:00 2001
If subpixel rendering is enabled, but FT returns a 8bit gray bitmap
(perhaps because the font has 8bit embedded bitmaps) we were hitting
the assertions because the assumptions made were wrong. Fix up.
---
* * *
Towards support loading color glyphs from FreeType
From 2cc353c3dbe01b4d8f65d6de800f2b1d6004a1c2 Mon Sep 17 00:00:00 2001
See comments.
---
* * *
Support 2bit and 4bit embedded bitmaps
From 9444ef09ccde2735258cc1bd2f1912119a32dd88 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix math
From 7d26341072b13a78d4b3fe58779057ac020be487 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Add missing include
From 0554d76402321b25cc952180e4d19436a9038d1a Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix alignment
From 34a747e7bdeba1cfe17318f80fbe6720d47bc023 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Ensure alignment of bitmaps received from FreeType
From 46d9db96d460fea72f0420102e8a90c6a7231f79 Mon Sep 17 00:00:00 2001
---
2014-03-06 12:29:22 +00:00
Wes Kocher
6ff0104d95
Backed out 12 changesets (bug 958596) for several Android permafails to fix a CLOSED TREE
...
Backed out changeset e4c0e3d3a768 (bug 958596)
Backed out changeset 7bc4f48d6b05 (bug 958596)
Backed out changeset 89cd12e3db45 (bug 958596)
Backed out changeset 283411053340 (bug 958596)
Backed out changeset 5329fa8c8847 (bug 958596)
Backed out changeset 0d1d26d588e3 (bug 958596)
Backed out changeset 715fe9eb5dfd (bug 958596)
Backed out changeset 66dde9d67ffa (bug 958596)
Backed out changeset 79e589f75065 (bug 958596)
Backed out changeset 1ed4c880ab70 (bug 958596)
Backed out changeset 1d40b0b8036d (bug 958596)
Backed out changeset ad35d51d9781 (bug 958596)
2014-02-25 18:34:47 -08:00
Botond Ballo
3399e0a351
Bug 958596 - Print ScrollableLayerGuids of APZCs when printing the tree. r=kats
...
--HG--
extra : amend_source : 11e8919bbe6c3ac9e28663cc5d4ab9a20aeef896
2014-02-25 19:35:06 -05:00
Botond Ballo
77771303be
Bug 958596 - Allow gfx logging of long long. r=Bas
2014-01-22 18:38:31 -05:00
Botond Ballo
ae1a7f2b9e
Bug 958596 - Print the APZC tree for debugging. r=kats
2014-01-22 15:09:03 -05:00
Botond Ballo
0f6495bca7
Bug 958596 - Add a content description field to FrameMetrics and populate it if the apz.printtree pref is on. r=kats,tn
2014-01-22 16:37:57 -05:00
Botond Ballo
1333bc0a0f
Bug 958596 - Allow TreeLog logging to be conditioned on a pref. r=Bas
2014-01-22 15:19:01 -05:00
Botond Ballo
ebb2a1fe6f
Bug 958596 - Add support a tree logging utility. r=Bas
2014-01-21 20:14:47 -05:00
Botond Ballo
33e9c22890
Bug 958596 - Allow writing a log statement that does not end in a newline. r=Bas
2014-01-21 18:59:17 -05:00
Botond Ballo
dbbea6b59d
Bug 958596 - Allow gfx logging of any rect, size, and point. r=Bas
2014-01-21 18:38:34 -05:00
Botond Ballo
9cbf8f1c30
Bug 958596 - Add gfx logging support for 'char'. r=Bas
2014-01-21 20:26:00 -05:00
Botond Ballo
7bf5ae6295
Bug 958596 - Add support for gfx logging on android and b2g. r=Bas
2014-01-21 20:11:52 -05:00
Botond Ballo
3cd546cc30
Bug 958596 - Allow gfx/2d/Logging.h to be used outside of gfx/2d. r=Bas
2014-02-18 21:59:34 -05:00
Matt Woodrow
8e879058a1
Bug 975592 - Make sure we find the correct composition manager when updating child process layer trees. r=nical
...
--HG--
extra : rebase_source : 5e1457117293c74a362a0570aca2673c90038334
2014-02-25 11:45:40 +13:00
Matt Woodrow
a09f9b9bce
Bug 974709 - Use a separate texture for each X11TextureSource and keep the pixmap bound. r=nical
...
--HG--
extra : rebase_source : 06012985e185f517d8a807788e35ea1efcaf39d8
2014-02-22 22:22:43 +13:00
Sotaro Ikeda
c5c7a00346
Bug 957323 - Handle android's fence on gonk r=nical,doublec,pchang
2014-02-24 20:23:41 -08:00
Wes Kocher
2bb838ebe6
Merge m-c to b2g-inbound
2014-02-24 18:28:37 -08:00
Ben Kelly
f6b39805f3
Bug 976035: Cap max fling velocity at pref'd limit. r=kats
2014-02-24 16:08:31 -05:00
Maksim Lebedev
79dfc8c78d
Bug 973660 - TEST-UNEXPECTED-FAIL AsyncPanZoomController.LongPress when touch action enabled r=drs,kats
2014-02-24 01:31:18 -05:00
Ehsan Akhgari
2cb5c4da7a
Bug 975730 - Remove an unused CFLAGS from the qcms build system; r=mshal
...
MOZ_QCMS is not used anywhere.
2014-02-22 21:41:02 -05:00
Milan Sreckovic
825c103203
Bug 946907: Make sure GLContext reads preferences through gfxPrefs which means it's done on the main thread. Rename the macro to DECL_GFX_PREF before it gets used in a lot of places. r=bjacob
2014-02-22 18:53:04 -05:00
Ehsan Akhgari
e4ed013f53
Bug 935778 - Part 1.1: Re-add the refcount assertions for AddRef(), and make the assertions for Release() use a signed integer
2014-02-22 11:23:03 -05:00
Kartikaya Gupta
5b4e7ef8b9
Bug 898563. r=botond
2014-02-21 17:58:30 -05:00
Benoit Jacob
7212d43233
Bug 970747 - 6/6 - Make LayerTransactionParent::RecvUpdate error out if RepositionChild fails - r=mattwoodrow
2014-02-21 16:50:25 -05:00
Benoit Jacob
0c5e25c738
Bug 970747 - 5/6 - Make ContainerLayer::RepositionChild always perform checks and return bool - r=mattwoodrow
2014-02-21 16:50:25 -05:00
Benoit Jacob
e61d449ec5
Bug 970747 - 4/6 - Make LayerTransactionParent::RecvUpdate error out if RemoveChild fails - r=mattwoodrow
2014-02-21 16:50:25 -05:00
Benoit Jacob
a75b9a2ab0
Bug 970747 - 3/6 - Make ContainerLayer::RemoveChild always perform checks and return bool - r=mattwoodrow
2014-02-21 16:50:25 -05:00
Benoit Jacob
0492e4667d
Bug 970747 - 2/6 - Make LayerTransactionParent::RecvUpdate error out if InsertAfter fails - r=mattwoodrow
2014-02-21 16:50:25 -05:00
Benoit Jacob
0dedf049b3
Bug 970747 - 1/6 - Make ContainerLayer::InsertAfter always perform checks and return bool - r=mattwoodrow
2014-02-21 16:50:25 -05:00
Benoit Jacob
a6aa330ed8
Bug 968825 - Null pointer checks in LayerTransactionParent - r=jrmuizel
2014-02-21 16:50:25 -05:00
Morris Tseng
644084917e
Bug 975121 - Fix reversed colors with gfx.xrender.enabled = false. r=gal
2014-02-24 10:09:55 -05:00
Mason Chang
fc45a7641d
Bug 917416 - Make App Renderframe Opaque. r=roc
2014-02-24 10:09:55 -05:00
Ehsan Akhgari
a8a0206da1
Bug 935778 - Part 1: Add RefCountType, a type compatible with nsrefcnt, to MFBT; r=dbaron,froydnj
2014-02-21 14:45:50 -05:00
Ryan VanderMeulen
0fceb198fa
Backed out changeset 18183f6ef0d8 (bug 910860) for xpcshell and reftest failures.
2014-02-21 12:35:35 -05:00
Milan Sreckovic
eb4c7c8908
Bug 910860 - Use gfxPrefs to make sure preferences are evaluated on the main thread. This still leaves the preference re-evaluated. r=BenWa
2014-02-18 19:55:48 -05:00
Robert O'Callahan
6840723017
Bug 973767. Put the compositor into test mode via an IPDL transaction. r=mattwoodrow
...
--HG--
extra : rebase_source : d40cf8624f93b85298cc501ff315522220522fb6
2014-02-12 17:41:57 +13:00
Ehsan Akhgari
5704b555e2
Bug 935778 - Part 0.2: Spray some MOZ_DECLARE_REFCOUNTED_TYPENAME across the tree
2014-02-20 21:33:49 -05:00
Oleg Romashin
5b8bccef6f
Bug 974335 - Refactor Qt Widget Backend implementation. Qt Only changes NPDB. r=romaxa
...
--HG--
rename : dom/system/unix/Makefile.in => dom/system/qt/Makefile.in
rename : dom/system/unix/QTMLocationProvider.cpp => dom/system/qt/QTMLocationProvider.cpp
rename : dom/system/unix/QTMLocationProvider.h => dom/system/qt/QTMLocationProvider.h
rename : dom/system/unix/nsHapticFeedback.cpp => dom/system/qt/QtHapticFeedback.cpp
rename : dom/system/unix/nsHapticFeedback.h => dom/system/qt/QtHapticFeedback.h
rename : dom/system/unix/moz.build => dom/system/qt/moz.build
2014-02-20 18:09:02 -08:00
Oleg Romashin
04bd92326d
Bug 974335 - Refactor Qt Widget Backend implementation. skia build fix. r=gw280
2014-02-18 12:45:31 -08:00
Oleg Romashin
630ac326a5
Bug 974335 - Refactor Qt Widget Backend implementation. gl changes . r=bjacob
2014-02-20 18:08:50 -08:00
Bill McCloskey
4d1519077d
Bug 974007 - Change OMTC behavior when browser.tabs.remote is set (r=mattwoodrow,felipe)
2014-02-20 17:26:41 -08:00
Wes Kocher
8d647a6ec0
Backed out changeset cf6a31bca4e0 (bug 939276) for webgl reftest crash
...
--HG--
rename : gfx/gl/SkiaGLGlue.cpp => gfx/gl/GLContextSkia.cpp
2014-02-20 15:23:52 -08:00
Kartikaya Gupta
f6a1fc6920
Bug 965945 - Prevent the parent process from running out of memory if the child process requests a giant gralloc buffer. r=bjacob
2014-02-19 12:08:00 -05:00
James Willcox
91032a3dca
Bug 939276 - Use a single GLContext for all SkiaGL canvases r=vlad,gwright,bjacob
...
--HG--
rename : gfx/gl/GLContextSkia.cpp => gfx/gl/SkiaGLGlue.cpp
extra : rebase_source : 8e85dd34a67c2e193480e9f1f5baf68a898790fe
2014-02-20 16:20:28 -06:00
Matt Woodrow
b131d17ba8
Bug 947227 - Remove SurfaceStream_TripleBuffer_Async since it no longer has any users. r=jgilbert
2014-02-21 11:08:36 +13:00
Matt Woodrow
0ee7d39f66
Bug 947227 - Stop using SurfaceStream_TripleBuffer_Async since it can hang if the compositor fails to pull the latest surface. r=jgilbert
2014-02-21 11:08:05 +13:00
Benoit Jacob
4aaf0bcadc
Bug 971695 - 2/2 - make YCbCrImageDataSerializer check data size - r=nical
2014-02-20 16:04:13 -05:00
Benoit Jacob
9b3a0b05a4
Bug 971695 - 1/2 - make ImageDataSerializer check data size - r=nical
2014-02-20 16:04:11 -05:00
Benoit Jacob
1a997e96bc
Bug 971678 - Validate the compositable type in SetCompositableHost - r=nical
2014-02-20 15:07:04 -05:00
Benoit Jacob
84a8e5e7bb
Bug 969549 - Make PCompositableTransaction check actual layer types before casting - r=nical
2014-02-20 15:05:48 -05:00
Benoit Jacob
08f9ebfccc
Bug 968001 - In OpSetRoot, check that the new root is a root - r=nical
2014-02-20 15:05:08 -05:00
Benoit Jacob
fc6b63874d
Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it - r=mattwoodrow
2014-02-20 11:41:39 -05:00
Benoit Jacob
60b8720960
Bug 968833 - 2/2 - ThebesLayerComposite should be TYPE_THEBES, not TYPE_SHADOW - r=nical
2014-02-20 11:41:04 -05:00
Benoit Jacob
755940561f
Bug 968833 - 1/2 - Make PLayerTransaction check actual layer types before casting - r=jrmuizel
2014-02-20 11:40:55 -05:00
Jan Beich
e4b67ca7e0
Bug 974272 - Remove obsolete skia patch for BSDs. r=gw280
2014-02-20 09:36:10 -05:00
Jan Beich
267f88f5ab
Bug 974272 - Unbreak skia on tier3 platforms by dropping unused setProcessorAffinity() implementation. r=gw280
2014-02-20 09:35:58 -05:00
Benoit Jacob
c4ef6434fc
Bug 972682 - make UploadImageDataToTexture not pass uninitialized parameters to glTexImage2D - r=jgilbert
2014-02-20 08:05:34 -05:00
Benoit Jacob
868abbf705
Bug 967330 - UpdateThebes should fail gracefully instead of aborting - r=nical
2014-02-20 08:05:32 -05:00
Benoit Jacob
3cd869795a
Bug 967824 - Make SetCompositableHost gracefully handle errors instead of just aborting - r=nical
2014-02-20 08:05:30 -05:00
George Wright
ac0b130bdf
Bug 974360 - Disallow Skia's use of static global initialisers r=vlad
2014-02-19 17:26:45 -05:00
Kartikaya Gupta
54d3c0f363
Merge backout of bug 965945 from m-c
2014-02-19 17:26:48 -05:00