Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
431,351 Commits 615 Branches 98 Tags 6 GiB
79fe86d82b
Commit Graph

741 Commits

Author SHA1 Message Date
Ryan VanderMeulen
9c1044ef66 Backed out changeset c92c76073e9c (bug 1160877) for causing B2G phone startup crashes. 
--HG--
extra : rebase_source : 35bfd977a1f0f164e56df642dc30ae47d1611a3a
 2015-05-07 09:24:35 -04:00
Henry Chang
c4353072b1 Bug 1138288 - Refactor nsWindow/nsScreen for multiple screen/window case. r=mwu 2015-04-30 14:38:26 +08:00
JerryShih
753af4d551 Bug 1160877 - fix gonkDisplay stop anim condition. r=mwu 
--HG--
extra : rebase_source : efc4bec64e2db7a2e32d6e59ae68bbde113cfa1b
 2015-05-05 10:32:00 +02:00
JerryShih
45a96d6940 Bug 1160102 - use VsyncDisplay interface to turn on/off vsync. r=kats 
--HG--
extra : rebase_source : ada01762d1c57fae42c5d53e57024ab994794480
 2015-05-04 03:33:00 +02:00
Ryan VanderMeulen
a91513ec8c Merge m-c to b2g-inbound. a=merge 2015-05-01 12:59:30 -04:00
chiajung hung
8c1db328cb Bug 1156140 - Choose different code path for boot animation based on device capability. r=mwu 2015-04-26 22:39:00 -04:00
Sotaro Ikeda
fb70b24e9f Bug 1156981 - Split CompositorParent's scheduling of composition to CompositorScheduler r=mchang 2015-04-30 11:35:13 -07:00
Henry Chang
223dec8c91 Bug 1154648 - Rename static gonk nsWindow::DispatchInputEvent. r=mwu 2015-04-15 17:45:18 +08:00
Sotaro Ikeda
ed293afca5 Bug 1157874 - Remove screen related global variables from nsWindow.cpp r=mwu 2015-04-29 20:17:57 -07:00
Sotaro Ikeda
5879b59690 Bug 1152370 part 3 - Use DisplaySurface r=mwu 2015-04-23 06:49:40 -07:00
Sotaro Ikeda
a08694b934 Bug 1152370 part 2 - Add DisplaySurface r=mwu 2015-04-23 06:49:22 -07:00
Sotaro Ikeda
4a4361041b Bug 1152370 part 1 - Add android aosp VirtualDisplaySurface r=mwu 2015-04-23 06:49:12 -07:00
Andrea Marchesini
ade2831035 Bug 1156632 - Remove unused forward class declarations - patch 6 - the rest of the tree, r=ehsan 2015-04-22 08:29:24 +02:00
Daniel Holbert
e1824cb551 Bug 1156398: Pass ProcessOrientation.cpp's unused-by-default bools to mozilla::unused. r=mwu 2015-04-21 10:24:34 -07:00
Nicolas Silva
cfff5e52c5 Bug 1155621 - Make nsIntRect and nsIntPoint typedefs of mozilla::gfx::IntRect and mozilla::gfx::IntPoint. r=Bas 2015-04-21 17:04:57 +02:00
Sotaro Ikeda
053aaa45c3 Bug 1152135 - Split EGLSurface buffer swap and HWC buffer swap r=mwu,nical,jgilbert 2015-04-17 09:28:41 -07:00
Carsten "Tomcat" Book
eba45dcee4 Backed out changeset abe6234be8a3 (bug 1152135) for Android 4 opt/debug perma failure 2015-04-17 12:04:55 +02:00
Sotaro Ikeda
7078be3faa Bug 1152135 - Split EGLSurface buffer swap and HWC buffer swap r=mwu,nical,jgilbert 2015-04-16 18:15:26 -07:00
Neil Deakin
4df94c6562 Bug 1071562, redirect child process methods to the clipboard proxy, r=fabrice 2015-04-16 15:38:12 -04:00
Sotaro Ikeda
1d09feb925 Bug 1154313 - Move sUsingHwc to gfxPrefs r=mwu,nical 2015-04-15 06:39:44 -07:00
Ying-Ruei Liang (KK)
bc847b0369 Bug 1143522 - Convert cliprect coordinate in gonk code. r=botond 
--HG--
extra : rebase_source : c9e042c65d9d5d2bb8fbc72c8b12f87de2c40192
 2015-04-11 22:06:00 -04:00
