Attachment #468596 for bug #451134

Attachment #468596: patch (2/2): by-hand changes for bug #451134





 * The nsIDOMCSS2Properties interface is a datatype for additional
 * reflection of data already provided in nsIDOMCSSStyleDeclaration in
 * the Document Object Model.
 *
 * For more information on this interface please see
 * http://www.w3.org/TR/DOM-Level-2-Style
 */

[scriptable, uuid(6e583050-7345-4623-9acf-44dc7136e09f)]
interface nsIDOMCSS2Properties : nsISupports
{
           attribute DOMString        azimuth;
                                        // raises(DOMException) on setting

           attribute DOMString        background;
                                        // raises(DOMException) on setting


                                        // raises(DOMException) on setting

           attribute DOMString        borderLeftWidth;
                                        // raises(DOMException) on setting

           attribute DOMString        borderWidth;
                                        // raises(DOMException) on setting

           attribute DOMString        borderRadius;
                                        // raises(DOMException) on setting

           attribute DOMString        borderTopLeftRadius;
                                        // raises(DOMException) on setting

           attribute DOMString        borderTopRightRadius;
                                        // raises(DOMException) on setting

           attribute DOMString        borderBottomLeftRadius;
                                        // raises(DOMException) on setting

           attribute DOMString        borderBottomRightRadius;
                                        // raises(DOMException) on setting

           attribute DOMString        bottom;
                                        // raises(DOMException) on setting

           attribute DOMString        captionSide;
                                        // raises(DOMException) on setting

           attribute DOMString        clear;
                                        // raises(DOMException) on setting

                                        // raises(DOMException) on setting

           attribute DOMString        MozBorderRightColors;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBorderTopColors;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBorderRadius;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBorderRadiusTopleft;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBorderRadiusTopright;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBorderRadiusBottomleft;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBorderRadiusBottomright;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBoxAlign;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBoxDirection;
                                        // raises(DOMException) on setting

           attribute DOMString        MozBoxFlex;
                                        // raises(DOMException) on setting





    MozAppearance,
    0,
    Display,
    mAppearance,
    kAppearanceKTable,
    CSS_PROP_NO_OFFSET,
    eStyleAnimType_None)
CSS_PROP_SHORTHAND(
    border-radius,
    border_radius,
    MozBorderRadius,
    0)
CSS_PROP_BORDER(
    border-top-left-radius,
    border_top_left_radius,
    MozBorderRadiusTopleft,
    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
    Margin,
    mBorderRadius.mTopLeft,
    nsnull,
    offsetof(nsStyleBorder, mBorderRadius),
    eStyleAnimType_Corner_TopLeft)
CSS_PROP_BORDER(
    border-top-right-radius,
    border_top_right_radius,
    MozBorderRadiusTopright,
    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
    Margin,
    mBorderRadius.mTopRight,
    nsnull,
    offsetof(nsStyleBorder, mBorderRadius),
    eStyleAnimType_Corner_TopRight)
CSS_PROP_BORDER(
    border-bottom-right-radius,
    border_bottom_right_radius,
    MozBorderRadiusBottomright,
    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
    Margin,
    mBorderRadius.mBottomRight,
    nsnull,
    offsetof(nsStyleBorder, mBorderRadius),
    eStyleAnimType_Corner_BottomRight)
CSS_PROP_BORDER(
    border-bottom-left-radius,
    border_bottom_left_radius,
    MozBorderRadiusBottomleft,
    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
    Margin,
    mBorderRadius.mBottomLeft,
    nsnull,
    offsetof(nsStyleBorder, mBorderRadius),
    eStyleAnimType_Corner_BottomLeft)
CSS_PROP_SHORTHAND(
    -moz-outline-radius,
    _moz_outline_radius,
    MozOutlineRadius,
    0)
CSS_PROP_OUTLINE(
    -moz-outline-radius-topleft,
    _moz_outline_radius_topLeft,
    MozOutlineRadiusTopleft,

    kBorderWidthKTable,
    CSS_PROP_NO_OFFSET,
    eStyleAnimType_Custom)
CSS_PROP_SHORTHAND(
    border-width,
    border_width,
    BorderWidth,
    0)
CSS_PROP_SHORTHAND(
    border-radius,
    border_radius,
    BorderRadius,
    0)
CSS_PROP_BORDER(
    border-top-left-radius,
    border_top_left_radius,
    BorderTopLeftRadius,
    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
    Margin,
    mBorderRadius.mTopLeft,
    nsnull,
    offsetof(nsStyleBorder, mBorderRadius),
    eStyleAnimType_Corner_TopLeft)
