wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
185,753 Commits 1 Branch 166 Tags 1.2 GiB
49fe8ad9dd
Commit Graph

672 Commits

Author SHA1 Message Date
Kartikaya Gupta
31afc0a194 Bug 948377 - Remove unwanted rounding in CalculateCompositedRectInCssPixels; add a CalculateCompositedSizeInCssPixels also. r=botond 2014-03-28 10:36:47 -04:00
Timothy Nikkel
2313119109 Bug 957668. Calculate and set display ports as margins in layer pixels. r=kats 2014-03-26 21:46:24 -04:00
Gorman Ho
9f11aa16d4 Bug 983285 - Add a generic destructor for property values allocated with new. r=kats, r=bz 2014-03-25 09:25:47 -04:00
Chadd Williams
1035df8afc Bug 980493 - Transition FrameMetrics::mScrollId to use a getter/setter. r=botond 
--HG--
extra : histedit_source : 1c84496d4b61f019e6e6cc24591ee3a10434e4cc
 2014-03-21 17:48:08 -04:00
Tom Schuster
080f940e4c Bug 977904 - [e10s] Get native key bindings working. r=masayuki 2014-03-20 16:46:29 +01:00
Neil Deakin
54fd69f1a7 Bug 982734, make nsIWidget::GetWindowType and nsIWidget::GetZIndex return their values, remove some unused colour-related widget methods, r=tn 2014-03-19 12:48:08 -04:00
Nathan Froyd
61a6f7901d Bug 984466 - change CallQueryInterface to assert in cases of trivial conversions; r=ehsan 2014-03-17 13:00:17 -04:00
Neil Rashbrook
c3b2f90f39 Bug 514280 Stop using nsCOMPtr for concrete types r=bsmedberg 
--HG--
extra : rebase_source : f8fb50de9292320eb7589dd28dc566d0f5044da6
 2014-03-18 00:23:03 +00:00
Wes Kocher
c0dba87922 Backed out 2 changesets (bug 514280) for OSX build bustage on a CLOSED TREE 
Backed out changeset 2a015b45d808 (bug 514280)
Backed out changeset a01f97c1ed02 (bug 514280)
 2014-03-17 15:19:53 -07:00
Neil Rashbrook
b07eaa1644 Bug 514280 Stop using nsCOMPtr for concrete types r=bsmedberg 
--HG--
extra : rebase_source : eaca8b2925eaffb49e29a617cd72c0d6686e6d9e
 2014-03-17 19:07:09 +00:00
Kyle Huey
e78b977cbc Bug 967364: Use every already_AddRefed. r=bsmedberg 2014-03-15 12:00:16 -07:00
Kyle Huey
510a49016d Bug 967364: Rename already_AddRefed::get to take. r=bsmedberg 2014-03-15 12:00:15 -07:00
Masayuki Nakano
f2734aa16b Bug 977959 part.3 Hide nsINativeKeyBindings with nsIWidget::ExecuteNativeKeyBinding() r=roc+karlt+smichaud 2014-03-14 22:13:31 +09:00
Botond Ballo
81f6add29a Bug 980493 - Transition FrameMetrics::mZoom to use a getter/setter. r=kats 2014-03-12 12:46:57 -04:00
Botond Ballo
c169aeed9c Bug 980493 - Transition FrameMetrics::mScrollOffset to use a getter/setter. r=kats 2014-03-13 02:34:34 -04:00
Kartikaya Gupta
a1bad3329e Bug 981029 - Save and apply an input transform to input events from the APZ. r=botond 
This accounts for the fact that in some cases we may not apply all of the
requested paint metrics from the APZ, leaving the two sides of the
GeckoContentController interface out of sync (on purpose).
 2014-03-12 15:27:45 -04:00
Botond Ballo
70dfe7ab91 Bug 935219 - Fix composition bounds calculation and APZC hit testing (again). r=kats,tn 
--HG--
extra : amend_source : 06c6bb658dfead6907250831bbe73fae6c20b45c
 2014-03-10 17:56:59 -04:00
Robert O'Callahan
f87fd81842 Bug 975931. Part 11: Make nsDOMWindowUtils::SetDisplayPortForElement take a priority parameter, and set that parameter to 1 in reftests to override automatic displayport selection. r=kats 
--HG--
extra : rebase_source : 07dcbfb67cb2db0bbb26a959517bbbdebd84f10b
 2014-03-08 22:25:15 +13:00