Kartikaya Gupta
5cf2d407fd Bug 1146349 - Make the native event synthesization functions in DOMWindowUtils async. r=smaug 2015-04-14 11:36:36 -04:00
Mason Chang
0608d80c6e Bug 1153395 - Disable Hardware Vsync on Non Kit-Kat devices. r=mwu 2015-04-14 10:31:58 -04:00
Sotaro Ikeda
a3181c2cc5 Backed out changeset 29d01ad10d0b (bug 1152135) 2015-04-13 12:28:06 -07:00
Sotaro Ikeda
1a785adc42 Bug 1152135 - Split EGLSurface buffer swap and HWC buffer swap r=mwu,nical,jgilbert 2015-04-12 11:23:46 -07:00
Michael Vines
9782ff8e2a Bug 1152361 - Ensure outbufAcquireFenceFd is initialized during boot animation. r=mwu 2015-04-08 22:17:28 -07:00
Sotaro Ikeda
034f019f32 Bug 1150518 - Remove glClear() on blit composition r=Sushil 2015-04-02 20:26:47 -07:00
Jonathan Watt
ffd584f511 Bug 1147491, part 2 - Disable use of BaseTimeDuration::operator/ with floating point values. r=ehsan 2015-04-02 14:03:40 +01:00
Mason Chang
a3bcbbc0c6 Bug 1149646 - Delete non-uniform vsync interval warning. r=kats 2015-03-31 14:38:51 -07:00
Kartikaya Gupta
fe6a9b9809 Bug 1149412 - Remove bad assertion. r=mchang 2015-03-31 11:12:01 -04:00
Kartikaya Gupta
be79ca3ef8 Bug 1146987 - Deal with cases where we get a batch of interleaved move and non-move events on the libui thread before anything is processed, with resampling disabled. r=mchang 2015-03-30 14:09:26 -04:00
Michael Vines
bafb32c9f1 Bug 1144515 - ConsumerListener interface changes. r=mwu,sotaro.ikeda.g 
From ae4139a7b5dfb0b0326c84070e52fa58e43a54fe Mon Sep 17 00:00:00 2001
Change-Id: I3a3e4d6f58a42576197356ba4b7301c670298c74
---
 widget/gonk/libdisplay/FramebufferSurface.cpp            |  4 ++++
 widget/gonk/libdisplay/FramebufferSurface.h              |  4 ++++
 .../nativewindow/GonkBufferQueueLL/GonkBufferQueueLL.cpp | 16 ++++++++++++++++
 .../nativewindow/GonkBufferQueueLL/GonkBufferQueueLL.h   |  5 +++++
 .../GonkBufferQueueLL/GonkBufferQueueProducer.cpp        |  9 ++++++++-
 widget/gonk/nativewindow/GonkConsumerBaseLL.cpp          |  4 ++++
 widget/gonk/nativewindow/GonkConsumerBaseLL.h            |  5 +++++
 widget/gonk/nativewindow/GonkNativeWindowLL.cpp          |  5 +++++
 widget/gonk/nativewindow/GonkNativeWindowLL.h            |  4 ++++
 9 files changed, 55 insertions(+), 1 deletion(-)
 2015-03-18 15:03:15 -07:00
Andrea Marchesini
e6f385fb3d Bug 1148527 - Indentation fix after bug 1145631, r=ehsan 2015-03-27 18:52:19 +00:00
David Anderson
274c9d4c17 Allow dispatching to the APZ controller thread from any thread. (bug 1147681 part 1, r=kats) 
--HG--
extra : rebase_source : ce0beebda151fdf5adf69e998465c684b193db75
 2015-03-26 14:23:02 -07:00
Maksim Lebedev
9e2e275653 Bug 1143655 - Add sending NS_TOUCH_CANCEL event. r=kats 2015-03-25 12:20:20 -04:00
Ehsan Akhgari
883849ee32 Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj 
This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final
 2015-03-21 12:28:04 -04:00
