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,606 Commits 1 Branch 166 Tags 1.2 GiB
1fc235049e
Commit Graph

293 Commits

Author SHA1 Message Date
Scott Johnson
6003af5e8d Bug 743402, Part 4: Refactor ApplySkipSides() and GetSkipSides() to return the correct value during reflow by adding an optional nsHTMLReflowState parameter. [r=roc] 2013-07-24 12:47:17 -05:00
Seth Fowler
1d2edbfa2d Bug 695763. Part 7. Invalidate img's if they are not decoded and we are asked to do a sync decode. r=matt.woodrow 2013-06-26 11:43:27 -05:00
Ms2ger
7cdd3a5243 Bug 880340 - Remove the security checks on nsImageLoadingContent methods; r=bz 2013-06-12 09:00:09 +02:00
Joe Drew
d90b555d68 Bug 867770 - Add a pref as to whether we layerize animated images, disabled by default. r=mattwoodrow 2013-05-30 21:33:17 -04:00
Joe Drew
ac3b24a51f Bug 867770 - Layerize all animated images. r=mattwoodrow 2013-05-30 09:50:50 -04:00
Matt Woodrow
fa247b33af Bug 869133 - Recycle the ImageLayers created by nsDisplayImage/nsDisplayBackgroundImage instead of recreating them each time. r=roc 2013-05-30 14:42:28 +12:00
Bobby Holley
ba05c93769 Bug 868130 - Include nsCxPusher.h everywhere we need it, and stop including it from nsContentUtils.h. r=gabor 2013-05-22 10:05:26 -06:00
Mats Palmgren
cd2a9144a4 Bug 866785 - Move repeated nsIFrame::List implementations code to a new method, ListGeneric, for re-use. Cleanup and improve the code a bit. r=roc 
Specifically:
* move all the frame dump methods to nsIFrame. Especially nsFrame::ListTag
  was annoying, often requiring a cast to nsFrame*.
* print common values in the same order for all types of frames
* print fluid continuations as "next-in-flow=%p" and non-fluid as
  "next-continuation=%p" (as before)
* print the style-context more compactly, e.g.
  "[sc=0x7faa6b60e0a0] pst=:first-line" becomes
  "[sc=0x7faa6b60e0a0:first-line]"
* suppress printing visual/scroll-overflow rects when they are identical
  to mRect and do the same for nsLineBox::List where it was especially
  hard to see which lines actually had real overflow
* fix a bug that printed the child list name at the far right when the
  principal list was empty (making it hard to see)
* print the address of child lists (other than the principal list) to
  help debug frame list property bugs
* s/NS_IMETHODIMP/void/
 2013-04-30 20:38:52 +02:00
Takeshi Kurosawa
a3cfc14a35 Bug 338033 - No visible focus indicator on image map areas with black background r=roc 2013-04-27 17:54:36 +09:00
Joe Drew
730ac999c6 Bug 832400 - Add an imgIContainer flag HIGH_QUALITY_SCALING that controls whether to use the high quality scaler, and only use it when we're drawing to a window. r=tn 2013-04-25 18:08:58 -04:00
Robert O'Callahan
04e9887192 Bug 841192. Part 14: Convert all usage of nsDisplayClip(RoundedRect) to use DisplayListClipState/DisplayItemClip. r=mattwoodrow 
This patch does several things. Sorry.

In BuildDisplayList implementations, instead of wrapping display items in nsDisplayClip, we
push clip state onto the nsDisplayListBuilder and give the display items an
explicit clip when they're created.

In FrameLayerBuilder, we use the explicit clips we find on display items instead of
computing our own.

We remove nsDisplayClip and everything that depends on it.

We remove ExplodeAnonymousChildLists. With nsDisplayClip gone, and
nsDisplayOptionEventGrabber removed in a previous patch, there are no
anonymous child lists.

nsDisplayItem::TryMerge implementations need to make sure they have the same
clip before being merged.

I ripped out the part of PruneDisplayListForExtraPage that adjusts clip rects.
As far as I can tell, it isn't actually necessary.

