Commit Graph

603 Commits

Author SHA1 Message Date
L. David Baron
12c8120dc8 Bug 804970, patch 5: Handle dynamic changes to the basis for 'rem' units by rebuilding all style data. r=bzbarsky 2012-10-26 19:04:20 +02:00
L. David Baron
0fac8d37bf Bug 804970, patch 3: Don't force vw/vh/vmin/vmax units out of the rule tree. r=bzbarsky 2012-10-26 19:04:20 +02:00
L. David Baron
26b86aa5e3 Bug 804970, patch 1: Don't force calc() units out of the rule tree. r=bzbarsky
This moves the calc() handling above the aCanStoreInRuleTree = false,
which it had no reason to be below.

calc() units are still forced out of the rule tree when there's an em,
ex, or rem unit inside the calc() structure, since aCanStoreInRuleTree
is passed through to the leaf CalcLengthWith calls.
2012-10-26 19:04:20 +02:00
Jonathan Kew
fcf46d88fe bug 804644 - convert Cocoa points to _un_scaled device pixels for system font sizes. r=roc 2012-10-23 21:09:23 +01:00
Seth Fowler
ed0c222ddd Bug 503720: Implement vw/vh/vmin/vmax. r=dbaron 2012-10-19 16:21:06 -07:00
L. David Baron
58405dbcaf Bug 823124: Add diagnostic (and otherwise good-to-have) assertion that non-root rule nodes must have a non-null rule (and vice-versa). 2012-12-21 14:36:53 -05:00
Cameron McCormack
154f38b92a Bug 793617 - Implement mask-type property. r=dbaron,longsonr 2012-12-21 11:15:22 +11:00
Yu-Sian (Thomasy) Liu
e7b15a81a9 Bug 594935: Add calc to parser, do calc in PaintGradient and add stop point to HasCalc(). r=bz 2012-10-03 22:31:56 -07:00
Jonathan Kew
ed41d7aef7 bug 674373 pt 4 - pass device-to-CSS pixel ratio to LookAndFeel code when requesting a font style. r=roc 2012-09-29 12:35:08 +01:00
Edwin Flores
3c306b446c Bug 719286 - Add support for -moz-objectValue keyword to CSS parser for SVG glyphs r=dbaron 2012-09-06 16:58:47 +12:00
Edwin Flores
f5a2675bcf Bug 719286 - Add support for -moz-objectFillOpacity and -moz-objectStrokeOpacity to CSS parser for SVG glyphs r=dbaron 2012-09-06 16:58:46 +12:00
Edwin Flores
4e81980066 Bug 719286 - Add support for objectfill and objectstroke values to CSS parser r=dbaron 2012-09-06 16:58:46 +12:00
Daniel Holbert
c62fdc18d3 Bug 763689 patch 3: Support min-height:auto in computed style, and add special cases as necessary wherever it's read. r=dbaron 2012-09-04 16:26:11 -07:00
Daniel Holbert
bb17bc6aff Bug 763689 patch 2: Support min-width:auto in computed style, and add special cases as necessary wherever it's read. r=dbaron 2012-09-04 16:26:10 -07:00
Kyle Huey
8443a7a8f1 Bug 783162: Make mapped attributes hold the image alive. r=bz
The nsCSSValue in nsGenericHTMLElement::MapBackgroundInto is a temporary.  This causes a problem after Bug 697230 landed, because the nsCSSValue::Image we put into that value is destroyed once we're done doing style stuff.  Previously the nsImageLoader would grab the request off the nsCSSValue::Image and hold it alive.  Bug 697230 changed the behavior here; now when the nsCSSValue::Image is destroyed it tells the image loader to drop the request.  The result is that all the references to the request are dropped and the frame is never told it has a background.

The solution is to keep the nsCSSValue::Image alive longer.  This patch adds two new types of nsAttrValue.  The first is an nsCSSValue::URL.  A ParseBackgroundAttribute method is added on nsGenericHTMLElement that the relevant elements (body/td/th/table/tr/tbody/thead/tfoot) call that parses background into an nsCSSValue::URL.  The second is an nsCSSValue::Image.  nsGenericHTMLElement::MapBackgroundInto attempts to convert the nsCSSValue::URL into an nsCSSValue::Image by kicking off the image load.  The result is that image loads are only started when the element is actually visible.  This also mirrors the way background-image works.  This also allows us to fix two longstanding bugs in this code.  Since MapBackgroundInto doesn't have a pointer to the actual element, it relied on grabbing the principal of the document.  Now we can grab the principal of the node in ParseBackgroundAttribute.  MapBackgroundInto also has no way to get at the element's base URI (to honor xml:base), which is now possible in ParseBackgroundAttribute.

nsCSSValue::[Image|URL] have also been moved to be mozilla::css::[Image|URL]Value.  nsAttrValue.h is included in external linkage code, so it can't include nsCSSValue.h to get the declarations of nsCSSValue::[Image|URL], and nested classes can't be forward declared.  Moving the classes to a namespace solves the problem.

Finally some old inoperative quirks mode code was removed.  This code has done nothing since Bug 273078 was landed in 2004.
2012-08-24 10:50:49 -07:00
Ehsan Akhgari
e368dc9c85 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
L. David Baron
31b5c3639b Track whether nsStyleVisibility::mLanguage came from explicit information in the document. (Bug 702121, patch 1) r=jfkthame 2012-08-20 19:23:32 -07:00
Kyle Huey
2e07e6f8c2 Bug 697230: Part 1 - Centralize style image observers. r=bz 2012-08-13 15:04:19 -07:00
Jonathan Kew
22fe279335 bug 721750 - support text-shadow property on ::-moz-selection. r=dbaron 2012-08-04 19:52:21 +01:00
Cameron McCormack
5e22f14219 Bug 655877 - Part 15: Don't treat SVG text frames as being positioned. r=roc 2012-08-02 21:38:50 +10:00
Scott Johnson
63993f05d9 Bug 764567: Implement column-fill part of CSS3 multicol spec, now with regression fixes [r=roc]. 2012-07-31 11:21:19 -05:00
Aryeh Gregor
d0ad5a7d0c Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
Cameron McCormack
803f9f3bf4 Bug 774968 - line-height percentage value not computed accurately. r=dbaron
--HG--
extra : rebase_source : 93885c1b2ef72d673a935c135f89cc06bc58136d
2012-07-20 07:03:35 +10:00
Boris Zbarsky
496f1a1325 Bug 771594. Allow preference control over what CSS properties we parse. r=dbaron,dholbert 2012-07-13 19:59:05 -04:00
Masatoshi Kimura
85d5ae2b8f Bug 752187 - Part 10: Implement rendering unprefixed gradients. r=dbaron 2012-07-07 10:27:08 -04:00
Masatoshi Kimura
2a19870d92 Bug 752187 - Part 9: Implement unprefixed radial-gradient parsing. r=dbaron 2012-07-07 10:27:08 -04:00
Masatoshi Kimura
63ae4a505b Bug 752187 - Part 6: Rename mIsToCorner to mIsLegacySyntax. r=dbaron 2012-07-07 10:27:08 -04:00
Daniel Holbert
131f2b5d0d Bug 696253, patch 7: implement parsing/computation for CSS property 'flex-basis'. r=dbaron 2012-07-06 17:06:23 -07:00
Daniel Holbert
c7782ae98e Bug 696253, patch 6: implement parsing/computation for CSS properties 'flex-grow' and 'flex-shrink'. r=dbaron 2012-07-06 17:06:22 -07:00
Daniel Holbert
0dd40b90f7 Bug 696253, patch 5: implement parsing/computation for CSS property 'align-self'. r=dbaron 2012-07-06 17:06:21 -07:00
Daniel Holbert
85e8349a15 Bug 696253, patch 4: implement parsing/computation for CSS property 'align-items'. r=dbaron 2012-07-06 17:06:21 -07:00
Daniel Holbert
9e077e40c9 Bug 696253, patch 3: implement parsing/computation for CSS property 'flex-direction'. r=dbaron 2012-07-06 17:06:20 -07:00
Daniel Holbert
4fe6be60d1 Bug 696253, patch 2: implement parsing/computation for CSS property 'order'. r=dbaron 2012-07-06 17:06:19 -07:00
Daniel Holbert
e193caf93a Bug 696253, patch 1: implement parsing/computation for CSS property 'justify-content'. r=dbaron 2012-07-06 17:06:19 -07:00
Daniel Holbert
0432772643 Bug 666041 patch 2: Add "-moz-flex" & "-moz-inline-flex" values for "display" property. r=bz 2012-06-26 15:11:38 -07:00
Scott Johnson
f9c641e24b Bug 733614: Backout changes from bug 695222 for mozilla 16 branch [r=dbaron]. 2012-06-13 11:00:56 -05:00
Daniel Holbert
ebdb5c86fb Bug 763689: Add "auto" keyword for min-height and min-width, which for now just computes to 0. r=bz 2012-06-12 10:48:20 -07:00
Nathan Froyd
d2af2caa01 Bug 674922 - report on most common objects allocated in a PresShell's arena; r=roc,njn 2012-06-06 13:35:40 -04:00
Ms2ger
b9cdb58b83 Bug 629882 - Support currentColor in the 2D canvas context; r=dbaron
This changes nsCSSParser::ParseColorString to fill in an nsCSSValue instead
of an nscolor, and exposes nsRuleNode::ComputeColor to turn this nsCSSValue
into an nscolor.