Kartikaya Gupta
617f629233 Bug 1143518 - Remove the TryCapture path which is now obsolete. r=smaug 2015-03-16 12:32:17 -04:00
Gabriele Svelto
ab940fcb6e Bug 852925 - Freeze priority changes when the screen is turned off. r=khuey 2015-03-09 16:33:33 +01:00
Sotaro Ikeda
a5af76c3cf Bug 1141311 - Add async mode support to GonkNativeWindow on Lollipop Gonk r=pchang 2015-03-10 20:39:23 -07:00
Wes Kocher
d8ac0068e5 Merge b2g-inbound to m-c a=merge CLOSED TREE 2015-03-10 15:44:53 -07:00
Thomas Zimmermann
0c5bb81c69 Bug 1137151: Marked destructor of |nsScreenManagerGonk| as protected, r=mwu 2015-03-10 13:44:02 +01:00
Thomas Zimmermann
3a5a377ab7 Bug 1137151: Marked destructor of |nsWindow| as protected, r=mwu 2015-03-10 13:44:02 +01:00
Thomas Zimmermann
2092703665 Bug 1137151: Marked destructor of |nsClipboard| as protected, r=mwu 2015-03-10 13:44:02 +01:00
Thomas Zimmermann
7176fed30e Bug 1137151: Marked destructor of |GeckoTouchDispatcher| as protected, r=mwu 2015-03-10 13:44:02 +01:00
Thomas Zimmermann
96d150e2cb Bug 1137151: Marked destructor of |MemoryPressureWatcher| as protected, r=dhylands 2015-03-10 13:44:02 +01:00
Milan Sreckovic
76dd5cd892 Bug 1140113 - Catch direct (and some indirect) callers of CreateDrawTarget* and deal with failure. r=mstange 2015-03-09 15:48:20 -04:00
Kartikaya Gupta
8449555fb0 Bug 1140578 - Prevent resampling moves across non-move touch events. r=mchang 2015-03-09 12:46:04 -04:00
Kartikaya Gupta
e288f1cc73 Bug 1140578 - Add a explicit flag to track if we have pending touch moves to process. r=mchang 2015-03-09 12:46:04 -04:00
Kartikaya Gupta
c856037b1d Bug 1140578 - Simplify some code. r=mchang 2015-03-09 12:46:04 -04:00
Kartikaya Gupta
87bc24079b Bug 1140578 - Remove some redundant code and an unused return value. r=mchang 2015-03-09 12:46:04 -04:00
dvander@alliedmods.net
bbb91f19dc Factor out how APZ-aware events are dispatched from widgets. (bug 1126090 part 2, r=kats) 2015-03-06 14:26:59 -08:00
Kartikaya Gupta
c4fce7246b Bug 1139541 - Make HWC skip opacity=0 layers. r=sotaro 2015-03-06 16:52:34 -05:00
Mason Chang
d81b5a205d Bug 1129133 - Clean up GeckoTouchDispatcher so that it's a real singleton. r=kats,mwu 2015-02-24 12:52:16 -08:00
Masayuki Nakano
27d34fdbd2 Bug 1119609 part.3 Implement converting methods from key/code value to key/code name index r=smaug 2015-02-19 15:50:19 +09:00
David Anderson
8b68b8e3e8 Add weak reference support to nsBaseWidget. (bug 1133150, r=roc) 2015-02-17 22:27:53 -08:00
Botond Ballo
d269100f16 Bug 1127066 - Add weak reference support to the gonk nsWindow type. r=kats 
--HG--
extra : source : 2c81ee3e4c61c82770fad9f3eac9c64abb6ab4ec
 2015-02-09 13:50:51 -05:00
Ryan VanderMeulen
74f80ff51c Merge inbound to m-c. a=merge 
CLOSED TREE
 2015-02-10 16:03:15 -05:00
Sushil Chauhan
1f5c5361a5 Bug 1122850 - Use setPowerMode interface for HWC 1.4 and above. r=dwilson 2015-02-05 12:30:54 -08:00
Kartikaya Gupta
ddc075e4eb Bug 930939 - Switch the B2G controller thread from the main thread to the compositor thread. r=botond,mwu 2015-02-10 08:24:23 -05:00
Robert O'Callahan
7a165b59ca Bug 1129774. Part 5: Remove aContext parameter from nsIWidget::Create. r=jmathies 
--HG--
extra : rebase_source : 517ff800c0307e69465a37da7e52605d2fcda0d1
 2015-02-05 20:35:25 +13:00
Robert O'Callahan
282e59cd87 Bug 1129774. Part 3: Remove aContext parameter from BaseCreate and make it nonvirtual. r=jmathies 
--HG--
extra : rebase_source : 9fd0a3e071b7d3ad273667f144889938bc5d9dc4
 2015-02-05 18:18:30 +13:00