--HG--
extra : rebase_source : 6f3988b385d0ac54ab26fad10b12173884441f48
 2013-03-04 22:56:02 +13:00
Cameron McCormack
1d87113442 Bug 842142 - Prevent odd text wrapping in SVG text. r=roc 2013-03-25 14:50:59 +11:00
Boris Zbarsky
462f47d89e Bug 852428 part 2. Make nsIFrame::Init infallible. r=dholbert 2013-03-19 21:47:48 -04:00
Seth Fowler
a7ffe81d52 Bug 842850 (Part 1) - Use an SVGImageContext class for overridden SVG properties. r=dholbert,joe sr=bz 2013-02-28 12:22:43 -08:00
Seth Fowler
5c32b0dad7 Bug 825720 - Don't use GetRootLayoutFrame to calculate the size of SVG images. r=joe 2013-01-10 19:38:34 -08:00
Ryan VanderMeulen
34cc5e3c2c Speculatively backout changeset e8d73b8ba1a1 (bug 825720) for Android armv6 reftest 2 timeouts. 2013-02-20 12:20:12 -05:00
Seth Fowler
704abaa919 Bug 825720 - Don't use GetRootLayoutFrame to calculate the size of SVG images. r=joe 2013-01-10 19:38:34 -08:00
L. David Baron
5ef4421fa5 Bug 781360 patch 3: Rename {nsIFrame,nsStyleContext,nsComputedDOMStyle}::GetStyle* to Style*, since they can never return null. r=dholbert 
Except for the changes in:
  layout/generic/nsIFrame.h (part)
  layout/style/nsComputedDOMStyle.h (all)
  layout/style/nsRuleNode.cpp (part)
  layout/style/nsStyleContext.cpp (part)
  layout/style/nsStyleContext.h (part)
(see patch 3b in the bug), this patch was written with the sed script:
s/\<GetStyle\(Font\|Color\|List\|Text\|Visibility\|Quotes\|UserInterface\|TableBorder\|SVG\|Background\|Position\|TextReset\|Display\|Content\|UIReset\|Table\|Margin\|Padding\|Border\|Outline\|XUL\|SVGReset\|Column\)\>/Style\1/g
 2013-02-16 13:51:02 -08:00
Robert O'Callahan
013943dc4f Bug 840902. Part 2: Remove nsresults from various display list methods. r=mattwoodrow 
--HG--
extra : rebase_source : de498510bf8d85d9b0b2fab0137ef3be01c9adfa
 2013-02-15 00:12:27 +13:00
Robert O'Callahan
a2485753ff Bug 840902. Part 1: Stop checking the results of various display list methods. r=mattwoodrow 
--HG--
extra : rebase_source : 50a3d6809ef76a25a3d02d91f2873d9ba11fdc56
 2013-02-15 00:08:08 +13:00
L. David Baron
b387f0fbea Bug 841789, patch 1: Rename nsIFrame::GetStyleContext() to nsIFrame::StyleContext() since it can never return null. r=dholbert 
This makes it conform to our convention that getters returning pointers
that can never be null do not begin with "Get".
 2013-02-15 21:38:33 -08:00
Boris Zbarsky
290dde2392 Bug 831780. Only count the broken-image placeholder in the visual overflow, not the scrollable overflow. r=mattwoodrow 2013-01-17 23:17:41 -05:00
Mats Palmgren
d5826be6d7 Bug 786533 - Replace NS_MIN/NS_MAX with std::min/std::max and #include <algorithm> where needed. r=ehsan 2013-01-15 13:22:03 +01:00
Ryan VanderMeulen
e59d7421d3 Backed out changeset c8fe09ac1842 (bug 825720) on suspicion of making bug 772443 nearly perma-orange. 2013-01-12 21:00:30 -05:00
Seth Fowler
2a183d535a Bug 825720 - Don't use GetRootLayoutFrame to calculate the size of SVG images. r=joe 2013-01-10 19:38:34 -08:00
Alexander Surkov
fae1108201 Bug 810572, part 2.5 - rename AccType constants again, r=tbsaunde, sr=roc 2012-12-18 10:25:52 +09:00
Jeff Walden
e0523203c9 Bug 820570 - Move mozilla::DebugOnly into DebugOnly.h to pare down the grab-baggish Util.h. r=Ms2ger 2012-12-14 18:58:45 -05:00
Jeff Muizelaar
5a168d2ab1 Bug 801061. Switch from imgIRequest to imgRequestProxy. r=joe 
This doesn't switch all of the users yet, but is a step in the right
direction.

