Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
490,150 Commits 615 Branches 98 Tags 6 GiB
946bb1cf02
Commit Graph

54261 Commits

Author SHA1 Message Date
Kartikaya Gupta
114ff898bb Bug 1299488 - Remove TabParent::InjectTouchEvent as it is unused but error-prone. r=botond 
MozReview-Commit-ID: EVBRK70veT1
 2016-08-31 16:54:23 -04:00
Lee Salzman
642347dba7 Bug 725119 - fuzz for reftests with Skia content on Android. r=mchang 
MozReview-Commit-ID: 9p8ntO7YLQ4
 2016-08-31 15:53:33 -04:00
Jean-Yves Avenard
223ee82386 Bug 1297265: P11. Rework WMF Decoder use of InputExhausted. r=kamidphish 
MozReview-Commit-ID: GX1izQd55Di

--HG--
extra : rebase_source : efc6198d4fa7914b13f808216bd6394ca5b53d43
 2016-08-30 15:22:54 +10:00
Jean-Yves Avenard
02473df25a Bug 1297265: P10. Rework FFmpeg Decoder use of InputExhausted. r=kamidphish 
MozReview-Commit-ID: 8fndcHQELTo

--HG--
extra : rebase_source : f54aea05056e674a76431a8a95225e13e8b6b57f
 2016-08-30 15:22:36 +10:00
Jean-Yves Avenard
b31a3e29a2 Bug 1297265: P9. Rework Vorbis Decoder use of InputExhausted. r=kamidphish 
MozReview-Commit-ID: 58KKxY1YcpK

--HG--
extra : rebase_source : 7258069eb8ebf80b10453e9eba8d8e220647b9ec
 2016-08-30 15:22:14 +10:00
Jean-Yves Avenard
c3939b1976 Bug 1297265: P8. Rework LibVPX Decoder use of InputExhausted. r=kamidphish 
MozReview-Commit-ID: H7KnDpkcaeT

--HG--
extra : rebase_source : 7b63bc3e0571cff0047f141f61797b6510399bf5
 2016-08-30 15:21:49 +10:00
Jean-Yves Avenard
1c4550a35f Bug 1297265: P7. Rework Theora Decoder use of InputExhausted. r=kamidphish 
MozReview-Commit-ID: 1udj9o3r2YE

--HG--
extra : rebase_source : ba19c9221e19a372c906231443aa2e17bb67dd67
 2016-08-30 15:21:29 +10:00
Jean-Yves Avenard
5aa7d037b4 Bug 1297265: P6. Rework Opus Decoder use of InputExhausted. r=kamidphish 
MozReview-Commit-ID: 4Usxx2BrQJt

--HG--
extra : rebase_source : 5c74c41db2d11171d4a9c22e712fffb85168caf3
 2016-08-30 15:21:05 +10:00
Jean-Yves Avenard
3052030d0e Bug 1297265: P5. Rework Blank Decoder use of InputExhausted. r=kamidphish 
MozReview-Commit-ID: KEfWo1cdRkG

--HG--
extra : rebase_source : 46adb7b4d81370ad4217a48e6855afcbfe71c2d6
 2016-08-30 15:20:40 +10:00
Jean-Yves Avenard
97c82d5ef3 Bug 1297265: P4. Rework Apple AudioToolbox use of InputExhausted. r=kamidphish 
MozReview-Commit-ID: HznYxl9T7t5

--HG--
extra : rebase_source : aa1ebf557c56caf9572eab16df5ecaa4c1a440a6
 2016-08-30 15:19:55 +10:00
Jean-Yves Avenard
e88897a8a3 Bug 1297265: P3. Rework Apple VT use of InputExhausted. r=me 
The only time we need to use InputExhausted is for the initial video decoding or when a frame is dropped.

MozReview-Commit-ID: IrHqZXJwQe1

--HG--
extra : rebase_source : d9fec0f88d2c0a878723d75d79aa3ff63b5938cc
 2016-08-30 15:18:25 +10:00
Jean-Yves Avenard
3734f817c6 Bug 1297265: P2. Amend MediaDataDecoder documentation to emphasize the new expected behavior. r=kamidphish 
MozReview-Commit-ID: EHFnCnc58qh

--HG--
extra : rebase_source : 2a9e2c4a08103d10f77ceaee3f87300a1b7a56a2
 2016-08-30 15:17:47 +10:00
Jean-Yves Avenard
20189a5b95 Bug 1297265: P1. Remove decode ahead logic. r=kamidphish 
The MediaFormatReader will no longer attempt to decode several frames in advance and ahead of the MDSM actually requesting it. The speed advantages were dubious at best, and as most MediaDataDecoders abused the use of InputExhausted callbacks we had to place artificial throttle that would often cause side effects.
As such, it is now expected that the MediaDataDecoder will now always either return a decoded sample or call InputExhausted. Never both.

MediaDataDecoder will continue to work as-is, even if they call InpuxExhausted too many times as the MediaFormatReader will only feed a single sample at a time.

MozReview-Commit-ID: 9KUpNP9jozV

--HG--
extra : rebase_source : ebb919fd3f1ce1adf5d08ed3f4292839b84c8321
 2016-08-30 15:15:30 +10:00
Aryeh Gregor
76862dadad Bug 1299453 - Stop using createEvent("DragEvents"/"KeyEvents") internally; r=smaug 
They are non-standard aliases for "DragEvent" and "KeyboardEvent" that
are not supported by any other UA, and we would like to drop support.
So first let's stop using them ourselves, so we can use telemetry to see
if any sites are using them.

MozReview-Commit-ID: ICC33ORa2st
 2016-08-31 20:38:50 +03:00
Boris Zbarsky
d2b05776d7 Bug 1270369. HTMLFormElemement should have unenumerable named properties per spec. r=bkelly 2016-08-31 10:57:40 -04:00
Boris Zbarsky
d2b5054375 Bug 1270364. MimeTypeArray should have unenumerable named properties per spec. r=bkelly 2016-08-31 10:57:40 -04:00
Boris Zbarsky
5c3fbbe9c9 Bug 1270366. PluginArray and Plugin should have unenumerable named properties. r=bkelly 2016-08-31 10:57:40 -04:00
Andreas Pehrson
2156ef5c6e Bug 1294605 - Notify MediaStreamTrackSource when track is notified of ended on main thread. r=jib 
I haven't seen test failures from this but I imagine there could be.