CSS_PROP_BORDER(
    border-top-right-radius,
    border_top_right_radius,
    BorderTopRightRadius,
    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
    Margin,
    mBorderRadius.mTopRight,
    nsnull,
    offsetof(nsStyleBorder, mBorderRadius),
    eStyleAnimType_Corner_TopRight)
CSS_PROP_BORDER(
    border-bottom-right-radius,
    border_bottom_right_radius,
    BorderBottomRightRadius,
    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
    Margin,
    mBorderRadius.mBottomRight,
    nsnull,
    offsetof(nsStyleBorder, mBorderRadius),
    eStyleAnimType_Corner_BottomRight)
CSS_PROP_BORDER(
    border-bottom-left-radius,
    border_bottom_left_radius,
    BorderBottomLeftRadius,
    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
    Margin,
    mBorderRadius.mBottomLeft,
    nsnull,
    offsetof(nsStyleBorder, mBorderRadius),
    eStyleAnimType_Corner_BottomLeft)
CSS_PROP_POSITION(
    bottom,
    bottom,
    Bottom,
    0,
    Position,
    mOffset.mBottom,
    nsnull,





  flags_,
#include "nsCSSPropList.h"
#undef CSS_PROP
#define CSS_PROP_SHORTHAND(name_, id_, method_, flags_) flags_,
#include "nsCSSPropList.h"
#undef CSS_PROP_SHORTHAND
};

static const nsCSSProperty gBorderRadiusSubpropTable[] = {
  // Code relies on these being in topleft-topright-bottomright-bottomleft
  // order.
  eCSSProperty_border_top_left_radius,
  eCSSProperty_border_top_right_radius,
  eCSSProperty_border_bottom_right_radius,
  eCSSProperty_border_bottom_left_radius,
  eCSSProperty_UNKNOWN
};






nsresult
nsComputedDOMStyle::DoGetBorderTopColors(nsIDOMCSSValue** aValue)
{
  return GetBorderColorsFor(NS_SIDE_TOP, aValue);
}

nsresult
nsComputedDOMStyle::DoGetBorderBottomLeftRadius(nsIDOMCSSValue** aValue)
{
  return GetEllipseRadii(GetStyleBorder()->mBorderRadius,
                         NS_CORNER_BOTTOM_LEFT, aValue);
}

nsresult
nsComputedDOMStyle::DoGetBorderBottomRightRadius(nsIDOMCSSValue** aValue)
{
  return GetEllipseRadii(GetStyleBorder()->mBorderRadius,
                         NS_CORNER_BOTTOM_RIGHT, aValue);
}

nsresult
nsComputedDOMStyle::DoGetBorderTopLeftRadius(nsIDOMCSSValue** aValue)
{
  return GetEllipseRadii(GetStyleBorder()->mBorderRadius,
                         NS_CORNER_TOP_LEFT, aValue);
}

nsresult
nsComputedDOMStyle::DoGetBorderTopRightRadius(nsIDOMCSSValue** aValue)
{
  return GetEllipseRadii(GetStyleBorder()->mBorderRadius,
                         NS_CORNER_TOP_RIGHT, aValue);
}