--HG--
extra : rebase_source : 91b4fef3f67586179c119208d000cf7629e04963
 2012-10-12 08:43:01 -04:00
Alexander Surkov
5801a37df4 Bug 810572, part2 - remove 'Accessible' postfix from AccTypes constants, r=tbsaunde, sr=roc 2012-12-12 19:04:12 +09:00
Mats Palmgren
11281fb75a Bug 814677 - Replace XP_IS_SPACE with dom::IsSpaceCharacter and add form-feed to match DOM spec. r=bz 2012-11-30 17:04:11 +01:00
Matt Woodrow
80ce32fa9d Bug 815593 - Remove unused variable. r=bustage 2012-11-29 19:01:48 +13:00
Robert O'Callahan
f9199a2935 Bug 815593. Don't layerize images that exceed MaxTextureSize. r=mattwoodrow 
--HG--
extra : rebase_source : f94300b24b90d063df095324663c9d8fa49e42e9
 2012-11-28 15:34:45 +13:00
Matt Woodrow
caced635cb Bug 811927 - Allow conversion of nsDisplayBackgroundImage into ImageLayers. r=roc 2012-11-19 16:28:18 +13:00
Jeff Muizelaar
985473d336 Bug 794957. Use imgLoader instead of imgILoader. r=joe 
This makes use of imgLoader instead of imgILoader in more places.

--HG--
extra : rebase_source : 6b391e5ecc2fd9558516c7493116e7e7852b71b3
 2012-11-16 10:24:58 -08:00