MozReview-Commit-ID: 8iyMBzQCWeA

--HG--
extra : rebase_source : 19d64e1c2234db629d977bb789d7a213af9faeee
 2016-08-29 16:34:27 +02:00
Andreas Pehrson
c5f989fb7e Bug 1294605 - Media element captureStream() streams shouldn't keep devices alive. r=jib 
MozReview-Commit-ID: 3tSFbygTZs1

--HG--
extra : rebase_source : cd8c0f0c73fe15c084314016e72a43ecf1eba484
 2016-08-29 16:27:11 +02:00
Bryce Van Dyk
ae1691c635 Bug 1213731 - Remove unused Youtube URLs, use embedded URLs where possible. r=maja_zf 
Many of the youtube URLs were not being used in tests. Many were are/also dead.
Furthermore, non-embedded links are causing issues due to the next video auto
play feature defaulting to on in youtube.

This is a quick once over to remove unused links, prune some of the dead, and
rewrite those that can be embedded to embedded URLs. In future I would like to
see the embedded links and non embedded separated into their own files. However,
theses changes are a halfway house that will not break compatibility downstream.

MozReview-Commit-ID: 4aPMNjD3LC4

--HG--
rename : dom/media/test/external/external_media_tests/urls/youtube/long3-crashes-720.ini => dom/media/test/external/external_media_tests/urls/youtube/long2-crashes-720.ini
rename : dom/media/test/external/external_media_tests/urls/youtube/long4-crashes-900.ini => dom/media/test/external/external_media_tests/urls/youtube/long3-crashes-900.ini
rename : dom/media/test/external/external_media_tests/urls/youtube/short0-10.ini => dom/media/test/external/external_media_tests/urls/youtube/short1-10.ini
rename : dom/media/test/external/external_media_tests/urls/youtube/short3-crashes-15.ini => dom/media/test/external/external_media_tests/urls/youtube/short2-crashes-15.ini
extra : rebase_source : a5abcc8d7b1f1f1e3e2b6303f91b6183f4e4d9ee
 2016-08-30 18:36:16 +12:00
Bryce Van Dyk
ab7cc0932e Bug 1213731 - Rework Youtube puppeteer to work with both youtube and embedded youtube. r=maja_zf 
Rework the Youtube puppeteer to look up player and video element based on class
names, instead of ID. This means that the tests can work with embedded players.
This has the benefit that we can use youtube embedded links
(youtube.com/embedded/<videoId>), which do not suffer from auto play related
issues (auto play jumping to another video).

MozReview-Commit-ID: 9UFyL7di6gH

--HG--
extra : rebase_source : 69301bfa2b7ea9fd729742ae670ecb6e8209c4f9
 2016-08-30 16:25:01 +12:00
Botond Ballo
2af3f87bb6 Bug 1288686 - Avoid X11's |#define None 0L| intruding on other parts of the code. r=jrmuizel 
MozReview-Commit-ID: 9rD0KLTLg7l

--HG--
extra : rebase_source : a537ba1913b6959e74fc4fcaf58f51f759cc5882
extra : source : 9278e13a7d664e787f763a7c21a32833700899e1
 2016-08-29 16:51:43 -04:00
Andreas Pehrson
3e21f8275b Bug 1299451 - Fix mozCaptureStream() happening after setting src but before having metadata. r=jesup 
MozReview-Commit-ID: CKC3n3Nt5IE

--HG--
extra : rebase_source : 9c8348403cedb2ac7f68bce9fc5f36cfe2e08357
 2016-08-31 14:54:03 +02:00
Andreas Pehrson
a91bec92ad Bug 1299172 - HTMLMediaElement::StreamSizeListener spring cleaning. r=jesup 
MozReview-Commit-ID: 25lt1j8t1Xh

--HG--
extra : rebase_source : e972d008c5e80059dd10031df38cf400cc6c9650
 2016-08-31 14:32:13 +02:00
Andreas Pehrson
864bcdc3c4 Bug 1299172 - Fix media element StreamSizeListener calling DispatchToMainThreadAfterStreamStateUpdate off-MSG-thread. r=jesup 
MozReview-Commit-ID: Cc2tJbEog20

--HG--
extra : rebase_source : 83731e3fe29a7813a51f70eff8a0f43a21f92e1d
 2016-08-31 14:31:28 +02:00
Andreas Pehrson
b8ed2ee25c Bug 1299172 - Assert on MSG thread in DispatchToMainThreadAfterStreamStateUpdate. r=jesup 
MozReview-Commit-ID: 9ihJduZOSa

--HG--
extra : rebase_source : 1088fc98f97456c933f146565ba91ce0358e6a4c
 2016-08-31 14:07:53 +02:00
Andreas Pehrson
b971926554 Bug 1294605 - Notify MediaStreamTrackSource when ReadyState is overriden. r=jib 
MozReview-Commit-ID: CSRWgYt4hqe

--HG--
extra : rebase_source : 93ae693ef8d69d1634bf5eb082e4f105cb724331
extra : source : 8e71a7a649109d03cebe039ee787edb32631e31f
 2016-08-22 18:28:10 +02:00
Andreas Pehrson
48289fedba Bug 1294605 - Enable test code waiting for this bug. r=jib 
MozReview-Commit-ID: 3TV58pT1SF2

--HG--
extra : rebase_source : 00736accd5d03aabac7381cace7b48f7001e9ecd
extra : source : 631047fcb5af9e5d2bcf4761dc8fbd0d37529270
 2016-08-22 18:27:38 +02:00
Andreas Pehrson
7aad6cd70f Bug 1294605 - Add explicit test case. r=jib 
MozReview-Commit-ID: 9MJn7QQ9siZ

--HG--
extra : rebase_source : f80c443fa896773539ed51426c19d619ba213083
extra : source : 4cfa56c2c97b0d971894b0485e7893ac5363f746
 2016-08-30 14:24:33 +02:00
Andreas Pehrson
492efa47b9 Bug 1295352 - Release MediaEngineTabVideoSource main-thread-only members on main thread. r=jesup 
MozReview-Commit-ID: H3N70b9tGiI

--HG--
extra : rebase_source : f58d42e52497acfa1d59b41385cdbed9839c701c
 2016-08-31 16:37:51 +02:00
Andreas Pehrson
999231ed87 Bug 1295352 - Update mediaElementCapture tests to stop all tracks before finishing. r=jib 
MozReview-Commit-ID: GnfFt1vIbig