Carsten "Tomcat" Book
ba2f5fcd61 merge mozilla-inbound to mozilla-central a=merge 2015-02-05 14:47:16 +01:00
Mason Chang
60c719a5b5 Bug 1129210. Always enable vsync when touch events occur. r=kats 2015-02-04 22:10:56 -08:00
Mason Chang
231a1fb35b Bug 1129632. Resample touch events based on the current touch. r=mwu 2015-02-04 17:06:09 -08:00
Mason Chang
424409c421 Bug 1128691. Part 2: Consolidate touch resampilng pref checks. r=kats 2015-02-04 13:08:40 -08:00
David Zbarsky
c73ec42d2d Bug 1125040: Use LayoutDeviceIntPoint for nsIWidget::WidgetToScreen r=botond 2015-02-04 15:21:03 -05:00
Sushil Chauhan
88116be583 Bug 1127585 - Update HWC_BLIT composition-type value. r=sotaro 2015-02-03 10:38:21 -08:00
Botond Ballo
0d36926e53 Bug 950934 - Do not generate mouse events from touch events at the gonk widget layer. r=kats 2015-01-14 18:05:46 -05:00
Phil Ringnalda
7b3840d642 Back out 5167196c4b98 (bug 1125040) for not compiling on Linux 
CLOSED TREE
 2015-02-01 15:27:14 -08:00
David Zbarsky
7d34edce07 Bug 1125040: Use LayoutDeviceIntPoint for nsIWidget::WidgetToScreen r=botond 2015-02-01 17:27:41 -05:00
Masayuki Nakano
39018f5127 Bug 936313 part.2 Compute DOM key location from code value on Android and Gonk r=smaug+mwu+cpeterson 2015-01-28 22:36:53 +09:00
Masayuki Nakano
7a0cea6729 Bug 936313 part.1 Remove DOM_KEY_LOCATION_MOBILE and DOM_KEY_LOCATION_JOYSTICK r=smaug+mwu+cpeterson, sr=smaug 2015-01-28 22:36:53 +09:00
Kartikaya Gupta
990f1807e9 Bug 1121353 - Implement SynthesizeNativeTouchPoint in the gonk widget to allow injecting touch events into APZ. r=mwu 2015-01-20 00:38:00 +01:00
JerryShih
837bd03db3 Bug 1123734 - Notify global VsyncSource in hwc. r=mwu, r=mchang 2015-01-20 08:21:00 -05:00
Chris Peterson
3de239df52 Bug 1123553 - Fix -Wuninitialized warning in GonkDisplayJB.cpp by removing unnecessary error check. r=mwu 2015-01-19 21:44:27 -08:00
Mason Chang
61fabafd0d Bug 1095242. Part 1: Ensure Vsync Is Enabled on b2g. r=mwu 2015-01-20 08:31:10 -08:00
Mason Chang
5ee7bd3f46 Bug 1120753 - Fallback to software vsync if hardware vsync fails to initialize on b2g. r=kats,mwu 2015-01-15 07:56:12 -08:00
Kartikaya Gupta
846e3755ae Bug 920036 - Send touch inputs through the APZ before sending them to the gecko thread. r=mwu,dvander,smaug 2015-01-15 10:37:54 -05:00
Kartikaya Gupta
cdac1b867f Back out bug 1119497 and one patch from bug 920036 for causing bug 1121033. r=me 2015-01-13 21:16:51 -05:00
Carsten "Tomcat" Book
830e9e7d40 merge b2g-inbound to mozilla-central a=merge 2015-01-12 14:59:45 +01:00
Masatoshi Kimura
bf312ad056 Bug 1120062 - Part 1: Remove most Nullptr.h includes. r=waldo 2015-01-11 11:34:52 +09:00
Kartikaya Gupta
e2d152069e Bug 920036 - Send touch inputs through the APZ before sending them to the gecko thread. r=mwu,dvander,smaug 2015-01-10 13:54:24 -05:00
Kartikaya Gupta
bb68b7de05 Bug 920036 - Move ToWidgetMouseEvent into MultiTouchInput. r=mwu 2015-01-10 13:54:24 -05:00
Kartikaya Gupta
e10f70887c Bug 1119811 - Fold the gonk ParentProcessController into the reusable ChromeProcessController. r=dvander 2015-01-09 13:41:23 -05:00
Viral Wang
1c29580ae2 Bug 1107760 - add new keycode mapping for L, r=mwu 2015-01-08 01:14:00 +01:00
Nicholas Nethercote
8c35fccbcd Bug 1117623 - Fix undefined value error in TouchInputMapper::configureSurface(). r=mwu. 
--HG--
extra : rebase_source : 6a6fe5eefda60df9b42bcc6212ecdd763f548495
 2015-01-06 19:31:03 -08:00
Jeff Gilbert
a76e617dd0 Bug 1100699 - Use OriginPos instead of isInverted. - r=mattwoodrow,snorp 2014-11-17 17:02:19 -08:00
Boris Chiou
761afc5ba0 Bug 1098970 - Part 5: Fix link errors casued by symbol visibility. r=sotaro 
Use the NO_VISIBILITY_FLAGS flag to fix the hidden symbol visibility and
some warnings.
 2014-12-18 18:08:00 +01:00