Boris Zbarsky
b3d79ce6da Bug 810876. Don't double-count the size of our placeholder when determining the overflow area for an image frame. r=mattwoodrow 2012-11-14 10:05:41 -08:00
Seth Fowler
f5d66e49dc Bug 807556 - Remove imgIRequest::loadImage's aRequest argument. r=joe 2012-11-03 23:04:07 -04:00
Matt Woodrow
20ea8a7f1c Bug 805696 - Always invalidate nsImageFrames when we change to a new image request. r=joe 2012-11-01 14:25:44 +13:00
Trevor Saunders
31db47e358 bug 542039 - accessible object types r=surkov, roc 2012-09-28 17:53:44 -04:00
Josh Matthews
e5b76c73ef Bug 505385 - Part 18: Reduce number of notifications - START_REQUEST/START_CONTAINER -> SIZE_AVAILABLE, remove START_DECODE and START_FRAME. Rename remaining ones for clarity. r=joe 2012-10-12 12:11:23 -04:00
Josh Matthews
e9be8ac74c Bug 505385 - Part 13: Remove OnStopContainer and make OnStopDecode a true decode notification. r=joe 2012-10-12 12:11:22 -04:00
Josh Matthews
31e9ef66cd Bug 505385 - Part 11: Create a new imgINotificationObserver interface to replace all uses of imgIContainerObserver and imgIDecoderObserver outside of image/. r=joe 2012-10-12 12:11:22 -04:00
Josh Matthews
e82f309179 Back out bug 585385 for build bustage. 2012-10-11 21:58:24 -04:00
Josh Matthews
d64a2c9b5a Bug 505385 - Part 18: Reduce number of notifications - START_REQUEST/START_CONTAINER -> SIZE_AVAILABLE, remove START_DECODE and START_FRAME. Rename remaining ones for clarity. r=joe 2012-10-11 21:34:24 -04:00
Josh Matthews
db4200e616 Bug 505385 - Part 13: Remove OnStopContainer and make OnStopDecode a true decode notification. r=joe 2012-10-11 21:34:23 -04:00
Josh Matthews
d09d8af2a1 Bug 505385 - Part 11: Create a new imgINotificationObserver interface to replace all uses of imgIContainerObserver and imgIDecoderObserver outside of image/. r=joe 2012-10-11 21:34:23 -04:00
Matt Woodrow
5b541f16bf Bug 781053 - Part 2 - Trigger empty transactions when an animated image in an ImageLayer changes frame. r=roc 2012-09-25 08:31:30 +12:00
Matt Woodrow
b393ee686c Bug 539356 - Avoid some causes of unnecessary painting. r=roc 2012-09-26 11:59:56 +12:00
Matt Woodrow
967a15e46e Bug 539356 - Add an option for frames to invalid just a rect instead of the frame bounds. r=roc 2012-08-29 17:48:45 +12:00
Matt Woodrow
dcab94e36a Bug 769922 - Implement nsDisplayAltFeedback, since it can draw outside of the frame's overflow rect. r=roc 2012-08-29 17:48:44 +12:00
Matt Woodrow
a3f71d5ce2 Bug 539356 - Part 27 - Make nsImageFrame's overflow include the AltFeedback image if it will use one. r=roc 2012-08-29 17:48:44 +12:00
Matt Woodrow
1d675c61d6 Bug 539356 - Part 9c - Remove old invalidation code. r=bz 2012-08-29 17:39:31 +12:00
Ed Morley
5a3b322459 Revert mozilla-inbound to e4dd1fa6d222 for crashes and test failures on a CLOSED TREE 2012-09-27 16:34:46 +01:00
Matt Woodrow
2d16b9b765 Bug 781053 - Part 2 - Trigger empty transactions when an animated image in an ImageLayer changes frame. r=roc 2012-09-25 08:31:30 +12:00
Matt Woodrow
3dbcaaf211 Bug 539356 - Avoid some causes of unnecessary painting. r=roc 2012-09-26 11:59:56 +12:00
Matt Woodrow
5eaaebce0e Bug 539356 - Add an option for frames to invalid just a rect instead of the frame bounds. r=roc 2012-08-29 17:48:45 +12:00
Matt Woodrow
2b22c734f5 Bug 769922 - Implement nsDisplayAltFeedback, since it can draw outside of the frame's overflow rect. r=roc 2012-08-29 17:48:44 +12:00
Matt Woodrow
7b249bb8e5 Bug 539356 - Part 27 - Make nsImageFrame's overflow include the AltFeedback image if it will use one. r=roc 2012-08-29 17:48:44 +12:00
Matt Woodrow
49d4c24594 Bug 539356 - Part 9 - Implement DLBI. r=roc,bz,jwatt 2012-08-29 17:38:58 +12:00
Phil Ringnalda
16e0947c04 Back out 85d6cbd01d39, 56fc051c1932, a2ad17b87332 (bug 781053) for OS X debug assertions and crashes 
--HG--
extra : rebase_source : ab24a2f8e9eddcf33ea39344abb7afbf400bf6e0
 2012-09-24 21:23:05 -07:00
Matt Woodrow
aed7d4ce0a Bug 781053 - Part 2 - Trigger empty transactions when an animated image in an ImageLayer changes frame. r=roc 2012-09-25 08:31:30 +12:00
Chris Lord
2e05174430 Bug 788202 - Add optional subdocument traversal to nsIFrame::List. r=bz 
Add subdocument frame traversal to nsIFrame::List, controlled via an optional
flag.
 2012-09-19 15:36:35 +01:00
Chris Lord
47481277ba Backout bug 788202 for build failures. 2012-09-19 14:05:26 +01:00
Chris Lord
2e7ad14aa1 Bug 788202 - Add optional subdocument traversal to nsIFrame::List. r=bz 
Add subdocument frame traversal to nsIFrame::List, controlled via an optional
flag.
 2012-09-19 12:39:53 +01:00