--HG--
extra : rebase_source : a80e89fce0c95adc93ab75d6d5754290b15045b0
 2016-08-29 16:37:16 +02:00
Andreas Pehrson
1023e40db6 Bug 1295352 - Use mState in MediaEngineTabVideoSource. r=jesup 
MozReview-Commit-ID: 1zZlMXAqpo7

--HG--
extra : rebase_source : 2bed8594b7b3a563d29a0708c7a066d2a75bf4ce
extra : source : 65f1bf3e9dec44ffd6c10a2b1a895ef936ba2d8b
 2016-08-25 12:25:06 +02:00
Andreas Pehrson
968380ec16 Bug 1295352 - Check state in MediaEngines' NotifyPull(). r=jesup 
GetEndOfAppendedData() returns null and calls a NS_ERROR() if the track we're
looking for doesn't exist - to indicate an error in the caller's code.

When we end a MediaEngine track we set the state to stopped, which we can use
to guard the calls to GetEndOfAppendedData() (and appending data in general).
The locking is already in place.

MozReview-Commit-ID: DuknmBF883H

--HG--
extra : rebase_source : d689ae6e7f58e3bd8aa2c399730d7a05cf3d0bbf
extra : source : df194bbc13b651b94b550e281c6d8cae49ce3324
 2016-08-23 10:45:09 +02:00
Jan-Ivar Bruaroey
06e1a6aa56 Bug 1295352 - Fix media mochitests to not end with active gUM. r=pehrsons 
MozReview-Commit-ID: 9p5uHN1mPHK

--HG--
extra : rebase_source : e55c5cea080d4323d1c037318a96f66d17530ba2
extra : intermediate-source : a7c030a814085fce4a2233de13a68d8b7840cbc5
extra : source : e8d6d5f8bcc93a488739635fe55ffdbd17dc206d
 2016-08-12 15:18:51 -04:00
Jan-Ivar Bruaroey
77b09fb9a0 Bug 1295352 - Changed default MediaStreamPlayback.playMedia() to stop tracks afterwards. r=pehrsons 
MozReview-Commit-ID: CjkRcALTY7V

--HG--
extra : rebase_source : 08f54d24ae1a1060fd36ccb8c9446950227ae8b2
extra : intermediate-source : 93860eea4310af47d266c88b3c5718c707d04674
extra : source : f0a1407718aa20927de2a74da20e6073537958e8
 2016-08-12 16:43:16 -04:00
Ryan VanderMeulen
435c0addca Merge autoland to m-c. a=merge 2016-08-31 09:52:43 -04:00
Iris Hsiao
0e573bbb04 Backed out changeset ee163e1d915a (bug 1264769) for fixing regression of bug 1298725 
CLOSED TREE
 2016-08-31 10:46:27 +08:00
Nicholas Nethercote
fb96bf1f91 Bug 1298722 - Use MOZ_MUST_USE in StyleAnimationValue. r=birtles. 
--HG--
extra : rebase_source : c5b8cca624b9ffa7b3263b1aa7ce4f64dd80f13b
 2016-08-30 16:10:59 +10:00
JW Wang
713c29c0d1 Bug 1299021. Part 2 - ensure resolving the end promise when mVideoSinkEndRequest is resolved. r=kikuo 
MozReview-Commit-ID: 2XTpqVGBrBN

--HG--
extra : rebase_source : 37246ada49fd5b8a4de57ece3c3941f182db5e2c
 2016-08-29 21:28:36 +08:00
JW Wang
2ecd9cc1dd Bug 1299021. Part 1 - extract the code about resolving the end promise. r=kikuo 
MozReview-Commit-ID: ECr058zKdUk

--HG--
extra : rebase_source : ae2b59cbf758ab9b703c9aed471ddb7bf3145f4f
 2016-08-29 20:56:00 +08:00
Makoto Kato
ec124dbfbd Bug 1299054 - Remove old Android support (API level < 15) from Gecko. r=snorp 
MozReview-Commit-ID: K32YSqGsLf9

--HG--
extra : rebase_source : be0d3b3fc1146234efc75229171ea61258c46492
 2016-08-30 14:11:55 +09:00
Wes Kocher
81db6ce036 Merge m-c to autoland, a=merge 2016-08-30 18:15:33 -07:00
Sebastian Hengst
2559410fb7 Backed out changeset 7d75e044ec95 (bug 1218576) 2016-08-30 19:58:29 +02:00
Sebastian Hengst
bb70cc48c8 Backed out changeset c716caa64cb4 (bug 1218576) 2016-08-30 19:58:28 +02:00
Emilio Cobos Álvarez
4a2a67b606 Bug 1299046: Take into account generated content in EventStateManager::PreHandleEvent. r=smaug 
This patch adds a MOZ_ASSERT. I'll try to pass it through try, and otherwise
turn it into a warning, I guess.

MozReview-Commit-ID: 9KZS6dh3wzw

--HG--
extra : rebase_source : 263cc55878fde3cea1fc0184cda4b3118e38d134
 2016-08-29 21:06:57 -07:00
Benjamin Smedberg
2691f98a20 Bug 1293062 - Plugin permissions are confused between Flash and the VLC plugin. Fix this by checking that the plugin name for the special Flash plugin is "Shockwave Flash", which is true of Adobe Flash but not replacement plugins such as VLC or even gnash. This causes other plugins to have their own pref tag so that users can enable/disable them separately. r=jimm 
MozReview-Commit-ID: 3sGKO4S3U8U

--HG--
extra : rebase_source : cae64af30bd20223793331228412107efddfa7e9
extra : source : 582b6337bb53f907d7984555794ffe8310843f7b
 2016-08-24 12:40:17 -04:00
Benjamin Smedberg
d7b19b0d0a Bug 1293062 test fixup: name the Flash nptest plugin "Shockwave Flash" so that it passes for Flash during tests. 
MozReview-Commit-ID: 7kou5izPgmU

--HG--
extra : rebase_source : 51177992136e72483e35c546a25576f5b10f9f36
 2016-08-26 15:49:08 -04:00