Masayuki Nakano
2c3296d1bb Bug 978023 part.3 Rename nsIMEStateManager to mozilla::IMEStateManager r=smaug 
--HG--
rename : dom/events/nsIMEStateManager.cpp => dom/events/IMEStateManager.cpp
rename : dom/events/nsIMEStateManager.h => dom/events/IMEStateManager.h
 2014-03-08 10:20:07 +09:00
Ed Morley
bd22dac370 Merge backout; CLOSED TREE 2014-03-07 15:53:02 +00:00
Ed Morley
0ddf702725 Backed out changeset f94ee00aa4d6 (bug 974197) for causing gaia-ui-test failures 2014-03-07 15:45:59 +00:00
Matt Woodrow
e1320c476a Bug 974197 - Fire MozAfterPaint after the compositor has composited the frame. r=roc 2014-03-07 16:24:32 +13:00
Kartikaya Gupta
63e52fccd3 Bug 975962 - Allow panning/zooming around the initial viewport for overflow:hidden elements. r=botond,tn 2014-03-07 08:41:00 -05:00
Chris Lord
673d3400b4 Bug 979973 - Fix displayport tile-alignment immediately after zooming. r=botond 
Resolution and cumulative resolution on FrameMetrics are incorrect when the
zoom level is about to change. Make sure to use the zoom rather than these
values when aligning the displayport to tile boundaries in APZCCallbackHelper.
 2014-03-06 23:39:39 +00:00
Botond Ballo
64d1fd1680 Bug 978248 - Tile-align display ports on first paint. r=tn 2014-02-28 16:13:48 -05:00
Thomas Zimmermann
8703d1c2cc Bug 978700: Fix warnings about uninitialized variables, r=roc 2014-03-04 09:45:51 +01:00
Timothy Nikkel
96e380e604 Bug 978248. If the scrollframe has gone away just use the scroll offset that the APZC controller had instead of (0,0). r=botond 2014-03-03 22:33:09 -06:00
Makoto Kato
1e3167927c Bug 968647 - Part 2. Listen window position change for IME. r=roc 2014-02-28 16:45:08 +09:00
Makoto Kato
94e82b6d5e Backed out changeset fad708985071 (bug 968647) 2014-03-03 11:53:36 +09:00
Makoto Kato
5a98fb8f83 Bug 968647 - Part 2. Listen window position change for IME. r=roc 2014-02-28 16:45:08 +09:00
Ryan VanderMeulen
9ee5be5755 Merge m-c to fx-team. 2014-02-28 10:17:27 -05:00
Mike de Boer
3046afcfeb Bug 326743: add find clipboard to the list of available clipboard on OSX. r=joshmoz 2014-02-28 16:07:30 +01:00
Carsten "Tomcat" Book
152bca780f Backed out changeset 743fb3c48ed7 (bug 968647) 2014-02-28 09:30:01 +01:00
Makoto Kato
2d8a640b28 Bug 968647 - Part 2. Listen window position change for IME. r=roc 2014-02-28 16:45:08 +09:00
Reuben Morais
f954df12ae Bug 458300 - Rename nsINameSpaceManager.h to nsNameSpaceManager.h. r=jst r=hsivonen 
--HG--
rename : content/base/public/nsINameSpaceManager.h => content/base/public/nsNameSpaceManager.h
 2014-02-27 20:04:46 -03:00
Milan Sreckovic
cdd2e94e6e Bug 971942: 6. layers.low-precision-resolution, layers.prefer-opengl, layers.prefer-d3d9, layers.enable-tiles, gfx.direct2d.disabled, gfx.direct2d.force-enabled, moved to gfxPrefs. r=bschouten 2014-02-26 21:53:32 -05:00
Milan Sreckovic
6d1dbe84a1 Bug 971942: 3. layers.bufferrotation.enabled, layers.componentalpha.enabled, layers.scroll-graph, layers.acceleration.disabled, layers.acceleration.force-enabled moved to gfxPrefs. r=clord 2014-02-26 21:53:27 -05:00
Masayuki Nakano
9f4af3ce4f Bug 961704 part.2 Add an option to nsIMEUpdatePreference which prevents to be notified selection/text changes caused by composition r=smaug 2014-02-26 09:48:02 +09:00
Makoto Kato
1151750c9c Bug 976394 - NS_QUERY_SELECTED_TEXT on e10s is sometimes wrong value. r=masayuki 2014-02-25 14:51:01 +09:00
Phil Ringnalda
2ffff0072c Back out b157f5d0c235 (bug 974197) for b2g reftest-4 and reftest-6 failures 
CLOSED TREE
 2014-02-24 21:06:18 -08:00