Matt Woodrow
8684475c74 Bug 788044 - Make inactive layer subtrees relative to the ContainerLayer, not the reference frame. r=roc 2012-09-17 10:25:33 +12:00
Randell Jesup
29ac5c0b8c Bug 773151: Convert nsCAutoString->nsAutoCString CLOSED TREE r=bsmedberg 2012-09-01 22:35:17 -04:00
Josh Matthews
1c909a96b0 Bug 722861 - Add privacy information to image requests, and use a separate cache for private requests. r=joe 2012-06-26 00:20:12 -04:00
Josh Matthews
9992fafc63 Back out bug 722861. 2012-08-27 15:31:29 -04:00
Josh Matthews
081b3a0cda Bug 722861 - Add privacy information to image requests, and use a separate cache for private requests. r=joe 2012-06-26 00:20:12 -04:00
Ehsan Akhgari
8c296bbcd4 Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg 
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.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 PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
 2012-08-22 11:56:38 -04:00
Nicolas Silva
54dd2bf57f Bug 782372 - Splits ImageLayers.h into ImageLayers.h ImageContainer.h and ImageTypes.h, r=bgirard 2012-08-19 15:33:25 -04:00
Aryeh Gregor
982100775b Bug 780618 - Move all error codes to nsError.h; r=ehsan 2012-07-27 17:03:27 +03:00
Ms2ger
331accfcb4 Bug 780387 - Part b: Stop using PRIntn; r=bsmedberg 2012-08-09 09:09:40 +02:00
David Zbarsky
02175ccbab Bug 706179 Part 3: Turn on the use of scaling for layers in FrameLayerBuilder r=mattwoodrow 2012-08-03 14:29:22 -07:00
David Zbarsky
312c029975 Bug 706179 Part 2: Add a BaseTransform and scaling to layers, r=roc, cjones 2012-07-30 19:20:00 -07:00
Mark Finkle
a4d33f44cf Backout 169ff207ed19, a34baed70c1b, f9ccdd490bd7, 39550ed860e6, 2194a2dd66b2, 908eb2e26843, a76e0a267f26 due to mobile viewport bustage (bug 778580) 2012-07-30 14:36:12 -04:00
Aryeh Gregor
57c0ad57fb Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
David Zbarsky
8bda81abf5 Bug 706179 Part 2: Add a BaseTransform to layers r=roc 2012-07-27 13:23:45 -07:00
Ed Morley
0981437de6 Backout 1244b8a8e57a (bug 755084), 32d16d0f87c9 (bug 706179), 8548e016d4a9 (bug 768440), 697f5b87eae9 (bug 768440), 808fc2bd4e8c (bug 755084), 54b1484cd125 (bug 755084), 876726b632c0 (bug 706179) for xul android R3 failures 2012-07-25 16:37:04 +01:00
David Zbarsky
30025de69a Bug 706179 Part 2: Add a BaseTransform to layers to return the layer's transform without scaling applied r=roc 2012-07-25 01:48:10 -07:00
Ehsan Akhgari
6ef72aef93 Backout changeset f568fc280fb0 (bug 539356) because of performance and correctness regressions 2012-07-03 20:24:55 -04:00
Ehsan Akhgari
2907973d39 Backout changeset b59fde84e97f (bug 539356) because of performance and correctness regressions 2012-07-03 20:08:35 -04:00
Ehsan Akhgari
4f3c9178d0 Backout changeset c862a7dd7851 (bug 769922) because DLBI is being backed out 2012-07-03 19:39:13 -04:00
Matt Woodrow
52fb0bc144 Bug 769922 - Add nsDisplayAltFeedback so that alt feedback images get invalidated correclty. r=roc 2012-07-03 13:03:40 +12:00
Matt Woodrow
b992afd084 Bug 539356 - Part 27 - Make nsImageFrame's overflow include the AltFeedback image if it will use one. r=roc 2012-06-30 15:06:13 +12:00
Matt Woodrow
1f0dbc7c74 Bug 539356 - Part 9 - Implement DLBI. r=roc,bz,jwatt 2012-06-30 15:06:11 +12:00
Jonathan Watt
9ac7bb2267 Bug 767388 - Kill NS_DEBUG. r=bz. 
--HG--
extra : rebase_source : d045208a26345712dbb4628c973c616cd9504f28
 2012-06-25 20:59:42 +01:00