Ben Kelly
77f99cddcd Bug 1262702 Avoid racing with initial shutdown in test_service_worker_lifetime.html. r=kitcambridge 2016-08-30 10:04:27 -07:00
Boris Zbarsky
f97bc8ed0f Bug 1298977. Fix setting location.hash for documents with about:something URIs to actually work. r=bkelly 2016-08-30 12:55:40 -04:00
Boris Zbarsky
e8c8715cfb Bug 1297756 part 2. Allow specifying a default value for a union containing an enum. r=mystor 2016-08-30 12:55:17 -04:00
Boris Zbarsky
1e5fa72546 Bug 1297756 part 1. Improve the exception thrown when an invalid default value (right type but wrong value) is used for a union. r=mystor 2016-08-30 12:55:15 -04:00
Christoph Kerschbaumer
a80531eeb1 Bug 1298505 - CSP: Update StripURIForReporting to rely on NS_SecurityCompareURIs. r=dveditz 
--HG--
extra : rebase_source : b3cd4f3ebed2ee079d88c896aa08e2e99e5c20a5
 2016-08-27 08:30:43 +02:00
Milan Sreckovic
ff3ca93c38 Bug 1287316 - Release assert or deal with empty arrays. r=mstange 
--HG--
extra : rebase_source : 07b022071bf63b213f78d361d18464cbcbf6b562
 2016-08-30 18:38:30 -04:00
Tom Schuster
f0f1409270 Bug 1114580 - Remove DOM test known failure. r=Ms2ger 2016-08-31 00:13:10 +02:00
Tom Schuster
8ea3a932a3 Bug 1114580 - Return a fixed name for @@toString on plugins. r=billm 2016-08-31 00:13:10 +02:00
Andrew McCreight
eba50c94d8 Bug 1298456 - Make historyframes.html and test_bug590573.html use generators. r=smaug 
MozReview-Commit-ID: 1Fi2UnUC36g

--HG--
extra : rebase_source : 8f4fe3e5a577bfec73e088da471f63404293621c
 2016-08-24 14:13:45 -07:00
Andrew McCreight
cdcad29bd2 Bug 1296275 - Be better about exposing to active js in AudioBuffer::StealJSArrayDataIntoSharedChannels(). r=terrence 
MozReview-Commit-ID: GC8sncFJlPS

--HG--
extra : rebase_source : 13603a66a9281fc42b59cc71f0793745a04755d9
 2016-08-29 15:03:42 -07:00
Andi-Bogdan Postelnicu
6ad1df1763 Bug 1299110 - prevent null pointer dereference in AllocateLayerTreeId. r=baku 
MozReview-Commit-ID: 5oMTtNkXrp0

--HG--
extra : rebase_source : 042e8a548dcd367e7f714614edde42856e1aac72
 2016-08-30 14:32:55 +03:00
Ryan VanderMeulen
71d43e7c12 Merge inbound to m-c. a=merge 2016-08-30 09:52:55 -04:00
JW Wang
716c3e5830 Bug 1299019 - ensure mVideoFrameEndTime is mono-increasing. r=kikuo 
MozReview-Commit-ID: 3rwItcTAqUQ

--HG--
extra : rebase_source : dfcefdd15f85387a13312c271c4df7b424f4d239
 2016-08-29 20:46:26 +08:00
JW Wang
2e69d86d5c Bug 1298297 - Remove DECODER_STATE_ERROR from MDSM. r=kaku 
MozReview-Commit-ID: BWpPoXDDlux

--HG--
extra : rebase_source : 3061e420ad02c6ca7eb9ce389ec668bec59027ee
 2016-08-26 17:41:45 +12:00
JW Wang
ea84ad3a97 Bug 1298217. Part 11 - Move some code to the entry action of DECODER_STATE_BUFFERING. r=kaku 
MozReview-Commit-ID: BCtmXQi2zNg

--HG--
extra : rebase_source : ff7cf8e167d276e058317dac9eb7061ebdb55441
 2016-08-29 11:50:10 +08:00
JW Wang
689d8d387b Bug 1298217. Part 10 - Assert |mState == DECODER_STATE_DECODING| in StartBuffering() which is only called by MaybeStartBuffering() which also asserts that. r=kaku 
MozReview-Commit-ID: BhcNiiQZX3I

--HG--
extra : rebase_source : c06aa95641a1f82451ca2182588fe28f760d4cb8
 2016-08-26 06:34:06 +12:00
JW Wang
17a06a9459 Bug 1298217. Part 9 - Assert |mState == DECODER_STATE_DECODING| in MaybeStartBuffering() which is only called in the DECODER_STATE_DECODING case of RunStateMachine(). r=kaku 
MozReview-Commit-ID: KLz8CpxDz71

--HG--
extra : rebase_source : 5ceea28dce4772bbd591f6d52b868c42dec7ca70
 2016-08-26 06:31:57 +12:00
JW Wang
caab92744a Bug 1298217. Part 8 - Move some code to the entry action of DECODER_STATE_DECODING. r=kaku 
MozReview-Commit-ID: 1gzwIX566i

--HG--
extra : rebase_source : aad6069fb2e3957e15d5b03fd4db7b499912ace7
 2016-08-29 11:46:08 +08:00
JW Wang
81b7f740b1 Bug 1298217. Part 7 - Assert |mState != DECODER_STATE_DECODING| in StartDecoding(). r=kaku 
StartDecoding() is called from several places where mState is proven to be not DECODER_STATE_DECODING:
1. Called by PlayStateChanged() when mState is BUFFERING.
2. Called by OnMetadataRead() where mState is DECODING_METADATA.
3. Called by SeekCompleted() where mState is SEEKING.
4. Called by RunStateMachine() when the case is BUFFERING.
5. Called by OnCDMProxyReady() when mState is WAIT_FOR_CDM.

MozReview-Commit-ID: 53LWipLzdRo

--HG--
extra : rebase_source : ec157a8b4075d71ee757f72451a0af4878eda7c9
 2016-08-29 11:36:26 +08:00
JW Wang
462f1fb025 Bug 1298217. Part 6 - Move some code to the entry action of DECODER_STATE_COMPLETED. r=kaku 
MozReview-Commit-ID: 5hf3NV5uLvS

--HG--
extra : rebase_source : 648b0a5ebfcc549ba888a1904185a4ef2f43e083
 2016-08-26 06:25:15 +12:00
JW Wang
d74f20ebb4 Bug 1298217. Part 5 - Move the call to |SetState(DECODER_STATE_COMPLETED)| out of CheckIfDecodeComplete() to make it easier to move more code to entry actions. r=kaku 
MozReview-Commit-ID: 7nJTIGwPyCs