nsresult
nsComputedDOMStyle::DoGetBorderWidth(nsIDOMCSSValue** aValue)
{

    COMPUTED_STYLE_MAP_ENTRY(background_origin,             BackgroundOrigin),
    COMPUTED_STYLE_MAP_ENTRY(background_size,               MozBackgroundSize),
    COMPUTED_STYLE_MAP_ENTRY(binding,                       Binding),
    COMPUTED_STYLE_MAP_ENTRY(border_bottom_colors,          BorderBottomColors),
    COMPUTED_STYLE_MAP_ENTRY(border_image,                  BorderImage),
    COMPUTED_STYLE_MAP_ENTRY(border_left_colors,            BorderLeftColors),
    COMPUTED_STYLE_MAP_ENTRY(border_right_colors,           BorderRightColors),
    COMPUTED_STYLE_MAP_ENTRY(border_top_colors,             BorderTopColors),
    COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_bottom_left_radius, BorderBottomLeftRadius),
    COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_bottom_right_radius,BorderBottomRightRadius),
    COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_top_left_radius,    BorderTopLeftRadius),
    COMPUTED_STYLE_MAP_ENTRY_LAYOUT(border_top_right_radius,   BorderTopRightRadius),
    COMPUTED_STYLE_MAP_ENTRY(box_align,                     BoxAlign),
    COMPUTED_STYLE_MAP_ENTRY(box_direction,                 BoxDirection),
    COMPUTED_STYLE_MAP_ENTRY(box_flex,                      BoxFlex),
    COMPUTED_STYLE_MAP_ENTRY(box_ordinal_group,             BoxOrdinalGroup),
    COMPUTED_STYLE_MAP_ENTRY(box_orient,                    BoxOrient),
    COMPUTED_STYLE_MAP_ENTRY(box_pack,                      BoxPack),
    COMPUTED_STYLE_MAP_ENTRY(box_shadow,                    BoxShadow),
    COMPUTED_STYLE_MAP_ENTRY(box_sizing,                    BoxSizing),





  nsresult DoGetBorderTopColor(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderBottomColor(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderLeftColor(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderRightColor(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderBottomColors(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderLeftColors(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderRightColors(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderTopColors(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderBottomLeftRadius(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderBottomRightRadius(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderTopLeftRadius(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderTopRightRadius(nsIDOMCSSValue** aValue);
  nsresult DoGetFloatEdge(nsIDOMCSSValue** aValue);
  nsresult DoGetBorderImage(nsIDOMCSSValue** aValue);

  /* Box Shadow */
  nsresult DoGetBoxShadow(nsIDOMCSSValue** aValue);

  /* Window Shadow */
  nsresult DoGetWindowShadow(nsIDOMCSSValue** aValue);





		domProp: "MozBorderLeftColors",
		inherited: false,
		type: CSS_TYPE_LONGHAND,
		initial_values: [ "none" ],
		other_values: [ "red green", "red #fc3", "#ff00cc", "currentColor", "blue currentColor orange currentColor" ],
		invalid_values: [ "red none", "red inherit", "red, green", "none red", "inherit red" ]
	},
	"border-radius": {
		domProp: "borderRadius",
		inherited: false,
		type: CSS_TYPE_TRUE_SHORTHAND,
		subproperties: [ "border-bottom-left-radius", "border-bottom-right-radius", "border-top-left-radius", "border-top-right-radius" ],
		initial_values: [ "0", "0px", "0px 0 0 0px" ], /* 0% ? */
		other_values: [ "3%", "1px", "2em", "3em 2px", "2pt 3% 4em", "2px 2px 2px 2px", // circular
						"3% / 2%", "1px / 4px", "2em / 1em", "3em 2px / 2px 3em", "2pt 3% 4em / 4pt 1% 5em", "2px 2px 2px 2px / 4px 4px 4px 4px", "1pt / 2pt 3pt", "4pt 5pt / 3pt" // elliptical
					  ],
		invalid_values: [ "2px -2px", "inherit 2px", "inherit / 2px", "2px inherit", "2px / inherit", "2px 2px 2px 2px 2px", "1px / 2px 2px 2px 2px 2px" ]
	},
	"border-bottom-left-radius": {
		domProp: "borderBottomLeftRadius",
		inherited: false,
		type: CSS_TYPE_LONGHAND,
		initial_values: [ "0", "0px" ], /* 0% ? */
		other_values: [ "3%", "1px", "2em", // circular
						"3% 2%", "1px 4px", "2em 2pt" // elliptical
					  ],
		invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit" ]
	},
	"border-bottom-right-radius": {
		domProp: "borderBottomRightRadius",
		inherited: false,
		type: CSS_TYPE_LONGHAND,
		initial_values: [ "0", "0px" ], /* 0% ? */
		other_values: [ "3%", "1px", "2em", // circular
						"3% 2%", "1px 4px", "2em 2pt" // elliptical
					  ],
		invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit" ]
	},
	"border-top-left-radius": {
		domProp: "borderTopLeftRadius",
		inherited: false,
		type: CSS_TYPE_LONGHAND,
		initial_values: [ "0", "0px" ], /* 0% ? */
		other_values: [ "3%", "1px", "2em", // circular
						"3% 2%", "1px 4px", "2em 2pt" // elliptical
					  ],
		invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit" ]
	},
	"border-top-right-radius": {
		domProp: "borderTopRightRadius",
		inherited: false,
		type: CSS_TYPE_LONGHAND,
		initial_values: [ "0", "0px" ], /* 0% ? */
		other_values: [ "3%", "1px", "2em", // circular
						"3% 2%", "1px 4px", "2em 2pt" // elliptical
					  ],
		invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit" ]
	},

Return to bug 451134