Matt Woodrow
bdb53ca253 Bug 974197 - Fire MozAfterPaint after the compositor runs. r=roc 2014-02-25 12:55:39 +13:00
Bill McCloskey
7c8e12fb1e Bug 910384 - [e10s] Use blobs for cross-cross file picker (r=bent) 2014-02-24 13:09:03 -08:00
Tom Schuster
9a72df76f8 Bug 963294 - [e10s] Implement a proxy for the color picker. r=jdm 2014-02-23 21:19:43 +01:00
Phil Ringnalda
e93c529ba7 Back out 5e4cee2fcbc6 (bug 963294) for build bustage 
CLOSED TREE
 2014-02-23 12:59:52 -08:00
Tom Schuster
5eabd80fb1 Bug 963294 - [e10s] Implement a proxy for the color picker. r=jdm 2014-02-23 21:19:43 +01:00
Oleg Romashin
cdc9691a65 Bug 974335 - Refactor Qt Widget Backend implementation. Shared Widget part . r=doug 2014-02-20 18:08:53 -08:00
Bill McCloskey
61c692b5b4 Bug 974007 - Change OMTC behavior when browser.tabs.remote is set (r=mattwoodrow,felipe) 2014-02-20 17:26:41 -08:00
Kartikaya Gupta
9d02b7b8c2 Bug 966507 - Recenter the displayport around the composition bounds if layout doesn't accept the scroll update calculated by APZ. r=tn,Cwiiis 2014-02-19 09:50:46 -05:00
Tom Schuster
067705daf7 Bug 910384 - Change nsFilePickerProxy to be asynchronous and add a proper IPDL protocol for it. r=jdm 2014-02-18 01:30:06 +01:00
Masayuki Nakano
0e922aada3 Bug 965685 Use IMENotification struct for nsIWidget::NotifyIME() and merge NotifyIMEOfTextChange() with it r=smaug, sr=roc 2014-02-18 09:00:15 +09:00
Phil Ringnalda
bb47d34a53 Back out 024e6835e6ea:bece94ce2310 (bug 326743) for frequent 10.6 debug failures in browser_bug537013.js 2014-02-14 23:58:49 -08:00
Mike de Boer
2df6ea85e1 Bug 326743: add find clipboard to the list of available clipboard on OSX. r=joshmoz 2014-02-14 14:04:19 +01:00
Aaron Klotz
4f86c138f0 Bug 852117: Modify nsBaseAppShell to notify the crash reporter when the event loop nesting level changes; r=roc 
--HG--
extra : rebase_source : 4216520beb56f4e87bb77c89a4edc0cf9a02b658
 2014-02-13 10:54:10 -07:00
Jeff Walden
dc4d5d1f24 Bug 969165 - Convert Atomic<T> where T != bool but is used as a bool over to Atomic<bool>, now that it's supported, in widget/. r=vlad 
--HG--
extra : rebase_source : 29bf1f696e8952ea7056d2417522dcc0f88cecc4
 2014-02-06 22:17:07 -08:00
Ehsan Akhgari
b870bb3fe9 Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg 2014-02-10 17:57:01 -05:00
Bill McCloskey
ab1717c10c Bug 966467 - Proxy clipboard service in content process (r=vlad) 2014-02-09 16:13:10 -08:00
Bill McCloskey
32e8ab9b4c Bug 966467 - Enable some service proxies only in content processes (r=vlad) 2014-02-09 16:13:05 -08:00
Ms2ger
479e9f45c5 Bug 952033 - Part b: Use IntSize in CreateOffscreenSurface; r=roc 2014-02-09 09:04:38 +01:00
Kartikaya Gupta
5fde241c65 Bug 963278 - Better fix to deal with concurrent scroll updates from APZ and other places. r=tn,botond,jimm 2014-02-05 17:43:20 -05:00
Olli Pettay
d4a55513b7 Backout Bug 930793 - Remove favor performance mode (we have still racy b2g tests), a=backout 
--HG--
extra : rebase_source : 6f6de1cbf54670d63b74c44ca0134ed9c5354d2b
 2014-01-30 21:35:44 -08:00
Matt Woodrow
550fee56f2 Bug 962786 - Convert nsDragService to use Moz2D. r=roc 
* * *
Bug 962786 - Bustage fix on a CLOSED TREE
 2014-01-29 13:10:33 +13:00
Nick Lebedev
a6d41db5bd Bug 822898. Add maxTouchPoints attribute to navigator. r=romaxa,smaug 
--HG--
extra : rebase_source : e3f84cb38ee2a0c75bf775027c8a59e4f9e64908
 2014-01-28 08:09:34 -08:00