--HG--
extra : rebase_source : a3834124401ea97c43d383e6adf34db282a00205
 2016-08-26 06:18:53 +12:00
JW Wang
e3bb274c85 Bug 1298217. Part 4 - Remove the call to DispatchDecodeTasksIfNeeded() from CheckIfDecodeComplete() because we've decoded all samples. r=kaku 
MozReview-Commit-ID: 22qa8K8j5zb

--HG--
extra : rebase_source : 62601ec6e7d34fe8cdf3e2f031b531bb46190074
 2016-08-26 06:08:54 +12:00
JW Wang
e44da8a1e4 Bug 1298217. Part 3 - Remove the check for IsShutdown() from CheckIfDecodeComplete() because it is called only when mState is DECODING or BUFFERING. r=kaku 
MozReview-Commit-ID: 80eWIjZnLAO

--HG--
extra : rebase_source : cc41e66fba57f7b2d0d7e583136e7e9fd8d9790e
 2016-08-26 06:06:20 +12:00
JW Wang
fe3759a62a Bug 1298217. Part 2 - Move some code to the entry action of DECODER_STATE_DORMANT. r=kaku 
MozReview-Commit-ID: 9q35AhxS5IP

--HG--
extra : rebase_source : 3073e87bc126b8dda594d295a403b087689299bd
 2016-08-26 05:58:12 +12:00
JW Wang
3e7acbb34a Bug 1298217. Part 1 - Move the code about decoding metadata to the entry action of DECODER_STATE_DECODING_METADATA. r=kaku 
MozReview-Commit-ID: Dyb0HnMTLpQ

--HG--
extra : rebase_source : 06bbbd437b3e388fde3b3fc251a2c176472aabf9
 2016-08-26 10:52:52 +12:00
Phil Ringnalda
b063c8b962 Merge m-c to autoland 2016-08-29 21:33:00 -07:00
Phil Ringnalda
064025c802 Backed out changeset b64d6f5b63db (bug 918751) for OS X permaorange in XMLHttpRequest/send-non-same-origin.sub.htm 2016-08-29 21:27:32 -07:00
Wes Kocher
a4c2350d88 Merge fx-team to central, a=merge 2016-08-29 17:53:29 -07:00
Wes Kocher
ecea29f6a3 Backed out changeset 0f53bc1a9aea (bug 1290619) a=merge 2016-08-29 17:40:59 -07:00
Wes Kocher
ed461fdf11 Merge inbound to m-c a=merge 2016-08-29 17:40:50 -07:00
Ryan VanderMeulen
f55f7d9df3 Backed out 3 changesets (bug 1286041) for crashtest failures. 
Backed out changeset 5e08455b6011 (bug 1286041)
Backed out changeset 25dd85b13da9 (bug 1286041)
Backed out changeset 48bb5e3170a0 (bug 1286041)

--HG--
extra : rebase_source : 303a619a5be40f81fcd1a418f0b5253c1e34c2d0
 2016-08-29 17:05:33 -04:00
Ryan VanderMeulen
e7d85d7c46 Merge m-c to autoland. a=merge 2016-08-29 12:52:13 -04:00
Ryan VanderMeulen
416afe2f23 Merge inbound to m-c. a=merge 2016-08-29 12:48:10 -04:00
Takashi Kawanaka
491499da43 Bug 1291061 - Pass const StyleAnimationValue& to CreateStyleContextForAnimationValue r=birtles 
MozReview-Commit-ID: 6PJzBBWSgwQ
 2016-08-27 15:27:38 +09:00
Yusuke Endho
0f4c1508cb Bug 1297000 - Modify comparison of zero TimeDuration to use TimeDuration object rather than converting to milliseconds; r=birtles 
MozReview-Commit-ID: DIccqtDb91u
 2016-08-27 16:53:33 +09:00
Alastor Wu
a2979b25f8 Bug 1262053 - part10 : modify tests. r=baku 
MozReview-Commit-ID: 98JWlLo7oRG

--HG--
extra : rebase_source : 207b0c68a3218ad260f8b7c97748df7587cb0616
 2016-08-29 18:56:43 +08:00
Alastor Wu
56e48dbbf5 Bug 1262053 - part8 : remove function NotifyOwnerDocumentActivityChangedInternal. r=cpearce 
MozReview-Commit-ID: DnWgQHGJLU5

--HG--
extra : rebase_source : a6c4ab94fad22b2bef1bdde07bc17246943128f7
 2016-08-29 18:56:38 +08:00
Alastor Wu
85c50bb3dd Bug 1262053 - part7 : give audio focus for the non-visited page. r=baku 
MozReview-Commit-ID: K1cu8BhEtyV

--HG--
extra : rebase_source : 730746bbee7eed1b3f7568c6e2ace7449933dbb8
 2016-08-29 18:56:36 +08:00
Alastor Wu
97b81589f8 Bug 1262053 - part6 : don't need to capture media element without audio. r=baku,cpearce 
MozReview-Commit-ID: GO6nXbzYwIy

--HG--
extra : rebase_source : 03aba373fde9133bf373292b2cdded5f04f22781
 2016-08-29 18:56:32 +08:00
Alastor Wu
47079de3ad Bug 1262053 - part5 : register audio agent immediately when media element starts playing. r=baku 
In ancient degisn, we would only register audio channel after the media element has audio track and enoguh data to playback,
that is because the "audio-playback" event would be dispatched with the registration, and then shows the tab audio indicator.

However, now the event dispatching doesn't follow with the registration, it would be triggered when the media element has
really audible data which would be notified from media decoder.

Therefore, the media element without audio track or without enough data can also register audio channel agent, it won't affect
the display of tab audio indicator. The reason we need to do that is for blocking autoplay media in the non-visited tab.

The autoplay can be adding "autoplay" keyword or playing by the script, and we don't want to dispatch dom event for blocked
media. Therefore, we should register audio channel agent to know whether it needs to be blocked immediately even the media
element doesn't have any enough data which can let us to distinguish it have any audio track or not (this information can
be known from metadata).

First, we must check whether the media is blocked which is notified by audio channel agent, and then we can decide whether
need to dispatch the event. If we don't register audio channel agent, that we can't get blocking information.

MozReview-Commit-ID: HLLkOuecql1

--HG--
extra : rebase_source : 99c34f0185276ecd5b70ae09959b47c584d1564e
 2016-08-29 16:34:31 +08:00
