зеркало из https://github.com/mozilla/pjs.git
Change the names of behavior and opacity DOM properties to MozBinding and MozOpacity, and make them work again with new CSS property names. r=jst, except for case change (Moz not moz) agreed on mozilla-style b=3935
This commit is contained in:
Родитель
f98ccd11de
Коммит
bf8a8ed6e7
|
@ -334,18 +334,6 @@ nsDOMCSSDeclaration::SetBackgroundRepeat(const nsAReadableString& aBackgroundRep
|
|||
return SetProperty(NS_ConvertASCIItoUCS2("background-repeat"), aBackgroundRepeat, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetBehavior(nsAWritableString& aBehavior)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("behavior"), aBehavior);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetBehavior(const nsAReadableString& aBehavior)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("behavior"), aBehavior, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetBorder(nsAWritableString& aBorder)
|
||||
{
|
||||
|
@ -1153,48 +1141,56 @@ nsDOMCSSDeclaration::SetOrphans(const nsAReadableString& aOrphans)
|
|||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutline(nsAWritableString& aOutline)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline"), aOutline);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutline(const nsAReadableString& aOutline)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline"), aOutline, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineColor(nsAWritableString& aOutlineColor)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-color"), aOutlineColor);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineColor(const nsAReadableString& aOutlineColor)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-color"), aOutlineColor, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineStyle(nsAWritableString& aOutlineStyle)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-style"), aOutlineStyle);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineStyle(const nsAReadableString& aOutlineStyle)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-style"), aOutlineStyle, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineWidth(nsAWritableString& aOutlineWidth)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-width"), aOutlineWidth);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineWidth(const nsAReadableString& aOutlineWidth)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-width"), aOutlineWidth, nsAutoString());
|
||||
}
|
||||
|
||||
|
@ -1726,15 +1722,26 @@ nsDOMCSSDeclaration::SetZIndex(const nsAReadableString& aZIndex)
|
|||
return SetProperty(NS_ConvertASCIItoUCS2("z-index"), aZIndex, nsAutoString());
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOpacity(nsAWritableString& aOpacity)
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetMozBinding(nsAWritableString& aBehavior)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("opacity"), aOpacity);
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("-moz-binding"), aBehavior);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOpacity(const nsAReadableString& aOpacity)
|
||||
nsDOMCSSDeclaration::SetMozBinding(const nsAReadableString& aBehavior)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("opacity"), aOpacity, nsAutoString());
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("-moz-binding"), aBehavior, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetMozOpacity(nsAWritableString& aOpacity)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("-moz-opacity"), aOpacity);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetMozOpacity(const nsAReadableString& aOpacity)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("-moz-opacity"), aOpacity, nsAutoString());
|
||||
}
|
||||
|
|
|
@ -404,11 +404,11 @@ public:
|
|||
NS_IMETHOD GetZIndex(nsAWritableString& aZIndex)=0;
|
||||
NS_IMETHOD SetZIndex(const nsAReadableString& aZIndex)=0;
|
||||
|
||||
NS_IMETHOD GetBehavior(nsAWritableString& aBehavior)=0;
|
||||
NS_IMETHOD SetBehavior(const nsAReadableString& aBehavior)=0;
|
||||
NS_IMETHOD GetMozBinding(nsAWritableString& aMozBinding)=0;
|
||||
NS_IMETHOD SetMozBinding(const nsAReadableString& aMozBinding)=0;
|
||||
|
||||
NS_IMETHOD GetOpacity(nsAWritableString& aOpacity)=0;
|
||||
NS_IMETHOD SetOpacity(const nsAReadableString& aOpacity)=0;
|
||||
NS_IMETHOD GetMozOpacity(nsAWritableString& aMozOpacity)=0;
|
||||
NS_IMETHOD SetMozOpacity(const nsAReadableString& aMozOpacity)=0;
|
||||
};
|
||||
|
||||
|
||||
|
@ -657,10 +657,10 @@ public:
|
|||
NS_IMETHOD SetWordSpacing(const nsAReadableString& aWordSpacing); \
|
||||
NS_IMETHOD GetZIndex(nsAWritableString& aZIndex); \
|
||||
NS_IMETHOD SetZIndex(const nsAReadableString& aZIndex); \
|
||||
NS_IMETHOD GetBehavior(nsAWritableString& aBehavior); \
|
||||
NS_IMETHOD SetBehavior(const nsAReadableString& aBehavior); \
|
||||
NS_IMETHOD GetOpacity(nsAWritableString& aOpacity); \
|
||||
NS_IMETHOD SetOpacity(const nsAReadableString& aOpacity); \
|
||||
NS_IMETHOD GetMozBinding(nsAWritableString& aMozBinding); \
|
||||
NS_IMETHOD SetMozBinding(const nsAReadableString& aMozBinding); \
|
||||
NS_IMETHOD GetMozOpacity(nsAWritableString& aMozOpacity); \
|
||||
NS_IMETHOD SetMozOpacity(const nsAReadableString& aMozOpacity); \
|
||||
|
||||
|
||||
|
||||
|
@ -909,10 +909,10 @@ public:
|
|||
NS_IMETHOD SetWordSpacing(const nsAReadableString& aWordSpacing) { return _to SetWordSpacing(aWordSpacing); } \
|
||||
NS_IMETHOD GetZIndex(nsAWritableString& aZIndex) { return _to GetZIndex(aZIndex); } \
|
||||
NS_IMETHOD SetZIndex(const nsAReadableString& aZIndex) { return _to SetZIndex(aZIndex); } \
|
||||
NS_IMETHOD GetBehavior(nsAWritableString& aBehavior) { return _to GetBehavior(aBehavior); } \
|
||||
NS_IMETHOD SetBehavior(const nsAReadableString& aBehavior) { return _to SetBehavior(aBehavior); } \
|
||||
NS_IMETHOD GetOpacity(nsAWritableString& aOpacity) { return _to GetOpacity(aOpacity); } \
|
||||
NS_IMETHOD SetOpacity(const nsAReadableString& aOpacity) { return _to SetOpacity(aOpacity); } \
|
||||
NS_IMETHOD GetMozBinding(nsAWritableString& aMozBinding) { return _to GetMozBinding(aMozBinding); } \
|
||||
NS_IMETHOD SetMozBinding(const nsAReadableString& aMozBinding) { return _to SetMozBinding(aMozBinding); } \
|
||||
NS_IMETHOD GetMozOpacity(nsAWritableString& aMozOpacity) { return _to GetMozOpacity(aMozOpacity); } \
|
||||
NS_IMETHOD SetMozOpacity(const nsAReadableString& aMozOpacity) { return _to SetMozOpacity(aMozOpacity); } \
|
||||
|
||||
|
||||
extern "C" NS_DOM nsresult NS_InitCSS2PropertiesClass(nsIScriptContext *aContext, void **aPrototype);
|
||||
|
|
|
@ -1,379 +0,0 @@
|
|||
interface CSS2Properties : CSSStyleDeclaration {
|
||||
/* IID: { 0xa6cf90d1, 0x15b3, 0x11d2, \
|
||||
{0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
|
||||
|
||||
attribute DOMString azimuth;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString background;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString backgroundAttachment;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString backgroundColor;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString backgroundImage;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString backgroundPosition;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString backgroundRepeat;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString border;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderCollapse;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderColor;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderSpacing;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderStyle;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderTop;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderRight;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderBottom;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderLeft;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderTopColor;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderRightColor;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderBottomColor;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderLeftColor;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderTopStyle;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderRightStyle;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderBottomStyle;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderLeftStyle;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderTopWidth;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderRightWidth;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderBottomWidth;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderLeftWidth;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString borderWidth;
|
||||
// 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
|
||||
|
||||
attribute DOMString clip;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString color;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString content;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString counterIncrement;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString counterReset;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString cue;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString cueAfter;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString cueBefore;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString cursor;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString direction;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString display;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString elevation;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString emptyCells;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString cssFloat;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString font;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString fontFamily;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString fontSize;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString fontSizeAdjust;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString fontStretch;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString fontStyle;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString fontVariant;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString fontWeight;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString height;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString left;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString letterSpacing;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString lineHeight;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString listStyle;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString listStyleImage;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString listStylePosition;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString listStyleType;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString margin;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString marginTop;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString marginRight;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString marginBottom;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString marginLeft;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString markerOffset;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString marks;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString maxHeight;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString maxWidth;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString minHeight;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString minWidth;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString orphans;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString outline;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString outlineColor;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString outlineStyle;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString outlineWidth;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString overflow;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString padding;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString paddingTop;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString paddingRight;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString paddingBottom;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString paddingLeft;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString page;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString pageBreakAfter;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString pageBreakBefore;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString pageBreakInside;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString pause;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString pauseAfter;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString pauseBefore;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString pitch;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString pitchRange;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString playDuring;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString position;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString quotes;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString richness;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString right;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString size;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString speak;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString speakHeader;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString speakNumeral;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString speakPunctuation;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString speechRate;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString stress;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString tableLayout;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString textAlign;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString textDecoration;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString textIndent;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString textShadow;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString textTransform;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString top;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString unicodeBidi;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString verticalAlign;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString visibility;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString voiceFamily;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString volume;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString whiteSpace;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString widows;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString width;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString wordSpacing;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
attribute DOMString zIndex;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
/* Non-DOM 2 extensions */
|
||||
attribute DOMString behavior;
|
||||
// raises(DOMException) on setting
|
||||
|
||||
|
||||
/* XXX Kipp was here */
|
||||
attribute DOMString opacity;
|
||||
// raises(DOMException) on setting
|
||||
};
|
|
@ -73,7 +73,6 @@ enum nsDOMProp {
|
|||
NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDIMAGE,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDPOSITION,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDREPEAT,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_BEHAVIOR,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_BORDER,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOM,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMCOLOR,
|
||||
|
@ -140,7 +139,8 @@ enum nsDOMProp {
|
|||
NS_DOM_PROP_CSS2PROPERTIES_MAXWIDTH,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_MINHEIGHT,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_MINWIDTH,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_OPACITY,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_MOZBINDING,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_MOZOPACITY,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_ORPHANS,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_OUTLINE,
|
||||
NS_DOM_PROP_CSS2PROPERTIES_OUTLINECOLOR,
|
||||
|
|
|
@ -168,8 +168,8 @@ enum CSS2Properties_slots {
|
|||
CSS2PROPERTIES_WIDTH = -120,
|
||||
CSS2PROPERTIES_WORDSPACING = -121,
|
||||
CSS2PROPERTIES_ZINDEX = -122,
|
||||
CSS2PROPERTIES_BEHAVIOR = -123,
|
||||
CSS2PROPERTIES_OPACITY = -124
|
||||
CSS2PROPERTIES_MOZBINDING = -123,
|
||||
CSS2PROPERTIES_MOZOPACITY = -124
|
||||
};
|
||||
|
||||
/***********************************************************************/
|
||||
|
@ -1656,24 +1656,24 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
|
|||
}
|
||||
break;
|
||||
}
|
||||
case CSS2PROPERTIES_BEHAVIOR:
|
||||
case CSS2PROPERTIES_MOZBINDING:
|
||||
{
|
||||
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BEHAVIOR, PR_FALSE);
|
||||
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MOZBINDING, PR_FALSE);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsAutoString prop;
|
||||
rv = a->GetBehavior(prop);
|
||||
rv = a->GetMozBinding(prop);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsJSUtils::nsConvertStringToJSVal(prop, cx, vp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CSS2PROPERTIES_OPACITY:
|
||||
case CSS2PROPERTIES_MOZOPACITY:
|
||||
{
|
||||
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OPACITY, PR_FALSE);
|
||||
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MOZOPACITY, PR_FALSE);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsAutoString prop;
|
||||
rv = a->GetOpacity(prop);
|
||||
rv = a->GetMozOpacity(prop);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsJSUtils::nsConvertStringToJSVal(prop, cx, vp);
|
||||
}
|
||||
|
@ -3177,26 +3177,26 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
|
|||
}
|
||||
break;
|
||||
}
|
||||
case CSS2PROPERTIES_BEHAVIOR:
|
||||
case CSS2PROPERTIES_MOZBINDING:
|
||||
{
|
||||
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BEHAVIOR, PR_TRUE);
|
||||
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MOZBINDING, PR_TRUE);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsAutoString prop;
|
||||
nsJSUtils::nsConvertJSValToString(prop, cx, *vp);
|
||||
|
||||
rv = a->SetBehavior(prop);
|
||||
rv = a->SetMozBinding(prop);
|
||||
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CSS2PROPERTIES_OPACITY:
|
||||
case CSS2PROPERTIES_MOZOPACITY:
|
||||
{
|
||||
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OPACITY, PR_TRUE);
|
||||
rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MOZOPACITY, PR_TRUE);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsAutoString prop;
|
||||
nsJSUtils::nsConvertJSValToString(prop, cx, *vp);
|
||||
|
||||
rv = a->SetOpacity(prop);
|
||||
rv = a->SetMozOpacity(prop);
|
||||
|
||||
}
|
||||
break;
|
||||
|
@ -3392,8 +3392,8 @@ static JSPropertySpec CSS2PropertiesProperties[] =
|
|||
{"width", CSS2PROPERTIES_WIDTH, JSPROP_ENUMERATE},
|
||||
{"wordSpacing", CSS2PROPERTIES_WORDSPACING, JSPROP_ENUMERATE},
|
||||
{"zIndex", CSS2PROPERTIES_ZINDEX, JSPROP_ENUMERATE},
|
||||
{"behavior", CSS2PROPERTIES_BEHAVIOR, JSPROP_ENUMERATE},
|
||||
{"opacity", CSS2PROPERTIES_OPACITY, JSPROP_ENUMERATE},
|
||||
{"MozBinding", CSS2PROPERTIES_MOZBINDING, JSPROP_ENUMERATE},
|
||||
{"MozOpacity", CSS2PROPERTIES_MOZOPACITY, JSPROP_ENUMERATE},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
@ -334,18 +334,6 @@ nsDOMCSSDeclaration::SetBackgroundRepeat(const nsAReadableString& aBackgroundRep
|
|||
return SetProperty(NS_ConvertASCIItoUCS2("background-repeat"), aBackgroundRepeat, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetBehavior(nsAWritableString& aBehavior)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("behavior"), aBehavior);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetBehavior(const nsAReadableString& aBehavior)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("behavior"), aBehavior, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetBorder(nsAWritableString& aBorder)
|
||||
{
|
||||
|
@ -1153,48 +1141,56 @@ nsDOMCSSDeclaration::SetOrphans(const nsAReadableString& aOrphans)
|
|||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutline(nsAWritableString& aOutline)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline"), aOutline);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutline(const nsAReadableString& aOutline)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline"), aOutline, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineColor(nsAWritableString& aOutlineColor)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-color"), aOutlineColor);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineColor(const nsAReadableString& aOutlineColor)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-color"), aOutlineColor, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineStyle(nsAWritableString& aOutlineStyle)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-style"), aOutlineStyle);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineStyle(const nsAReadableString& aOutlineStyle)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-style"), aOutlineStyle, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineWidth(nsAWritableString& aOutlineWidth)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-width"), aOutlineWidth);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineWidth(const nsAReadableString& aOutlineWidth)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-width"), aOutlineWidth, nsAutoString());
|
||||
}
|
||||
|
||||
|
@ -1726,15 +1722,26 @@ nsDOMCSSDeclaration::SetZIndex(const nsAReadableString& aZIndex)
|
|||
return SetProperty(NS_ConvertASCIItoUCS2("z-index"), aZIndex, nsAutoString());
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOpacity(nsAWritableString& aOpacity)
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetMozBinding(nsAWritableString& aBehavior)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("opacity"), aOpacity);
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("-moz-binding"), aBehavior);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOpacity(const nsAReadableString& aOpacity)
|
||||
nsDOMCSSDeclaration::SetMozBinding(const nsAReadableString& aBehavior)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("opacity"), aOpacity, nsAutoString());
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("-moz-binding"), aBehavior, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetMozOpacity(nsAWritableString& aOpacity)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("-moz-opacity"), aOpacity);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetMozOpacity(const nsAReadableString& aOpacity)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("-moz-opacity"), aOpacity, nsAutoString());
|
||||
}
|
||||
|
|
|
@ -334,18 +334,6 @@ nsDOMCSSDeclaration::SetBackgroundRepeat(const nsAReadableString& aBackgroundRep
|
|||
return SetProperty(NS_ConvertASCIItoUCS2("background-repeat"), aBackgroundRepeat, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetBehavior(nsAWritableString& aBehavior)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("behavior"), aBehavior);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetBehavior(const nsAReadableString& aBehavior)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("behavior"), aBehavior, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetBorder(nsAWritableString& aBorder)
|
||||
{
|
||||
|
@ -1153,48 +1141,56 @@ nsDOMCSSDeclaration::SetOrphans(const nsAReadableString& aOrphans)
|
|||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutline(nsAWritableString& aOutline)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline"), aOutline);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutline(const nsAReadableString& aOutline)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline"), aOutline, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineColor(nsAWritableString& aOutlineColor)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-color"), aOutlineColor);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineColor(const nsAReadableString& aOutlineColor)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-color"), aOutlineColor, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineStyle(nsAWritableString& aOutlineStyle)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-style"), aOutlineStyle);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineStyle(const nsAReadableString& aOutlineStyle)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-style"), aOutlineStyle, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOutlineWidth(nsAWritableString& aOutlineWidth)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("outline-width"), aOutlineWidth);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOutlineWidth(const nsAReadableString& aOutlineWidth)
|
||||
{
|
||||
// XXX Because of the renaming to -moz-outline, this does nothing.
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("outline-width"), aOutlineWidth, nsAutoString());
|
||||
}
|
||||
|
||||
|
@ -1726,15 +1722,26 @@ nsDOMCSSDeclaration::SetZIndex(const nsAReadableString& aZIndex)
|
|||
return SetProperty(NS_ConvertASCIItoUCS2("z-index"), aZIndex, nsAutoString());
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetOpacity(nsAWritableString& aOpacity)
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetMozBinding(nsAWritableString& aBehavior)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("opacity"), aOpacity);
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("-moz-binding"), aBehavior);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetOpacity(const nsAReadableString& aOpacity)
|
||||
nsDOMCSSDeclaration::SetMozBinding(const nsAReadableString& aBehavior)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("opacity"), aOpacity, nsAutoString());
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("-moz-binding"), aBehavior, nsAutoString());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::GetMozOpacity(nsAWritableString& aOpacity)
|
||||
{
|
||||
return GetPropertyValue(NS_ConvertASCIItoUCS2("-moz-opacity"), aOpacity);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMCSSDeclaration::SetMozOpacity(const nsAReadableString& aOpacity)
|
||||
{
|
||||
return SetProperty(NS_ConvertASCIItoUCS2("-moz-opacity"), aOpacity, nsAutoString());
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче