author | Ting-Yu Lin <tlin@mozilla.com> |
Thu, 13 Oct 2016 03:33:00 +0800 | |
changeset 317875 | 9b7507984e869d7aa052cefb11cd05d0895ca15e |
parent 317874 | 56b16d2eaa77c4639f624f1b8eb01da70b5f0227 |
child 317876 | e813ac799ffea42936de59caf1991eb99d514990 |
push id | 33170 |
push user | cbook@mozilla.com |
push date | Fri, 14 Oct 2016 10:37:07 +0000 |
treeherder | autoland@0d101ebfd95c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | heycam |
bugs | 1309813 |
milestone | 52.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -2966,17 +2966,22 @@ nsStyleDisplay::nsStyleDisplay(StyleStru , mScrollSnapTypeX(NS_STYLE_SCROLL_SNAP_TYPE_NONE) , mScrollSnapTypeY(NS_STYLE_SCROLL_SNAP_TYPE_NONE) , mScrollSnapPointsX(eStyleUnit_None) , mScrollSnapPointsY(eStyleUnit_None) , mBackfaceVisibility(NS_STYLE_BACKFACE_VISIBILITY_VISIBLE) , mTransformStyle(NS_STYLE_TRANSFORM_STYLE_FLAT) , mTransformBox(NS_STYLE_TRANSFORM_BOX_BORDER_BOX) , mSpecifiedTransform(nullptr) + , mTransformOrigin{ {0.5f, eStyleUnit_Percent}, // Transform is centered on origin + {0.5f, eStyleUnit_Percent}, + {0, nsStyleCoord::CoordConstructor} } , mChildPerspective(eStyleUnit_None) + , mPerspectiveOrigin{ {0.5f, eStyleUnit_Percent}, + {0.5f, eStyleUnit_Percent} } , mVerticalAlign(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated) , mTransitions(nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT) , mTransitionTimingFunctionCount(1) , mTransitionDurationCount(1) , mTransitionDelayCount(1) , mTransitionPropertyCount(1) , mAnimations(nsStyleAutoArray<StyleAnimation>::WITH_SINGLE_INITIAL_ELEMENT) , mAnimationTimingFunctionCount(1) @@ -2984,21 +2989,16 @@ nsStyleDisplay::nsStyleDisplay(StyleStru , mAnimationDelayCount(1) , mAnimationNameCount(1) , mAnimationDirectionCount(1) , mAnimationFillModeCount(1) , mAnimationPlayStateCount(1) , mAnimationIterationCountCount(1) { MOZ_COUNT_CTOR(nsStyleDisplay); - mTransformOrigin[0].SetPercentValue(0.5f); // Transform is centered on origin - mTransformOrigin[1].SetPercentValue(0.5f); - mTransformOrigin[2].SetCoordValue(0); - mPerspectiveOrigin[0].SetPercentValue(0.5f); - mPerspectiveOrigin[1].SetPercentValue(0.5f); // Initial value for mScrollSnapDestination is "0px 0px" mScrollSnapDestination.SetInitialZeroValues(); mTransitions[0].SetInitialValues(); mAnimations[0].SetInitialValues(); } @@ -3031,17 +3031,22 @@ nsStyleDisplay::nsStyleDisplay(const nsS , mScrollSnapPointsX(aSource.mScrollSnapPointsX) , mScrollSnapPointsY(aSource.mScrollSnapPointsY) , mScrollSnapDestination(aSource.mScrollSnapDestination) , mScrollSnapCoordinate(aSource.mScrollSnapCoordinate) , mBackfaceVisibility(aSource.mBackfaceVisibility) , mTransformStyle(aSource.mTransformStyle) , mTransformBox(aSource.mTransformBox) , mSpecifiedTransform(aSource.mSpecifiedTransform) + , mTransformOrigin{ aSource.mTransformOrigin[0], + aSource.mTransformOrigin[1], + aSource.mTransformOrigin[2] } , mChildPerspective(aSource.mChildPerspective) + , mPerspectiveOrigin{ aSource.mPerspectiveOrigin[0], + aSource.mPerspectiveOrigin[1] } , mVerticalAlign(aSource.mVerticalAlign) , mTransitions(aSource.mTransitions) , mTransitionTimingFunctionCount(aSource.mTransitionTimingFunctionCount) , mTransitionDurationCount(aSource.mTransitionDurationCount) , mTransitionDelayCount(aSource.mTransitionDelayCount) , mTransitionPropertyCount(aSource.mTransitionPropertyCount) , mAnimations(aSource.mAnimations) , mAnimationTimingFunctionCount(aSource.mAnimationTimingFunctionCount) @@ -3050,23 +3055,16 @@ nsStyleDisplay::nsStyleDisplay(const nsS , mAnimationNameCount(aSource.mAnimationNameCount) , mAnimationDirectionCount(aSource.mAnimationDirectionCount) , mAnimationFillModeCount(aSource.mAnimationFillModeCount) , mAnimationPlayStateCount(aSource.mAnimationPlayStateCount) , mAnimationIterationCountCount(aSource.mAnimationIterationCountCount) , mShapeOutside(aSource.mShapeOutside) { MOZ_COUNT_CTOR(nsStyleDisplay); - - /* Copy over transform origin. */ - mTransformOrigin[0] = aSource.mTransformOrigin[0]; - mTransformOrigin[1] = aSource.mTransformOrigin[1]; - mTransformOrigin[2] = aSource.mTransformOrigin[2]; - mPerspectiveOrigin[0] = aSource.mPerspectiveOrigin[0]; - mPerspectiveOrigin[1] = aSource.mPerspectiveOrigin[1]; } nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aNewData) const { nsChangeHint hint = nsChangeHint(0); if (!DefinitelyEqualURIsAndPrincipal(mBinding, aNewData.mBinding)