Alastor Wu
9021286e9a Bug 1262053 - part4 : don't dispatch dom event for blocked media. r=cpearce 
If the media was blocked, we would postpone the dom event and dispatch them after media is resumed.

MozReview-Commit-ID: LcdJtH16qQn

--HG--
extra : rebase_source : 209d18925a88a9e0dac82f2c0695ec1b60f54f63
 2016-08-29 16:34:28 +08:00
Alastor Wu
c060486878 Bug 1262053 - part3 : modify media element for blocking autoplay media. r=cpearce 
MozReview-Commit-ID: 8e13lkYTN46

--HG--
extra : rebase_source : 134d698c6136b8dcf0ef67c6b40df787c42cb886
 2016-08-29 16:34:26 +08:00
Chris Pearce
1231058432 Bug 1262053 - part2 : remove old media.block-play-until-visible behaviour. r=cpearce 
MozReview-Commit-ID: GujLSVfu2rp

--HG--
extra : rebase_source : 6d229b3817736039e46713c9e029dec8fd8d5913
 2016-08-29 10:42:10 +08:00
Dan Glastonbury
b194d26e61 Bug 1262053 - part1 : unblock window's media when the page was first visited. r=baku 
MozReview-Commit-ID: 5g5cYdgC8sg

--HG--
extra : rebase_source : 5af18ff846f464b1d3d195d7dc2634e03601cfcc
 2016-08-29 10:41:02 +08:00
Ryan VanderMeulen
4460ee8698 Backed out changeset 5f43357fe5b4 (bug 1284909) for bustage on a CLOSED TREE. 2016-08-29 11:25:00 -04:00
Wes Kocher
cbdf3625fa Merge m-c to inbound, a=merge 2016-08-26 16:32:56 -07:00
J. Ryan Stinnett
fff17715fe Bug 1297569 - Disable XUL popup contextmenu handler for all remote targets. r=felipe 
This expands the existing escape hatch added by bug 516753 (which disabled this
same handler for content within a remote xul:browser).  After this change, it is
is disabled for any remote target (`EventStateManager::IsRemoteTarget`), which
in practice means remote xul:browser or remote iframe mozbrowser.

MozReview-Commit-ID: Ix7fdtDH54R
 2016-08-26 18:32:09 -05:00
Wes Kocher
f09e8fef1a Merge inbound to central, a=merge 2016-08-26 16:20:50 -07:00
Boris Zbarsky
17194b94cf Bug 1295322 followup: disable the test on Android, where we have no feed: handler and hence get a CLOSED TREE. 2016-08-26 17:15:53 -04:00
Boris Zbarsky
0e5b46b6d6 Bug 1295322 test. r=bholley 2016-08-26 15:38:16 -04:00
Boris Zbarsky
4821850eb8 Bug 1295322 part 2. Stop propagating through xpconnect exceptions to consumers that won't be able to work with them. r=bholley 2016-08-26 15:38:16 -04:00
Boris Zbarsky
6a73ce5a82 Bug 1295322 part 1. Make ThrowExceptionObject return void, instead of bool. r=bholley 2016-08-26 15:38:16 -04:00
Milan Sreckovic
5459132cb1 Bug 1296731: Add parameter to GetAlignedStride and check for overflow. r=bas 
MozReview-Commit-ID: 5Ptm0bxwKdG

--HG--
extra : rebase_source : 535f2fa2447a1401b76acc0b82ce210b3c4d6dfc
 2016-08-25 13:57:39 -04:00
Phil Ringnalda
c7eed1ae9a Bug 1298723 followup, make it actually compile, on a CLOSED TREE 2016-08-29 21:48:30 -07:00
Phil Ringnalda
5e5ec2b54f Merge m-c to m-i 2016-08-29 21:32:16 -07:00
Nicholas Nethercote
49316e1702 Bug 1298723 - Remove an unnecessary null check in ShouldClearPurple. r=mccr8. 
--HG--
extra : rebase_source : 1b8eab0db2d0effe4dbc901a1793ead15eb8db5d
 2016-08-30 14:23:08 +10:00
Kershaw Chang
bd60aefa57 Bug 1298360 - Separate session id and window id mapping into two parts. r=smaug 
--HG--
extra : rebase_source : c365514be64095e2936d4ccb8a6560b96ad3d70e
 2016-08-29 19:40:00 -04:00
JW Wang
67073c9df0 Bug 1297301. Part 2 - remove dom/media/raw. r=cpearce 
MozReview-Commit-ID: E1XcTwRfsx3

--HG--
extra : rebase_source : b4c7a4709481ed07e88d91b82bc44cb3c315d327
 2016-08-24 22:49:16 +12:00
JW Wang
663ca6b4fa Bug 1297553 - Dump more debugging messages for MDSM and MediaSink. r=kaku 
MozReview-Commit-ID: ILcF1hT2hVN

--HG--
extra : rebase_source : 1f6564eb5161608ee6031b1c362a6b689762dcfe
 2016-08-24 11:45:58 +12:00
JW Wang
6862b9379e Bug 1297301. Part 1 - Remove #ifdef MOZ_RAW. r=kentuckyfriedtakahe 
MozReview-Commit-ID: LF4if8bZZGY

--HG--
rename : dom/media/raw/RawStructs.h => netwerk/protocol/device/RawStructs.h
extra : rebase_source : 96191a564754311200d6df36b1643990efa87e51
 2016-08-24 11:02:37 +12:00
ctai
310fb4ce18 Bug 894922 - Enable test case on windows. r=jwwang. 
MozReview-Commit-ID: CaKry95yiPY

--HG--
extra : rebase_source : 8b114be0c54f7d21d7d84c5600cdbfbcfa0fcf54
 2016-08-29 14:36:14 +08:00
Jan-Ivar Bruaroey
de3b766278 Bug 1284909 - Allow raw deviceId constraints in gUM when caller is chrome. r=jesup 
MozReview-Commit-ID: IB0BhGKbdam

--HG--
extra : rebase_source : 9ed1f4218e66bd3c96d044cacce167cbde79e775
 2016-08-19 16:39:54 -04:00
Jean-Yves Avenard
2014b787b8 Bug 1298617: [MSE] P3. Optimize sample search by breaking loop early. r=gerald 
MozReview-Commit-ID: 48YcQiy0p8S

