Zack Weinberg
662e668d9f
Bug 516091: Split CSS error reporting to its own file and class. Allows CSS scanner to become a stack object. r=dbaron
2012-11-15 11:36:15 -05:00
Chris Pearce
ddedecabd0
Bug 811381 - Remove ns prefix from media code. r=roc
...
--HG--
rename : content/media/nsAudioAvailableEventManager.cpp => content/media/AudioAvailableEventManager.cpp
rename : content/media/nsAudioAvailableEventManager.h => content/media/AudioAvailableEventManager.h
rename : content/media/nsAudioStream.cpp => content/media/AudioStream.cpp
rename : content/media/nsAudioStream.h => content/media/AudioStream.h
rename : content/media/nsMediaCache.cpp => content/media/MediaCache.cpp
rename : content/media/nsMediaCache.h => content/media/MediaCache.h
rename : content/media/nsBuiltinDecoder.cpp => content/media/MediaDecoder.cpp
rename : content/media/nsBuiltinDecoder.h => content/media/MediaDecoder.h
rename : content/media/nsBuiltinDecoderReader.cpp => content/media/MediaDecoderReader.cpp
rename : content/media/nsBuiltinDecoderReader.h => content/media/MediaDecoderReader.h
rename : content/media/nsBuiltinDecoderStateMachine.cpp => content/media/MediaDecoderStateMachine.cpp
rename : content/media/nsBuiltinDecoderStateMachine.h => content/media/MediaDecoderStateMachine.h
rename : content/media/dash/nsDASHDecoder.cpp => content/media/dash/DASHDecoder.cpp
rename : content/media/dash/nsDASHDecoder.h => content/media/dash/DASHDecoder.h
rename : content/media/dash/nsDASHReader.cpp => content/media/dash/DASHReader.cpp
rename : content/media/dash/nsDASHReader.h => content/media/dash/DASHReader.h
rename : content/media/dash/nsDASHRepDecoder.cpp => content/media/dash/DASHRepDecoder.cpp
rename : content/media/dash/nsDASHRepDecoder.h => content/media/dash/DASHRepDecoder.h
rename : content/media/gstreamer/nsGStreamerDecoder.cpp => content/media/gstreamer/GStreamerDecoder.cpp
rename : content/media/gstreamer/nsGStreamerDecoder.h => content/media/gstreamer/GStreamerDecoder.h
rename : content/media/gstreamer/nsGStreamerReader.cpp => content/media/gstreamer/GStreamerReader.cpp
rename : content/media/gstreamer/nsGStreamerReader.h => content/media/gstreamer/GStreamerReader.h
rename : content/media/ogg/nsOggCodecState.cpp => content/media/ogg/OggCodecState.cpp
rename : content/media/ogg/nsOggCodecState.h => content/media/ogg/OggCodecState.h
rename : content/media/ogg/nsOggDecoder.cpp => content/media/ogg/OggDecoder.cpp
rename : content/media/ogg/nsOggDecoder.h => content/media/ogg/OggDecoder.h
rename : content/media/ogg/nsOggReader.cpp => content/media/ogg/OggReader.cpp
rename : content/media/ogg/nsOggReader.h => content/media/ogg/OggReader.h
rename : content/media/omx/nsMediaOmxDecoder.cpp => content/media/omx/MediaOmxDecoder.cpp
rename : content/media/omx/nsMediaOmxDecoder.h => content/media/omx/MediaOmxDecoder.h
rename : content/media/omx/nsMediaOmxReader.cpp => content/media/omx/MediaOmxReader.cpp
rename : content/media/omx/nsMediaOmxReader.h => content/media/omx/MediaOmxReader.h
rename : content/media/plugins/nsMediaPluginDecoder.cpp => content/media/plugins/MediaPluginDecoder.cpp
rename : content/media/plugins/nsMediaPluginDecoder.h => content/media/plugins/MediaPluginDecoder.h
rename : content/media/plugins/nsMediaPluginHost.cpp => content/media/plugins/MediaPluginHost.cpp
rename : content/media/plugins/nsMediaPluginHost.h => content/media/plugins/MediaPluginHost.h
rename : content/media/plugins/nsMediaPluginReader.cpp => content/media/plugins/MediaPluginReader.cpp
rename : content/media/plugins/nsMediaPluginReader.h => content/media/plugins/MediaPluginReader.h
rename : content/media/raw/nsRawDecoder.cpp => content/media/raw/RawDecoder.cpp
rename : content/media/raw/nsRawDecoder.h => content/media/raw/RawDecoder.h
rename : content/media/raw/nsRawReader.cpp => content/media/raw/RawReader.cpp
rename : content/media/raw/nsRawReader.h => content/media/raw/RawReader.h
rename : content/media/raw/nsRawStructs.h => content/media/raw/RawStructs.h
rename : content/media/wave/nsWaveDecoder.cpp => content/media/wave/WaveDecoder.cpp
rename : content/media/wave/nsWaveDecoder.h => content/media/wave/WaveDecoder.h
rename : content/media/wave/nsWaveReader.cpp => content/media/wave/WaveReader.cpp
rename : content/media/wave/nsWaveReader.h => content/media/wave/WaveReader.h
rename : content/media/webm/nsWebMBufferedParser.cpp => content/media/webm/WebMBufferedParser.cpp
rename : content/media/webm/nsWebMBufferedParser.h => content/media/webm/WebMBufferedParser.h
rename : content/media/webm/nsWebMDecoder.cpp => content/media/webm/WebMDecoder.cpp
rename : content/media/webm/nsWebMDecoder.h => content/media/webm/WebMDecoder.h
rename : content/media/webm/nsWebMReader.cpp => content/media/webm/WebMReader.cpp
rename : content/media/webm/nsWebMReader.h => content/media/webm/WebMReader.h
2012-11-14 11:46:40 -08:00
Nicholas Cameron
e907939a76
Bug 800556; remove nsIDOMCanvasRenderingContext2D; r=Ms2ger,sr=bz
...
--HG--
extra : rebase_source : 461ff127a453116f3364f4ba1e414cc527f195bd
2012-11-13 16:35:36 -08:00
Chris Pearce
0ecfa729e5
Bug 799344 - Remove extraneous media includes from nsLayoutStatics.cpp. r=roc
2012-11-07 11:33:02 +13:00
Robert O'Callahan
e7ff18c817
Bug 792675. Part 5: Extend nsHostObjectProtocolHandler with support for 'mediastream' scheme. r=sicking
...
--HG--
rename : content/base/public/nsBlobProtocolHandler.h => content/base/public/nsHostObjectProtocolHandler.h
rename : content/base/src/nsBlobProtocolHandler.cpp => content/base/src/nsHostObjectProtocolHandler.cpp
rename : content/base/src/nsBlobURI.h => content/base/src/nsHostObjectURI.h
extra : rebase_source : aea1ab3b9eed985ea238d2e9fb74bf3b2f574756
2012-09-25 15:24:44 +12:00
Robert O'Callahan
953ac1301a
Bug 792675. Part 4: Refactor nsBlobURI/nsBlobProtocolHandler to nsHostObjectURI/nsHostObjectProtocolHandler. r=sicking
...
The code to handle MediaStream URIs is almost the same as for Blobs, so share it.
nsHostObjectProtocolHandler is modified a bit to simplify method names. Also
we make nsHostObjectProtocolHandler::AddDataEntry take responsibility for
generating the URI to avoid duplicating that code later.
We need separate subclasses for each kind of host object protocol handler,
but we don't need separate subclasses for each kind of host object URI.
--HG--
rename : content/base/public/nsBlobProtocolHandler.h => content/base/public/nsHostObjectProtocolHandler.h
rename : content/base/src/nsBlobProtocolHandler.cpp => content/base/src/nsHostObjectProtocolHandler.cpp
rename : content/base/src/nsBlobURI.cpp => content/base/src/nsHostObjectURI.cpp
rename : content/base/src/nsBlobURI.h => content/base/src/nsHostObjectURI.h
extra : rebase_source : bfb1d7ea2813100a35f9a2054a67584e38f5f330
2012-09-25 15:24:44 +12:00
Ryan VanderMeulen
9a37b86c48
Backout 3f0e69962962, 84a1afc5b15e, c62f225d0dbb, 24870ebc9665, and dd7663e68657 (bug 799344) for mochitest-1 orange.
2012-11-06 19:36:49 -05:00
Chris Pearce
75305bbfd0
Bug 799344 - Remove extraneous media includes from nsLayoutStatics.cpp. r=roc
2012-11-07 11:33:02 +13:00
Gregor Wagner
e03cbea0f5
Bug 775997 - Message app crashes when run OOP. Part 1/2. r=bent
2012-11-06 13:29:30 -08:00
Ben Turner
5e8d8d57f2
Bug 786295 - 'Delete IndexedDB related to an app when uninstalled'. r=bz+khuey+sicking.
2012-10-23 09:31:19 -07:00
Masayuki Nakano
8acd6ae7f5
Bug 705057 part.1 Ensure a set of composition events is fired on same content r=smaug
2012-09-26 14:47:45 +09:00
Steven Lee
b7c96225e0
Bug 790499 - Time API: Call JS_ClearDateCaches() to update Date object's timezone when the system timezone is reset, r=jlebar
2012-10-17 00:26:00 -04:00
David Zbarsky
e1da975f5f
Backout bug 779684 for topcrash
2012-10-15 14:35:50 -04:00
Kan-Ru Chen (陳侃如)
8068315fd0
Bug 797681 - Register GonkGPSGeoLocationProvider as a XPCOM service. r=dougt
2012-10-15 14:40:51 +08:00
Nicholas Cameron
4996f7f194
Bug 734668; reviewer's changes. r=Ms2ger,roc
...
--HG--
rename : content/canvas/src/nsCanvasRenderingContext2DAzure.cpp => content/canvas/src/CanvasRenderingContext2D.cpp
extra : rebase_source : 827a45dd8cc2bdc77e850e8b1d1e23e9f2f72f7d
2012-10-12 22:42:53 +13:00
Nicholas Cameron
1cccb0d825
Bug 734668; remove Thebes canvas. r=roc
...
--HG--
extra : rebase_source : 57b08c33f72cd611deb30dc1639060a719747849
2012-10-12 22:42:51 +13:00
Ed Morley
6f00411a92
Backout 5b727a94eebd (bug 731974) for causing bug 797263 again
2012-10-12 11:25:17 +01:00
Vladimir Vukicevic
3ace044c9f
b=731974, requestAnimationFrame generates too short/long frames (incl. bug 799242); r=bz,smaug,roc
2012-10-02 10:54:46 -04:00
David Zbarsky
4085f74a3f
[Bug 799407] Fix build warnings in layout r=roc
2012-10-10 01:00:05 -04:00
Ed Morley
ad52ccae25
Backout 739aff49b8bb (bug 731974) for turning browser_586068-reload.js permaorange on WinXP 3 days ago
2012-10-08 10:57:12 +01:00
Jason Duell
a54c38a647
Bug 795203 - B2g: clear private data: cookies. r=mconnor,jduell
2012-09-28 17:03:00 -07:00
Vladimir Vukicevic
ef31101c74
b=731974, requestAnimationFrame generates too short/long frames; r=bz,smaug,roc
2012-10-02 10:54:46 -04:00
Jeff Muizelaar
d14ebc63da
Bug 794884. Make SupportImageWithMimeType return a bool. r=joe.
...
This cleans things up quite a bit.
---
content/base/src/nsObjectLoadingContent.cpp | 4 +---
docshell/base/nsWebNavigationInfo.cpp | 4 +---
image/src/imgLoader.cpp | 7 ++-----
image/src/imgLoader.h | 2 +-
layout/build/nsContentDLF.cpp | 4 +---
5 files changed, 6 insertions(+), 15 deletions(-)
2012-10-03 16:17:47 -04:00
Jeff Muizelaar
bd55aae8e0
Bug 794884. Make SupportImageWithMimeType a static function. r=joe,r=bz
...
This removes supportImageWithMimeType from the idl and makes all the
callers call the static function directly. To do this we also need
to export imgLoader.h and imgRequest.h.
---
content/base/src/nsObjectLoadingContent.cpp | 9 ++-------
docshell/base/nsWebNavigationInfo.cpp | 8 +++++---
docshell/base/nsWebNavigationInfo.h | 5 -----
image/public/imgILoader.idl | 9 +--------
image/src/Makefile.in | 4 ++++
image/src/imgLoader.cpp | 2 +-
image/src/imgLoader.h | 1 +
layout/build/nsContentDLF.cpp | 5 ++---
8 files changed, 16 insertions(+), 27 deletions(-)
2012-10-03 16:17:40 -04:00
Jason Duell
2f13edfe53
Bug 786299 - Delete app-cache related to an app when uninstalled. r=honza,jduell
2012-10-02 17:39:09 -07:00
Ed Morley
25a933c7e2
Backout 16ae4d5d27d7 for mochitest-other failures in test_mousescroll.xul
2012-10-02 17:38:49 +01:00
Vladimir Vukicevic
1712c24093
b=731974, requestAnimationFrame generates too short/long frames; r=bz,smaug,roc
2012-10-02 10:54:46 -04:00
Ms2ger
fc5a75281c
Bug 793314 - Remove PtrBits; r=mounir,roc
2012-10-02 10:24:11 +02:00
Steve Workman
f6b5e9e727
Bug 734546: Add DASH Decoders and Readers r=cpearce r=ted
2012-09-29 16:29:04 -07:00
Ed Morley
da9299600b
Backout bec7e68cad9a & a6228bc28958 (bug 786299) for Windows compilation errors on a CLOSED TREE
2012-09-29 01:44:30 +01:00
Jason Duell
b75e7e52c9
Bug 786299 - Part 2: Delete app-cache related to an app when uninstalled. r=honza
2012-09-28 16:13:17 -07:00
Gene Lian
82e87be9c4
Bug 789973 - B2G system time: adjust system clock after receiving NITZ timestamp (part 1). r=jlebar
2012-09-28 14:02:28 +08:00
Ed Morley
ea1b946dd2
Backout 52be204da1cf (bug 776663), 965397b043c0 (bug 777508), 182c763efa68 (bug 776832), a2a509184b07 & cba5ba69091f (bug 789973) for failures in test_child_process_shutdown_message.html and friends / conflicting with the backout on a CLOSED TREE
2012-09-28 14:08:04 +01:00
Masatoshi Kimura
13e54c9451
Bug 764234 - Implement StringEncoding API. r=dougt,smontagu
2012-09-28 11:19:18 +01:00
Gene Lian
0037da9460
Bug 789973 - B2G system time: adjust system clock after receiving NITZ timestamp (part 1). r=jlebar
2012-09-28 14:02:28 +08:00
Mounir Lamouri
599443f29a
Bug 783408 - 3/4 - Delete app's cookies when uninstalled. r=jlebar,mconnor
2012-09-27 22:37:28 +01:00
Josh Matthews
10314074af
Bug 770778 - Make TCPSocket e10s-friendly. r=bent
2012-09-24 14:53:49 -04:00
Edwin Flores
10f459ae75
Bug 759506 - Build changes for B2G zero-copy OMX hardware decoding r=cjones
2012-09-27 16:33:42 +12:00
Alexandre Dumont
9bb8822425
Bug 596753: Flatten layout/svg/base/src into layout/svg. r=dholbert
...
--HG--
rename : layout/svg/base/src/Makefile.in => layout/svg/Makefile.in
rename : layout/svg/base/src/SVGFEContainerFrame.cpp => layout/svg/SVGFEContainerFrame.cpp
rename : layout/svg/base/src/SVGFEImageFrame.cpp => layout/svg/SVGFEImageFrame.cpp
rename : layout/svg/base/src/SVGFELeafFrame.cpp => layout/svg/SVGFELeafFrame.cpp
rename : layout/svg/base/src/SVGFEUnstyledLeafFrame.cpp => layout/svg/SVGFEUnstyledLeafFrame.cpp
rename : layout/svg/base/src/SVGViewFrame.cpp => layout/svg/SVGViewFrame.cpp
rename : layout/svg/base/src/nsISVGChildFrame.h => layout/svg/nsISVGChildFrame.h
rename : layout/svg/base/src/nsISVGGlyphFragmentNode.h => layout/svg/nsISVGGlyphFragmentNode.h
rename : layout/svg/base/src/nsISVGSVGFrame.h => layout/svg/nsISVGSVGFrame.h
rename : layout/svg/base/src/nsSVGAFrame.cpp => layout/svg/nsSVGAFrame.cpp
rename : layout/svg/base/src/nsSVGClipPathFrame.cpp => layout/svg/nsSVGClipPathFrame.cpp
rename : layout/svg/base/src/nsSVGClipPathFrame.h => layout/svg/nsSVGClipPathFrame.h
rename : layout/svg/base/src/nsSVGContainerFrame.cpp => layout/svg/nsSVGContainerFrame.cpp
rename : layout/svg/base/src/nsSVGContainerFrame.h => layout/svg/nsSVGContainerFrame.h
rename : layout/svg/base/src/nsSVGEffects.cpp => layout/svg/nsSVGEffects.cpp
rename : layout/svg/base/src/nsSVGEffects.h => layout/svg/nsSVGEffects.h
rename : layout/svg/base/src/nsSVGFilterFrame.cpp => layout/svg/nsSVGFilterFrame.cpp
rename : layout/svg/base/src/nsSVGFilterFrame.h => layout/svg/nsSVGFilterFrame.h
rename : layout/svg/base/src/nsSVGFilterInstance.cpp => layout/svg/nsSVGFilterInstance.cpp
rename : layout/svg/base/src/nsSVGFilterInstance.h => layout/svg/nsSVGFilterInstance.h
rename : layout/svg/base/src/nsSVGFilterPaintCallback.h => layout/svg/nsSVGFilterPaintCallback.h
rename : layout/svg/base/src/nsSVGForeignObjectFrame.cpp => layout/svg/nsSVGForeignObjectFrame.cpp
rename : layout/svg/base/src/nsSVGForeignObjectFrame.h => layout/svg/nsSVGForeignObjectFrame.h
rename : layout/svg/base/src/nsSVGGFrame.cpp => layout/svg/nsSVGGFrame.cpp
rename : layout/svg/base/src/nsSVGGFrame.h => layout/svg/nsSVGGFrame.h
rename : layout/svg/base/src/nsSVGGenericContainerFrame.cpp => layout/svg/nsSVGGenericContainerFrame.cpp
rename : layout/svg/base/src/nsSVGGenericContainerFrame.h => layout/svg/nsSVGGenericContainerFrame.h
rename : layout/svg/base/src/nsSVGGeometryFrame.cpp => layout/svg/nsSVGGeometryFrame.cpp
rename : layout/svg/base/src/nsSVGGeometryFrame.h => layout/svg/nsSVGGeometryFrame.h
rename : layout/svg/base/src/nsSVGGlyphFrame.cpp => layout/svg/nsSVGGlyphFrame.cpp
rename : layout/svg/base/src/nsSVGGlyphFrame.h => layout/svg/nsSVGGlyphFrame.h
rename : layout/svg/base/src/nsSVGGradientFrame.cpp => layout/svg/nsSVGGradientFrame.cpp
rename : layout/svg/base/src/nsSVGGradientFrame.h => layout/svg/nsSVGGradientFrame.h
rename : layout/svg/base/src/nsSVGImageFrame.cpp => layout/svg/nsSVGImageFrame.cpp
rename : layout/svg/base/src/nsSVGInnerSVGFrame.cpp => layout/svg/nsSVGInnerSVGFrame.cpp
rename : layout/svg/base/src/nsSVGInnerSVGFrame.h => layout/svg/nsSVGInnerSVGFrame.h
rename : layout/svg/base/src/nsSVGIntegrationUtils.cpp => layout/svg/nsSVGIntegrationUtils.cpp
rename : layout/svg/base/src/nsSVGIntegrationUtils.h => layout/svg/nsSVGIntegrationUtils.h
rename : layout/svg/base/src/nsSVGMarkerFrame.cpp => layout/svg/nsSVGMarkerFrame.cpp
rename : layout/svg/base/src/nsSVGMarkerFrame.h => layout/svg/nsSVGMarkerFrame.h
rename : layout/svg/base/src/nsSVGMaskFrame.cpp => layout/svg/nsSVGMaskFrame.cpp
rename : layout/svg/base/src/nsSVGMaskFrame.h => layout/svg/nsSVGMaskFrame.h
rename : layout/svg/base/src/nsSVGOuterSVGFrame.cpp => layout/svg/nsSVGOuterSVGFrame.cpp
rename : layout/svg/base/src/nsSVGOuterSVGFrame.h => layout/svg/nsSVGOuterSVGFrame.h
rename : layout/svg/base/src/nsSVGPaintServerFrame.cpp => layout/svg/nsSVGPaintServerFrame.cpp
rename : layout/svg/base/src/nsSVGPaintServerFrame.h => layout/svg/nsSVGPaintServerFrame.h
rename : layout/svg/base/src/nsSVGPathGeometryFrame.cpp => layout/svg/nsSVGPathGeometryFrame.cpp
rename : layout/svg/base/src/nsSVGPathGeometryFrame.h => layout/svg/nsSVGPathGeometryFrame.h
rename : layout/svg/base/src/nsSVGPatternFrame.cpp => layout/svg/nsSVGPatternFrame.cpp
rename : layout/svg/base/src/nsSVGPatternFrame.h => layout/svg/nsSVGPatternFrame.h
rename : layout/svg/base/src/nsSVGStopFrame.cpp => layout/svg/nsSVGStopFrame.cpp
rename : layout/svg/base/src/nsSVGSwitchFrame.cpp => layout/svg/nsSVGSwitchFrame.cpp
rename : layout/svg/base/src/nsSVGTSpanFrame.cpp => layout/svg/nsSVGTSpanFrame.cpp
rename : layout/svg/base/src/nsSVGTSpanFrame.h => layout/svg/nsSVGTSpanFrame.h
rename : layout/svg/base/src/nsSVGTextContainerFrame.cpp => layout/svg/nsSVGTextContainerFrame.cpp
rename : layout/svg/base/src/nsSVGTextContainerFrame.h => layout/svg/nsSVGTextContainerFrame.h
rename : layout/svg/base/src/nsSVGTextFrame.cpp => layout/svg/nsSVGTextFrame.cpp
rename : layout/svg/base/src/nsSVGTextFrame.h => layout/svg/nsSVGTextFrame.h
rename : layout/svg/base/src/nsSVGTextPathFrame.cpp => layout/svg/nsSVGTextPathFrame.cpp
rename : layout/svg/base/src/nsSVGTextPathFrame.h => layout/svg/nsSVGTextPathFrame.h
rename : layout/svg/base/src/nsSVGUseFrame.cpp => layout/svg/nsSVGUseFrame.cpp
rename : layout/svg/base/src/nsSVGUtils.cpp => layout/svg/nsSVGUtils.cpp
rename : layout/svg/base/src/nsSVGUtils.h => layout/svg/nsSVGUtils.h
rename : layout/svg/base/src/resources/content/svgBindings.xml => layout/svg/resources/content/svgBindings.xml
rename : layout/svg/base/src/svg.css => layout/svg/svg.css
2012-09-24 23:01:21 +02:00
Ray Cheung
712265bc79
Bug 779500 - WebFM, r=jlebar,glandium sr=jonas
2012-09-19 11:23:33 -04:00
Ehsan Akhgari
4e4f02f78c
Backout changeset 9f16bba541cc (bug 790499) becasuse of build bustage
2012-09-21 15:57:42 -04:00
Steven Lee
19635a398b
Bug 790499 - Time API: Call JS_ClearDateCaches() to update Date object's timezone when the system timezone is reset, r=jlebar
...
--HG--
extra : rebase_source : ddd264047c861c3244dfdf43e695705ec675f066
2012-09-21 14:56:01 -04:00
Ms2ger
abf742d34d
Merge PGO-green changeset from m-i to m-c.
2012-09-20 11:51:47 +02:00
Ms2ger
c5d1cae66d
Bug 744907 - Remove BlobBuilder; r=sicking
2012-09-20 09:55:36 +02:00
Brandon Sterne
fc86463ca4
Bug 62178 - implement mixed content blocker, r=smaug
2012-09-16 20:49:43 -07:00
Phil Ringnalda
922a18d04e
Back out 562ba2baa5b3 and 5065dd13b53d (bug 62178) for Android mochitest-1 failure
2012-09-16 15:24:58 -07:00
Brandon Sterne
d2f0ab516e
Bug 62178 - implement mixed content blocker, r=smaug
2012-09-16 13:13:25 -07:00
Ryan VanderMeulen
4d6acb9941
Merge the last PGO-green inbound changeset to m-c.
2012-09-13 21:53:35 -04:00
Ben Turner
9e6221f761
Bug 755943 - 'Electrolysize b2g-bluetooth'. r=qDot+cjones.
2012-09-13 09:37:14 -07:00
Steven Lee
5f194e2f32
Bug 714358: Time manager implementation. r=jlebar
2012-09-11 02:05:00 -04:00