Makoto Kato
c0d09abad1 Bug 960877 - Part 3. Always notice IME information to parent process for supporting NS_QUERY event if not B2G. r=masayuki 2014-01-29 18:32:39 +09:00
Makoto Kato
797dde6607 Bug 960877 - Part 2. Remove mWantHints from nsIMEUpdatePreference. r=masayuki 2014-01-29 18:32:35 +09:00
Phil Ringnalda
b28c502af5 Backed out 5 changesets (bug 962786, bug 952011) for svg test_text_selection.html bustage 
CLOSED TREE

Backed out changeset d7a6a64b42f0 (bug 962786)
Backed out changeset e50ced4f4040 (bug 952011)
Backed out changeset c9e6fd6d5a03 (bug 952011)
Backed out changeset 406540ed9da0 (bug 952011)
Backed out changeset d6f164b6421a (bug 962786)
 2014-01-28 19:37:54 -08:00
Matt Woodrow
0d06c40a64 Bug 962786 - Convert nsDragService to use Moz2D. r=roc 2014-01-29 13:10:33 +13:00
Kartikaya Gupta
a3716e9b05 Bug 961280 - Prevent the APZ repaint request from clobbering a layout-driven async scroll. r=tn 2014-01-28 17:54:59 -05:00
Masayuki Nakano
758ffbc5f3 Bug 962005 Make mozilla::TextComposition ref-countable class r=smaug 2014-01-28 17:19:29 +09:00
ISHIKAWA, Chiaki
73913f9880 Bug 963550 - Warn about OpenGL non-support only once during execution instead of spamming the log. r=bjacob 2014-01-27 15:40:50 -05:00
Benoit Jacob
67a17b1047 Bug 959448 - Convert most of LayersTypes.h to typed enums - r=nrc 
find content/media dom/ipc widget/ gfx/tests gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)LAYERS_\(NONE\|BASIC\|OPENGL\|D3D9\|D3D10\|D3D11\|CLIENT\|LAST\)\($\|[^A-Za-z0-9_]\)/\1LayersBackend::LAYERS_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::BUFFER_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(BUFFERED\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(DRAW\|DRAW_SNAPPED\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::CLIP_\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SURFACE_\(NONE\|OPAQUE\|SINGLE_CHANNEL_ALPHA\|COMPONENT_ALPHA\)\($\|[^A-Za-z0-9_]\)/\1SurfaceMode::SURFACE_\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(STRETCH\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::SCALE_\2\3/g'
 2014-01-23 13:26:41 -05:00
Benoit Jacob
93826fc6b0 Bug 959380 - 4/5 - Make gfxContentType a typed enum - r=jrmuizel 
find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)GFX_CONTENT_\(COLOR\|ALPHA\|COLOR_ALPHA\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1gfxContentType::\2\3/g'
 2014-01-23 13:26:40 -05:00
Benoit Jacob
3369ca8bb6 Bug 959380 - 2/5 - Make gfxImageFormat a typed enum - r=jrmuizel 
find . -type f | grep -v \./obj | grep -v \.hg | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxImageFormat\(ARGB32\|RGB24\|A8\|A1\|RGB16_565\|Unknown\)\($\|[^A-Za-z0-9_]\)/\1gfxImageFormat::\2\3/g'
 2014-01-23 13:26:40 -05:00
Ryan VanderMeulen
b9d8299a2f Backed out changeset 5297eafc36e2 (bug 962911) for making B2G reftests much more failure-prone. 
CLOSED TREE
 2014-01-23 11:50:52 -05:00
Olli Pettay
5f3209d44b Bug 962911 - Bring back more-than-one-native-event-per-gecko-event processing, r=avih 2014-01-23 14:49:39 +02:00
Terrence Cole
f017da90d9 Bug 959787 - Handlify several JSAPI interfaces that can GC, Part 3; r=sfink 
--HG--
extra : rebase_source : ace7b0fa6ba93acbf0ec8ecaeb68ffa287a33665
 2014-01-16 09:48:58 -08:00
Olli Pettay
63f95f00c7 Bug 930793 - Remove favor performance mode, r=roc,avih 
--HG--
extra : rebase_source : e936e5b02dc2e613816fb6f97f9af5a303dc6f6d
 2014-01-16 16:09:08 +02:00
Makoto Kato
c9fb41d576 Bug 935821 - Part 3. Support remote NS_QUERY_CARET_RECT. r=masayuki 2014-01-16 19:04:39 +09:00
Makoto Kato
52f6c0d702 Bug 935821 - Part 1. Notify IME Compostion to widget. r=masayuki 2013-11-07 09:11:11 +09:00
Makoto Kato
b923669e4c Bug 926798 - Deinfe MOZ_CROSS_PROCESS_IME for non-B2G, r=roc 2014-01-16 19:04:05 +09:00
Tom Schuster
e64b35e141 Bug 939294 - Change xpidl jsval to handles. r=gabor,bz,khuey,bsmedberg,terrence 2014-01-09 18:39:36 +01:00
David Zbarsky
3e6531d3e8 Bug 952977: Switch GL world transform to gfx::Matrix r=nical 2014-01-16 02:22:19 -05:00
Ryan VanderMeulen
4d272a44a3 Merge inbound to m-c. 2014-01-15 14:34:05 -05:00
Ryan VanderMeulen
3d4fa83a0c Backed out changeset 347d5704cbe1 (bug 930793) for frequent Linux mochitest-bc orange. 
CLOSED TREE
 2014-01-15 14:11:20 -05:00
Yuan Xulei
e7aa3ecf90 Bug 946068 - Fix composition events' synthesizing in chrome process. r=masayuki 2014-01-15 09:41:39 -05:00
Kartikaya Gupta
b75faf0673 Bug 951113 - Trigger a repaint request when getting a scroll offset update to cover a race condition allowed by async IPC. r=botond 2014-01-14 16:43:43 -05:00
Kartikaya Gupta
b4291b9688 Bug 951113 - Fix code to adjust the displayport when the scroll offset is changing. r=Cwiiis 2014-01-14 16:43:42 -05:00
Nick Lebedev
0d83bcb092 Bug 795567 - Part 2: Introduce ContentHelper class that will be responsible for retrieving touch-action info from content and setting it to widget. r=kats 2014-01-15 10:03:15 -05:00
Olli Pettay
b5e3affd28 Bug 930793 - Remove favor performance mode, r=roc,avih 
--HG--
extra : rebase_source : 5b466917ad1b1b5ef75119cfbeba75861cb49823
 2014-01-15 14:00:52 +02:00
Bill McCloskey
2a250929da Bug 950833 - Enable WebGL on Linux without forcing it (r=bjacob) 2014-01-10 17:09:20 -08:00
Marco Bonardo
8645e9a74e Bug 953311 - nsIdleService.idl and .cpp comments are still suggesting a "back" notification. r=gsvelto 2014-01-08 18:43:03 +01:00
Ehsan Akhgari
ebd358dfd7 Bug 927728 - Part 1: Replace PRUnichar with char16_t; r=roc 
This patch was automatically generated by the following script:

#!/bin/bash
# Command to convert PRUnichar to char16_t

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*modules/libmar*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name prtypes.h \
       ! -name Char16.h \
         -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 PRUnichar char16_t
 2014-01-04 10:02:17 -05:00
Isura Edirisinghe
1542439ab5 Bug 676907 - Refactor (replace) calls to Gestalt because it is deprecated in OS X 10.8 and will not work in after 10.9. r=BenWa 2013-12-19 11:42:19 -05:00
Chris Lord
2fab05a2c9 Bug 950696 - Cache the 'enable tiles' layers pref. r=bgirard 
Rename layers.force-tiles to layers.enable-tiles and cache it with the other
layers prefs in gfxPlatform.
 2013-12-17 14:02:16 +00:00
Jacek Caban
7012618b77 Bug 943870 - Constify aDataBuff in CreatePrimitiveForData. r=ehsan 2013-12-17 12:02:08 +01:00
Ryan VanderMeulen
c173096f45 Merge inbound to m-c. 2013-12-16 16:58:27 -05:00
Kartikaya Gupta
8109167828 Bug 949132 - Add a flag to FrameMetrics indicating a non-APZ scroll (original patch by mstange). r=tn 2013-12-16 12:04:45 -05:00
Jim Mathies
eb0464623a Bug 941774 - Base widget implementation. r=roc 2013-12-14 14:40:56 -06:00
Vivien Nicolas
de215e0940 Bug 949404 - Applications are half repainted once the keyboard is closed. r=Cwiiis 2013-12-13 18:23:47 +01:00
Reuben Morais
7c641f6b3b Bug 938889 - Remote IdleService and disable idle-daily notifications in content processes. r=roc 2013-12-13 14:28:46 -02:00
Bill McCloskey
c4c1d8233a Bug 948238 - Read browser.tabs.remote once at startup and never again (r=bsmedberg) 2013-12-12 14:13:20 -08:00