--HG--
extra : rebase_source : 00e6c3468618bc6811faa80b5da590ab9e31d582
 2016-08-28 02:43:36 +12:00
Jean-Yves Avenard
da968e2d25 Bug 1298617: [MSE] P2. Attempt to search the exactly matching sample first. r=gerald 
MozReview-Commit-ID: AW1T51n6WMl

--HG--
extra : rebase_source : 241a200fdb4f450e8188000aa70ea058aae817b5
 2016-08-28 02:38:59 +12:00
Jean-Yves Avenard
d97b525caa Bug 1298617: [MSE] P1. Don't attempt to estimate next sample time if exact value known. r=gerald 
MozReview-Commit-ID: 8DE9WHFsePt

--HG--
extra : rebase_source : dd9edb407d6f2cc8ba76367fca0e10fb91f2eea7
 2016-08-28 02:34:44 +12:00
Jean-Yves Avenard
d9412b2ac0 Bug 1298594: P5. Fix mochitest. r=gerald 
The assumption was that the waiting event would be fired once the last frame prior the gap had been played. This is however incorrect, as per spec, the waiting event is to be fired once readyState is <= HAVE_CURRENT_DATA. So the waiting event is actually fired anytime between the start of the last frame and its end.

MozReview-Commit-ID: AA4Qhn7okhB

--HG--
extra : rebase_source : fc1f336b2e07cc2549071563804de8fae9c9ab67
 2016-08-29 16:07:38 +10:00
Jean-Yves Avenard
b3537bb63d Bug 1298594: P4. Pop the frame when current time is past the end of the current frame. r=jwwang 
Most frames start when the previous one stop.

MozReview-Commit-ID: H92Bmiki49Q

--HG--
extra : rebase_source : 071416d9151d5188550d73f0eb5a4c70a5fbd48b
 2016-08-29 15:46:56 +10:00
Jean-Yves Avenard
9e433b8a83 Bug 1298594: P3. Ensure currentTime is updated prior changing readyState. r=jwwang 
Otherwise we get intermittent in mochitests checking the value of currenTime when events are fired

MozReview-Commit-ID: AVktWrXochp

--HG--
extra : rebase_source : 76c952e62e9b449834d5924454c25ddad305ada6
 2016-08-28 21:20:52 +10:00
Jean-Yves Avenard
816b36a832 Bug 1298594: P2. Fire waiting event when readyState move back to HAVE_CURRENT_DATA. r=jwwang 
MozReview-Commit-ID: BpwYY6njXGC

--HG--
extra : rebase_source : 6dfe1998341ccf9fea69d8974f08aaa54385628d
 2016-08-27 22:23:52 +10:00
Jean-Yves Avenard
a9dab88295 Bug 1298594: [MSE] P1. Add mochitest to verify correct behavior. r=gerald 
1- We shouldn't reach ended if we have a gap in the buffered range prior the end of the file (see bug 1297036)
2- Waiting should be fired when readyState goes below HAVE_FUTURE_DATA

MozReview-Commit-ID: 18bEnkNpYvO

--HG--
extra : rebase_source : c42c7fd19fec9ede5bb64ea697a0086116882403
 2016-08-27 00:08:38 +12:00
Jean-Yves Avenard
3b8c226443 Bug 1297036: [MSE] P6. Fix invalid mochitest. r=gerald 
The test accidentally worked because any demuxing failures in ended mode would be treated as EOS. There's no audio between [0-3), so playback couldn't start

MozReview-Commit-ID: 4B90CrVUTy4

--HG--
extra : rebase_source : 9079aa8a6983877745baac71c7868ca360b85095
 2016-08-28 12:26:40 +10:00
Jean-Yves Avenard
46842a940a Bug 1297036: [MSE] P5. Make fuzz research consistent. r=gerald 
The aim is to only allow skipping gaps of fuzz=500ms.

MozReview-Commit-ID: 8uHxni2nPHI

--HG--
extra : rebase_source : ccef593170fb3a0c3ff61dc97ad1a0508be06934
 2016-08-27 23:51:40 +10:00
Jean-Yves Avenard
8d676d83a6 Bug 1297036: [MSE] P4. Only report end of stream when reaching the end. r=gerald 
MozReview-Commit-ID: 5EWhBVnscXY

--HG--
extra : rebase_source : 914aa1b8abb8d4026993281dbd68b1ba2ef04642
 2016-08-28 01:00:39 +12:00
Jean-Yves Avenard
90f7e263a7 Bug 1297036: P3. Revert "Bug 1293646: [MSE] P2. Only reject a seek request with EOS if it's passed the explicit duration." r=gerald 
This reverts commit 5a949eb358e27

Another more complete solution will follow.

MozReview-Commit-ID: K3lTdrBxW7W

--HG--
extra : rebase_source : d0f9443193b0816ae85972a4a368599b872fd437
 2016-08-26 19:30:50 +12:00
Jean-Yves Avenard
03f6dc4d61 Bug 1297036: [MSE] P2. Make seek always succeed when attempting to seek past the end time. r=gerald 
MozReview-Commit-ID: H2YJu7vY0aP

--HG--
extra : rebase_source : 73b1e324a6d9f8612ef03dcbf7dc5e5a91c7e2b2
 2016-08-26 19:23:29 +12:00
Jean-Yves Avenard
e4f3e62f41 Bug 1297036: [MSE] P1. Add mochitest to verify behavior. r=gerald 
Seeking in the buffered range should always succeed, even if we have no data in a given track

MozReview-Commit-ID: FGjsDCNIdWC

--HG--
extra : rebase_source : c91348e44055f82deee0e97da4abef0cf799b225
 2016-08-26 23:10:00 +12:00
Jean-Yves Avenard
fb042f363f Bug 1298606: P3. Fix coding style. r=gerald 
MozReview-Commit-ID: L5MHnYOkyDV

--HG--
extra : rebase_source : 5da52435a47cc1dae14459ad44e910329c702ce4
 2016-08-29 16:59:17 +10:00
Jean-Yves Avenard
85862da5ee Bug 1298606: [MSE] P2. Properly determine next frame status in ended state. r=gerald 
MozReview-Commit-ID: 2m05GzauHes

--HG--
extra : rebase_source : d5541dd96dc0480c41e7d68cfb96a95243b9a454
 2016-08-27 22:27:22 +12:00