Trevor Saunders
1192ef8bd9 bug 759033 - nsAccessible -> Accessible and nsAccessibleWrap -> AccessibleWrap r=surkov 
--HG--
rename : accessible/src/atk/nsAccessibleWrap.cpp => accessible/src/atk/AccessibleWrap.cpp
rename : accessible/src/atk/nsAccessibleWrap.h => accessible/src/atk/AccessibleWrap.h
rename : accessible/src/base/nsAccessible.cpp => accessible/src/generic/Accessible.cpp
rename : accessible/src/base/nsAccessible.h => accessible/src/generic/Accessible.h
rename : accessible/src/mac/nsAccessibleWrap.h => accessible/src/mac/AccessibleWrap.h
rename : accessible/src/mac/nsAccessibleWrap.mm => accessible/src/mac/AccessibleWrap.mm
rename : accessible/src/msaa/nsAccessibleWrap.cpp => accessible/src/msaa/AccessibleWrap.cpp
rename : accessible/src/msaa/nsAccessibleWrap.h => accessible/src/msaa/AccessibleWrap.h
rename : accessible/src/other/nsAccessibleWrap.cpp => accessible/src/other/AccessibleWrap.cpp
rename : accessible/src/other/nsAccessibleWrap.h => accessible/src/other/AccessibleWrap.h
 2012-05-28 21:18:45 -04:00
Ed Morley
f0346ff780 Merge mozilla-central to mozilla-inbound 2012-05-21 13:19:38 +01:00
Gervase Markham
87620f5676 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
L. David Baron
3ab78f01f9 Remove width determination parameters from font inflation methods. (Bug 747720, patch 5) r=roc 
These are no longer needed since we're getting the width from the
nsFontInflationData.
 2012-05-20 22:18:28 -07:00
Adam Dane [:hobophobe]
d67d1141cb Bug 733553 - Allow multipart image streams to cope with stream changes. r=joe 2012-05-19 14:32:37 -05:00
Ryan VanderMeulen
dc10c85eb0 Backout bug 733553 due to mochitest orange. 2012-05-19 12:10:26 -04:00
Adam Dane [:hobophobe]
9c321e4de0 Bug 733553 - Allow multipart image streams to cope with stream changes. r=joe 2012-05-08 21:35:32 -05:00
Joe Drew
14a6d481db Back out changeset 501d38d3892c (Bug 733553) for causing crashes in xpcshell tests. 2012-05-08 21:59:30 -04:00
Adam Dane [:hobophobe]
c6313176ac Bug 733553 - Allow multipart image streams to cope with stream changes. r=joe 
--HG--
extra : rebase_source : 21ebc85f26fcbc4a4a27387d1ec5007c0886c386
 2012-05-08 16:19:01 -05:00
Andreas Gal
dceb01a952 Do image scaling on the GPU (bug 650988, r=roc,cjones). 2012-05-03 07:05:55 -07:00
Boris Zbarsky
98a2048efb Bug 721659. Update the width/height of an image synchronously when src is set to something that was preloaded. r=bholley 2012-03-19 18:22:02 -04:00
Daniel Holbert
ce6dc9863d Bug 732610 - Make nsIFrame::ComputeSize take a bitfield 'aFlags' instead of a bool 'aShrinkWrap'. r=dbaron 2012-03-16 11:01:05 -07:00
Alexander Surkov
12cc97eaa6 Bug 732389 - image map accessible tree is not updated when image map is changed, r=bz, tbsaunde 2012-03-15 16:16:02 -04:00
Nathan Froyd
7adb7a65ea Bug 731615 - Eliminate duplicate headers in layout. rs=smontagu 2012-02-29 10:57:47 -05:00