Because gradients can be used with different canvas elements in different
documents, these cannot pass useful values for nsRuleNode::ComputeColor's
aPresContext and aStyleContext arguments. This patch also changes SetColor
to deal with those parameters being null.
2012-06-06 09:36:38 +02:00
Shriram Kunchanapalli
52ac1d5caf Bug 219767: Move font size functions in nsStyleUtil into nsRuleNode. r=dbaron 2012-05-31 10:09:46 +05:30
Gervase Markham
82ff7027aa Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Robert Longson
8953e7caaf Bug 528332 - Implement non-scaling-stroke vector-effect. Part 1 - style system changes r=dbaron 2012-05-18 09:33:40 +01:00
Boris Zbarsky
c8acd24873 Bug 753397. Add a field to nsCSSPropList for a preference that controls the property. r=dbaron
The actual controlling is not hooked up yet; that will happen in bug 753522 for
the DOM reflections of properties.
2012-05-09 21:29:37 -04:00
Makoto Kato
e70f17856c Bug 249159 - Part 2 Implement CSS3 Text word-break property. r=dbaron, smontagu 2012-05-07 12:18:23 -07:00
L. David Baron
bad1e080cc Examine parentBorder only when parentContext is non-null. (Bug 749860) r=bzbarsky 2012-04-27 21:56:31 -07:00
John Daggett
4984947d00 Bug 718539. Update font-feature-settings to latest spec syntax. r=dbaron 2012-04-26 15:24:26 +09:00
Patrick Wong
4ccd1d2fbb Bug 745659 - Removed the nsPrintfCString constructor which takes a length and all corresponding instances that call that particular constructor. This is accomplished by removing the length component from the instantiation. r=jlebar 2012-04-24 14:43:00 -04:00
Kyle Huey
5e3fddb58d Back out Bug 679230 due to Android reftest failures. 2012-04-07 10:36:49 -07:00
Kyle Huey
dd495263dd Bug 697230: Part 1 - Centralize style image observers. r=bz 2012-04-07 08:58:41 -07:00
Nathan Froyd
68a79f10ae Bug 731615 - Eliminate duplicate headers in layout. rs=smontagu 2012-02-29 10:57:47 -05:00
Lazar Sumar
e55f832fac Bug 548375 - Implement css3-background background-repeat property two value syntax. r=dbaron 2012-02-24 21:23:14 -08:00
Zack Weinberg
f4fb4a1991 Bug 729142 - Convert layout/style to MOZ_STATIC_ASSERT. r=dbaron 2012-02-23 08:19:00 -08:00
Zack Weinberg
55006e6a38 Bug 96971: Move GetSystemFont from nsDeviceContext to mozilla::LookAndFeel. r=roc 2012-02-20 15:19:48 -08:00
Lazar Sumar
c075b7dd27 Bug 522607 - New css3-background background-position syntax. r=dbaron 2012-02-20 13:14:42 +13:00
Jonathan Watt
f4f67ef82f Bug 416581, part 2 - Pay attention to the 'lang' attribute when fetching the user's font prefs for the CSS cascade. r=dbaron. 2012-01-25 23:52:26 +00:00
Boris Zbarsky
e0c4316236 Bug 716628. Implement support for 'turn' unit in CSS. r=dbaron 2012-02-04 00:01:23 -05:00
Daniel Holbert
8fa0f10c1e Bug 695222 followup: fix indentation in column-fill chunk of nsRuleNode::ComputeColumnData. [ whitespace-only, DONTBUILD ] 2012-01-25 16:52:19 -08:00
Jonathan Watt
f36738d918 Bug 416581, part 1 - Move mLanguage from nsStyleVisibility to nsStyleFont. r=dbaron. 2012-01-24 13:09:55 +00:00
Simon Montagu
a05832e834 Implement text-align-last. Bug 536557, r=dbaron 2012-01-12 19:52:21 +02:00
Ed Morley
afde8417a5 Backout 6605cc311ec5 & 9217303c2e5c (bug 536557) for M4 orange 2012-01-12 15:33:00 +00:00
Simon Montagu
ad89de3591 Implement text-align-last. Bug 536557, r=dbaron 2012-01-12 16:29:20 +02:00
Scott Johnson
1575ebf83f Bug 695222 - Implement column-fill part of CSS3 multicol spec. r=roc,dbaron 2011-12-25 23:25:59 -06:00
William Chen
6040dbfcfa Bug 497995: Part 3 - Cleanup nsCoord initial value handling. r=dbaron
--HG--
extra : rebase_source : 9ed22aa9e24016566fe0e843e6019c4a583ca788
2011-12-22 18:35:02 -05:00
William Chen
e1ff790f8b Bug 497995: Part 1 - Implement border-image revisions in latest css3-background spec. r=dbaron
--HG--
extra : rebase_source : 5a6cdac6a4b1353170f23f39dd2a209374e72531
2011-12-22 18:34:45 -05:00
Boris Zbarsky
101f2ecf55 Bug 700221. Don't pay attention to whether author color are allowed when deciding whether a change to a non-color property should drop native theming. r=dbaron 2011-12-21 16:53:21 -05:00
Scott Johnson
aef90f0f50 Backout changeset 93f523345fb6. 2011-12-20 00:01:32 -06:00
Scott Johnson
35fbd86079 Bug 695222 - Implement column-fill part of CSS3 multicol spec. r=roc,dbaron 2011-12-19 23:11:54 -06:00
Scott Johnson
578a640a52 Backed out changeset 74555805376d 2011-12-19 23:08:52 -06:00
Scott Johnson
d6fe638038 Bug 695222 - Implement column-fill part of CSS3 multicol spec. r=roc,dbaron 2011-12-19 22:25:19 -06:00
Andrew Quartey
6fe0fd072a Bug 706010 - Remove NS_SPECIALIZE_TEMPLATE and HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX; r=khuey a=cleanup/removal 2011-12-13 14:17:59 +00:00
Ali Juma
40b68ad93d Bug 586863 - Eliminate #ifdef GFX_HAS_INVERT blocks since GFX_HAS_INVERT is never defined. r=dbaron 2011-12-09 14:18:05 -05:00
L. David Baron
59c0a28be1 Add support for -moz-text-size-adjust CSS property. (Bug 627842, patch 1) r=bzbarsky
This property is analogous to the -webkit-text-size-adjust property (and
*maybe* also the -ms-text-size-adjust property).  It allows pages to opt
out of text size adjustments performed on mobile devices by specifying
-moz-text-size-adjust: none.
2011-11-23 18:48:23 -08:00
Boris Zbarsky
50e24a68bc Bug 608756. Cache display structs in the ruletree even for floated and positioned elements. r=dbaron
The basic idea is that mOriginalDisplay and mOriginalFloats are kept synchronized with mDisplay and mFloats unless the latter are changed due to position:absolute/fixed (for both) or float:left/right (for display).  When initializing an nsStyleDisplay from a start struct, we restore the values from mOriginalDisplay/Floats to get correct behavior.
2011-10-29 03:04:20 -04:00
Masatoshi Kimura
270439fd7b Bug 685400 - add "to" syntax and "magic corner" feature to CSS linear gradient. r=dbaron
--HG--
rename : layout/reftests/css-gradients/linear-ref.html => layout/reftests/css-gradients/linear-1-ref.html
rename : layout/reftests/css-gradients/linear.html => layout/reftests/css-gradients/linear-1b.html
rename : layout/reftests/css-gradients/linear-diagonal-1-ref.html => layout/reftests/css-gradients/linear-diagonal-1c.html
rename : layout/reftests/css-gradients/linear-diagonal-2-ref.html => layout/reftests/css-gradients/linear-diagonal-2c.html
rename : layout/reftests/css-gradients/linear-diagonal-3-ref.html => layout/reftests/css-gradients/linear-diagonal-3c.html
rename : layout/reftests/css-gradients/linear-diagonal-4-ref.html => layout/reftests/css-gradients/linear-diagonal-4c.html
rename : layout/reftests/css-gradients/linear-keywords-ref.html => layout/reftests/css-gradients/linear-keywords-1-ref.html
rename : layout/reftests/css-gradients/linear-keywords.html => layout/reftests/css-gradients/linear-keywords-1b.html
2011-10-22 21:41:11 +02:00
Ehsan Akhgari
92064e6d3f Bug 690892 - Replace PR_TRUE/PR_FALSE with true/false on mozilla-central; rs=dbaron
Landing on a CLOSED TREE
2011-10-17 10:59:28 -04:00
Jeff Walden
b5e57820bf Bug 693469 - Implement mozilla::ArrayLength and mozilla::ArrayEnd, and replace uses of NS_ARRAY_LENGTH whenever possible. (Exceptions: assigning to static initializers, use in static assertions, as template parameters, etc. These will go away when the relevant compilers have C++11 constexpr support.) r=cjones
--HG--
extra : rebase_source : b4bae9a0f85abf2feb828609b50e756916b99a6f
2011-10-10 22:50:08 -07:00
Jeff Walden
d0532c3e95 Back out everything since 5435ee09cf7b. Tinderbox compilers hate me. r=epic-fail 2011-10-12 12:21:53 -07:00
Jeff Walden
0f30b277bf Bug 639469 - Implement mozilla::ArrayLength and mozilla::ArrayEnd, and replace uses of NS_ARRAY_LENGTH whenever possible. r=cjones
--HG--
extra : rebase_source : 860a8271bf7e51cde358f2a4185c410de1fc2960
2011-10-10 22:50:08 -07:00
Mats Palmgren
9fc0be400e Bug 684266 - Do ellipsing on the end-edge only when a single value was specified for text-overflow. r=bzbarsky r=roc 2011-10-12 18:20:46 +02:00
Michael Wu
d2b70213ac Bug 675553 - Switch from PRBool to bool on a CLOSED TREE , r=bsmedberg,khuey,bz,cjones
--HG--
rename : tools/trace-malloc/bloatblame.c => tools/trace-malloc/bloatblame.cpp
2011-09-28 23:19:26 -07:00
Masayuki Nakano
e848ae236f Bug 669028 part.11 layout/style should use mozilla;LookAndFeel rather than nsILookAndFeel r=dbaron 2011-09-09 11:27:12 +09:00
Matt Woodrow
b98fe1bd08 Bug 505115 - Part 14a - Add -moz-transform-style css property. r=dbaron 2011-08-27 12:01:06 +12:00
Mats Palmgren
beabba5960 Bug 677582 - Implement CSS3 text-overflow: <left> <right> in the style system. r=dbaron 2011-08-20 22:41:39 +02:00
L. David Baron
b47daece8e Make nsRuleNode's use of font metrics for ch and ex units pass the correct language. (Bug 678671, patch 3) r=roc
This makes these users (which are exceptions within layout, although
low-level enough that it won't matter for font inflation work) call
through to GetMetricsFor explicitly with the correct language, rather
than using the broken nsPresContext::GetMetricsFor and its
charset-detected language.

This improves the correctness of our behavior for 'ch' and 'ex' CSS
units when the font selection (or defaults) are language-dependent.  It
should also reduce the number of unique sets of font metrics requested
(which helps nsFontCache effectiveness).
2011-08-14 10:08:04 -07:00
Jeff Muizelaar
1f4cd33169 Bug 660662. Eliminate NS_(ceil|floor). r=roc
These just called the system versions.
2011-05-30 15:08:55 -04:00
Matt Woodrow
b84eabcf4a Bug 505115 - Part 12a - Implement -moz-perspective-origin style property. r=dbaron 2011-08-03 15:04:24 +12:00
Matt Woodrow
236f72943c Bug 505115 - Part 11a - Add nsCSSValueTriplet and optionally read a z component to -moz-transform-origin. r=dbaron 2011-08-03 15:04:23 +12:00
Matt Woodrow
7a41f6a8a2 Bug 505115 - Part 10 - Implement the backface-visibility CSS property. r=dbaron 2011-08-03 15:04:22 +12:00
Matt Woodrow
b4bfd8dd6a Bug 505115 - Part 9 - Implement the perspective() transform function and the perspective CSS property. r=dbaron 2011-08-03 15:04:22 +12:00
Matt Woodrow
5afc317166 Bug 505115 - Part 3 - Convert nsStyleTransformMatrix to be backed by a 4x4 matrix. r=dbaron 2011-07-23 10:28:07 +12:00
Javi Rueda
4717926b02 Bug 516547. Remove the browser.display.base_font_scaler preference and all the code to process it. r=bzbarsky, sr=dbaron. 2011-07-11 15:27:25 -04:00
arno renevier
8c5c530736 Bug 664955 - "ASSERTION: parser should have rejected negative length". r=bz 2011-07-04 20:13:20 +02:00
Ed Morley
e3686d8cb0 Bug 665686 - Fix unused variable warnings in layout/style/; r=dbaron
--HG--
extra : rebase_source : cadde7110be42e3523c908c095cab8852f00bfb3
2011-06-22 12:00:56 -04:00
Mats Palmgren
8506a31912 Bug 312156 - Implement CSS3 text-overflow. r=dbaron 2011-06-22 20:11:47 +02:00
Matheus Kerschbaum ext:(%2C%20L.%20David%20Baron%20%3Cdbaron%40dbaron.org%3E)
1b406143bc Bug 664924 - Remove MOZ_CSS_ANIMATIONS ifdefs. r=dbaron 2011-06-20 16:47:09 -07:00
Matheus Kerschbaum
c0decf640b Bug 660762 - Remove --disable-mathml support. r=roc 2011-06-02 13:11:33 +02:00
Boris Zbarsky
0b03178d45 Bug 655549 and bug 645768. Rejigger the quirk table color rule to work more reliably. r=dbaron 2011-06-01 07:43:31 -04:00
Makoto Kato
0f68dad14d Bug 660587 - Remove nsRuleNode::gLangService. r=roc 2011-05-31 14:18:50 +09:00
Boris Zbarsky
7d1956e063 Bug 647885 part 2. Keep better track of whether our computed background-size was specified with percentages. r=dbaron a=sheriff 2011-05-23 16:36:18 -04:00
Boris Zbarsky
95558bbf2b Bug 647885 part 1. Keep better track of whether our computed background-position was specified with percentages. r=dbaron 2011-05-23 16:36:18 -04:00