Jean-Yves Avenard
e45036c616 Bug 1298606: P1. Add Intervals::ContainsStrict method. r=gerald 
MozReview-Commit-ID: 7XA8xVUWSi7

--HG--
extra : rebase_source : e8123ed9a11063a5e0e83f4b31bb9cafec7f02b4
 2016-08-27 20:24:31 +10:00
Jean-Yves Avenard
954647ed96 Bug 1297218: [MSE] Remove unnecessary call to Find(). r=gerald 
MozReview-Commit-ID: Af7mzXbLiNy

--HG--
extra : rebase_source : b3107a0be24a839be06ab5d4d22045a6fb0c94c3
 2016-08-26 16:51:18 +12:00
Jean-Yves Avenard
5b04109e85 Bug 1297037: [MSE] Update Duration Change algorithm as per latest spec. r=gerald 
The MSE spec was recently updated to use the highest end time across tracks rather than across the buffered ranges.

See https://github.com/w3c/media-source/issues/124 and the fix described in https://github.com/w3c/media-source/pull/154

MozReview-Commit-ID: 4CqI8d2e9gu

--HG--
extra : rebase_source : b25f0e2a76c517c0dca0a9def00edd6eff38d8ad
 2016-08-26 16:39:36 +12:00
Byron Campen [:bwc]
d4187beab5 Bug 1275461 - Part 2: See if slowing down the color changes helps. r=drno 
MozReview-Commit-ID: HuYKmnXMl4T

--HG--
extra : rebase_source : 98a87572ac9cc07aa51102a9faf4058a9521e199
 2016-08-22 12:43:03 -05:00
Ryan VanderMeulen
628ab3deff Merge m-c to inbound. a=merge 2016-08-26 09:39:29 -04:00
Ryan VanderMeulen
e1fdfb3b73 Merge inbound to m-c. a=merge 2016-08-26 09:37:03 -04:00
Nicolas Silva
b448411938 Bug 1294351 - Move restoring the canvas clip stack to its own method and early return form EnsureTarget. r=Bas 2016-08-26 14:31:58 +02:00
Yoshi Huang
69ed1a79e4 Bug 1244340 - Part 2: add setOriginAttributes in nsIXMLHttpRequest. r=sicking 
Add a ChromeOnly method called 'setOriginAttributes' on the XMLHttpRequest,
so that we can override the origin attributes for those XHRs running by XUL
(which will use System Principal).
 2016-08-26 18:59:00 +08:00
Iris Hsiao
0028508811 Backed out changeset 1a7948aa1a31 (bug 1295352) 2016-08-26 18:26:42 +08:00
Iris Hsiao
882996bb41 Backed out changeset 93860eea4310 (bug 1295352) 2016-08-26 18:26:39 +08:00
Iris Hsiao
eea175e0b3 Backed out changeset a7c030a81408 (bug 1295352) 2016-08-26 18:26:35 +08:00
Iris Hsiao
66918d6929 Backed out changeset df194bbc13b6 (bug 1295352) 2016-08-26 18:26:32 +08:00
Iris Hsiao
e7a1db45b7 Backed out changeset 65f1bf3e9dec (bug 1295352) for Mochitest Media failure 2016-08-26 18:26:27 +08:00
Iris Hsiao
f6028aeb00 Backed out changeset 4cfa56c2c97b (bug 1294605) 2016-08-26 18:26:20 +08:00
Iris Hsiao
26a17f7f0d Backed out changeset 631047fcb5af (bug 1294605) 2016-08-26 18:26:16 +08:00
Iris Hsiao
a0dc21c25c Backed out changeset 8e71a7a64910 (bug 1294605) for Mochitest Media failures 2016-08-26 18:26:11 +08:00
Jon Coppeard
2317b2fef5 Bug 1295978 - Eagerly instantiate module dependencies r=bkelly 2016-08-26 11:09:52 +01:00
Shih-Chiang Chien
a2a2c152ab Bug 1228526 - Part 1, support device filtering by requested presentation URL. r=smaug 
MozReview-Commit-ID: JrqeavLGub1

--HG--
extra : rebase_source : fc2eca80d59dc36e97a7af8ed3de6597faf38703
 2016-08-26 10:59:27 +08:00
Chris H-C
36f6594d00 bug 1218576 - Update test browser_use_counters.js to use aggregated child telemetry r=gfritzsche 
waitOnCondition is used to wait for the telemetry batch to be processed
(roughly every 2s). It resolves and rejects to the same value as there are a
couple of xfail tests that need the wrong answer.

MozReview-Commit-ID: I1JqEXQSL7d
 2016-08-16 12:40:00 +07:00
Chris H-C
89a2726675 bug 1218576 - Accumulate child histograms in the parent process r=froydnj 
Batch the accumulations to only transmit every so often, so we don't incur
too much in the way of IPC overhead penalties.

What this doesn't do:
* remove or restructure child telemetry code to adapt to the new way
* send the telemetry anywhere
* allow for the child process to clear child histograms
* support anything but histograms (but this is expected and okay)

MozReview-Commit-ID: JnUkcmN3Ya7
 2016-08-23 08:35:00 +07:00
Yura Zenevich
ddff7f9c94 Bug 527003 - make a11y service store info about its consumers. Only shut down a11y when there are no more consumers remaining. r=surkov, tbsaunde 
MozReview-Commit-ID: KF5d6xaO83E
 2016-08-30 12:04:20 -04:00
André Bargull
96b7707bfe Bug 1121938 - Implement TypedArray.prototype.toString and .toLocaleString. r=waldo 2016-08-11 09:31:22 -07:00
Nathan Froyd
0c0f1a9ecf Bug 1298068 - part 2 - use nsTArray<>&& arguments when constructing nsJSScriptTimeoutHandler objects; r=baku 
This way of writing things is more clear than what the current code does.
 2016-08-30 18:54:12 -04:00
Nathan Froyd
620d7242e3 Bug 1298068 - part 1 - use nsTArray instead of FallibleTArray in nsJSScriptTimeoutHandler; r=baku 
One small contribution to getting rid of FallibleTArray entirely.
 2016-08-30 18:54:13 -04:00
Michael Layzell
1b457b8f4b Bug 1292293 - Part 2: Remove custom default ByteString handling logic from ResponseInit, r=bz 
--HG--
extra : rebase_source : 863a852d7974b4179cf682a60894e0eb6805a574
 2016-08-05 17:47:43 -04:00