Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 505115 - Part 14a - Add -moz-transform-style css property. r=dbaron

Browse Source
This commit is contained in:
Matt Woodrow 2011-08-27 12:01:06 +12:00
parent a11366fd51
commit b98fe1bd08
12 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/interfaces/css/nsIDOMCSS2Properties.idl
View File

@ -51,7 +51,7 @@
* http://www.w3.org/TR/DOM-Level-2-Style
*/
[builtinclass, scriptable, uuid(286466f1-4246-4574-afdb-2f8a03ad7cc8)]
[builtinclass, scriptable, uuid(519ae4fa-0fee-4aaa-bcb9-34b503236801)]
interface nsIDOMCSS2Properties : nsISupports
{
attribute DOMString background;
@ -691,7 +691,10 @@ interface nsIDOMCSS2Properties : nsISupports
// raises(DOMException) on setting
attribute DOMString MozBackfaceVisibility;
// raises(DOMException) on setting
// raises(DOMException) on setting
attribute DOMString MozTransformStyle;
// raises(DOMException) on setting
attribute DOMString MozWindowShadow;
// raises(DOMException) on setting

3
layout/base/nsStyleConsts.h
View File

@ -862,6 +862,9 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
#define NS_STYLE_BACKFACE_VISIBILITY_VISIBLE 1
#define NS_STYLE_BACKFACE_VISIBILITY_HIDDEN 0
#define NS_STYLE_TRANSFORM_STYLE_FLAT 0
#define NS_STYLE_TRANSFORM_STYLE_PRESERVE_3D 1
/*****************************************************************************
* Constants for media features. *
*****************************************************************************/

2
layout/style/nsCSSKeywordList.h
View File

@ -273,6 +273,7 @@ CSS_KEY(farthest-side, farthest_side)
CSS_KEY(farthest-corner, farthest_corner)
CSS_KEY(fill, fill)
CSS_KEY(fixed, fixed)
CSS_KEY(flat, flat)
CSS_KEY(forwards, forwards)
CSS_KEY(georgian, georgian)
CSS_KEY(grad, grad)
@ -374,6 +375,7 @@ CSS_KEY(portrait, portrait)
CSS_KEY(pre, pre)
CSS_KEY(pre-wrap, pre_wrap)
CSS_KEY(pre-line, pre_line)
CSS_KEY(preserve-3d, preserve_3d)
CSS_KEY(progress, progress)
CSS_KEY(progressive, progressive)
CSS_KEY(pt, pt)

9
layout/style/nsCSSPropList.h
View File

@ -2283,6 +2283,15 @@ CSS_PROP_DISPLAY(
nsnull,
offsetof(nsStyleDisplay, mChildPerspective),
eStyleAnimType_Coord)
CSS_PROP_DISPLAY(
-moz-transform-style,
transform_style,
CSS_PROP_DOMPROP_PREFIXED(TransformStyle),
CSS_PROPERTY_PARSE_VALUE,
VARIANT_HK,
kTransformStyleKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_DISPLAY(
-moz-backface-visibility,
backface_visibility,

5
layout/style/nsCSSProps.cpp
View File

@ -586,6 +586,11 @@ const PRInt32 nsCSSProps::kBackfaceVisibilityKTable[] = {
eCSSKeyword_hidden, NS_STYLE_BACKFACE_VISIBILITY_HIDDEN
};
const PRInt32 nsCSSProps::kTransformStyleKTable[] = {
eCSSKeyword_flat, NS_STYLE_TRANSFORM_STYLE_FLAT,
eCSSKeyword_preserve_3d, NS_STYLE_TRANSFORM_STYLE_PRESERVE_3D
};
const PRInt32 nsCSSProps::kBackgroundAttachmentKTable[] = {
eCSSKeyword_fixed, NS_STYLE_BG_ATTACHMENT_FIXED,
eCSSKeyword_scroll, NS_STYLE_BG_ATTACHMENT_SCROLL,

1
layout/style/nsCSSProps.h
View File

@ -334,6 +334,7 @@ public:
static const PRInt32 kAppearanceKTable[];
static const PRInt32 kAzimuthKTable[];
static const PRInt32 kBackfaceVisibilityKTable[];
static const PRInt32 kTransformStyleKTable[];
static const PRInt32 kBackgroundAttachmentKTable[];
static const PRInt32 kBackgroundInlinePolicyKTable[];
static const PRInt32 kBackgroundOriginKTable[];

11
layout/style/nsComputedDOMStyle.cpp
View File

@ -1001,6 +1001,16 @@ nsComputedDOMStyle::DoGetMozBackfaceVisibility()
return val;
}
nsIDOMCSSValue*
nsComputedDOMStyle::DoGetMozTransformStyle()
{
nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
val->SetIdent(
nsCSSProps::ValueToKeywordEnum(GetStyleDisplay()->mTransformStyle,
nsCSSProps::kTransformStyleKTable));
return val;
}
/* If the property is "none", hand back "none" wrapped in a value.
* Otherwise, compute the aggregate transform matrix and hands it back in a
* "matrix" wrapper.
@ -4484,6 +4494,7 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
COMPUTED_STYLE_MAP_ENTRY(text_decoration_style, MozTextDecorationStyle),
COMPUTED_STYLE_MAP_ENTRY_LAYOUT(_moz_transform, MozTransform),
COMPUTED_STYLE_MAP_ENTRY_LAYOUT(_moz_transform_origin, MozTransformOrigin),
COMPUTED_STYLE_MAP_ENTRY(transform_style, MozTransformStyle),
COMPUTED_STYLE_MAP_ENTRY(transition_delay, TransitionDelay),
COMPUTED_STYLE_MAP_ENTRY(transition_duration, TransitionDuration),
COMPUTED_STYLE_MAP_ENTRY(transition_property, TransitionProperty),

1
layout/style/nsComputedDOMStyle.h
View File

@ -350,6 +350,7 @@ private:
nsIDOMCSSValue* DoGetMozPerspective();
nsIDOMCSSValue* DoGetMozBackfaceVisibility();
nsIDOMCSSValue* DoGetMozPerspectiveOrigin();
nsIDOMCSSValue* DoGetMozTransformStyle();
nsIDOMCSSValue* DoGetOrient();
/* User interface properties */

6
layout/style/nsRuleNode.cpp
View File

@ -4601,6 +4601,12 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
SETDSC_ENUMERATED, parentDisplay->mBackfaceVisibility,
NS_STYLE_BACKFACE_VISIBILITY_VISIBLE, 0, 0, 0, 0);
// transform-style: enum, inherit, initial
SetDiscrete(*aRuleData->ValueForTransformStyle(),
display->mTransformStyle, canStoreInRuleTree,
SETDSC_ENUMERATED, parentDisplay->mTransformStyle,
NS_STYLE_TRANSFORM_STYLE_FLAT, 0, 0, 0, 0);
// orient: enum, inherit, initial
SetDiscrete(*aRuleData->ValueForOrient(),
display->mOrient, canStoreInRuleTree,

6
layout/style/nsStyleStruct.cpp
View File

@ -2098,6 +2098,7 @@ nsStyleDisplay::nsStyleDisplay()
mPerspectiveOrigin[1].SetPercentValue(0.5f);
mChildPerspective.SetCoordValue(0);
mBackfaceVisibility = NS_STYLE_BACKFACE_VISIBILITY_VISIBLE;
mTransformStyle = NS_STYLE_TRANSFORM_STYLE_FLAT;
mOrient = NS_STYLE_ORIENT_HORIZONTAL;
mTransitions.AppendElement();
@ -2168,6 +2169,7 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
mPerspectiveOrigin[1] = aSource.mPerspectiveOrigin[1];
mChildPerspective = aSource.mChildPerspective;
mBackfaceVisibility = aSource.mBackfaceVisibility;
mTransformStyle = aSource.mTransformStyle;
}
nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
@ -2243,6 +2245,10 @@ nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
if (mBackfaceVisibility != aOther.mBackfaceVisibility)
NS_UpdateHint(hint, nsChangeHint_RepaintFrame);
if (mTransformStyle != aOther.mTransformStyle)
NS_UpdateHint(hint, NS_CombineHint(nsChangeHint_ReflowFrame,
nsChangeHint_RepaintFrame));
}
// Note: Our current behavior for handling changes to the

1
layout/style/nsStyleStruct.h
View File

@ -1531,6 +1531,7 @@ struct nsStyleDisplay {
nsStyleCoord mChildPerspective; // [reset] coord
nsStyleCoord mPerspectiveOrigin[2]; // [reset] percent, coord, calc
PRUint8 mBackfaceVisibility;
PRUint8 mTransformStyle;
nsAutoTArray<nsTransition, 1> mTransitions; // [reset]
// The number of elements in mTransitions that are not from repeating

8
layout/style/test/property_database.js
View File

@ -1020,6 +1020,14 @@ var gCSSProperties = {
other_values: [ "hidden" ],
invalid_values: [ "collapse" ]
},
"-moz-transform-style": {
domProp: "MozTransformStyle",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "flat" ],
other_values: [ "preserve-3d" ],
invalid_values: []
},
"-moz-user-focus": {
domProp: "MozUserFocus",
inherited: true,