Boris Chiou
9ac121c9e5 Bug 1098970 - Part 4: Fix naming problems and buffer allocation. r=sotaro 
1. Fix class naming by adding "Gonk" prefix, and rename Surface
   & BufferItemConsumer.
2. Revise the buffer allocation
 2014-12-21 22:01:00 +01:00
Boris Chiou
fbec25158c Bug 1098970 - Part 3: Add new files for Nativewindow. r=sotaro 
1. Copied Surface.* and rename them as GonkNativeWindowClientLL.*
2. Copied BufferItemConsumer.* and rename them as GonkNativeWindowLL.*
3. Add new IGonkGraphicBufferConsumer.h to control the version
4. Fix the file mode for some JB files (remove execute permission)
 2014-12-17 22:30:00 +01:00
Boris Chiou
82bb82c84a Bug 1098970 - Part 2: Rename files. r=sotaro 
Add the "Gonk" prefix & "LL" suffix, and collect all BufferQueue
related files on Lollipop in one directory.

--HG--
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferItem.cpp => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferItem.cpp
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferItem.h => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferItem.h
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueueConsumer.cpp => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueueConsumer.h => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.h
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueueCore.cpp => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueCore.cpp
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueueCore.h => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueCore.h
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueueDefs.h => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueDefs.h
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueue.cpp => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueLL.cpp
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueue.h => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueLL.h
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueueProducer.cpp => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.cpp
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferQueueProducer.h => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueProducer.h
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferSlot.cpp => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferSlot.cpp
rename : widget/gonk/nativewindow/GonkBufferQueueLL/BufferSlot.h => widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferSlot.h
rename : widget/gonk/nativewindow/GonkBufferQueueLL/ConsumerBase.cpp => widget/gonk/nativewindow/GonkConsumerBaseLL.cpp
rename : widget/gonk/nativewindow/GonkBufferQueueLL/ConsumerBase.h => widget/gonk/nativewindow/GonkConsumerBaseLL.h
rename : widget/gonk/nativewindow/IGonkGraphicBufferConsumer.cpp => widget/gonk/nativewindow/IGonkGraphicBufferConsumerKK.cpp
rename : widget/gonk/nativewindow/IGonkGraphicBufferConsumer.h => widget/gonk/nativewindow/IGonkGraphicBufferConsumerKK.h
rename : widget/gonk/nativewindow/GonkBufferQueueLL/IGraphicBufferConsumer.cpp => widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.cpp
rename : widget/gonk/nativewindow/GonkBufferQueueLL/IGraphicBufferConsumer.h => widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.h
 2014-12-17 22:29:00 +01:00
Boris Chiou
eabfa84986 Bug 1098970 - Part 1: Add new LL native files. r=sotaro 
Copied from aosp/framework/native/gui.
 2014-12-17 18:26:00 +01:00
Mason Chang
2166723055 Bug 1113725. Rename VsyncDispatcher to CompositorVsyncDispatcher. r=kats 2014-12-19 12:52:42 -08:00
Mason Chang
3027d1493e Bug 1101974. Part 6. Create VsyncSource on b2g. r=kats 2014-12-18 08:30:06 -08:00
Carsten "Tomcat" Book
ae839974ba Merge mozilla-central to mozilla-inbound 2014-12-18 13:54:52 +01:00
Chih-Kai (Patrick) Wang
fcb6d29268 Bug 970307: Part 1: Report status of each thread to find when all the threads are idle. r=nfroyd 2014-12-18 17:00:39 +08:00
Mason Chang
2ceec663c3 bug 1102453. Read HwcComposer vsync status on main thread. r=mwu 2014-12-17 21:25:09 -08:00
Michael Wu
d57baeb1f7 Bug 1104661 - Import sha1.c for libui, r=m1 2014-12-16 20:43:41 -05:00
David Anderson
aa0028e4da Move APZC initialization into nsBaseWidget. (bug 1110540 part 1, r=kats) 2014-12-15 01:47:15 -08:00
Botond Ballo
edcabbc40b Bug 1073081 - Fix -Woverloaded-virtual warnings in gonk code. r=sotaro 
--HG--
extra : source : c1ae176debd74464094cbb6db1254c7fbd55a271
 2014-11-24 20:03:27 -05:00