| Index: Source/core/css/CSSPrimitiveValueMappings.h
|
| diff --git a/Source/core/css/CSSPrimitiveValueMappings.h b/Source/core/css/CSSPrimitiveValueMappings.h
|
| index 17cc619cdc50e41c020b6c4af99a333d3aafa520..2b3b333d33de62aa5c76b5d3ad32b0934dde7c83 100644
|
| --- a/Source/core/css/CSSPrimitiveValueMappings.h
|
| +++ b/Source/core/css/CSSPrimitiveValueMappings.h
|
| @@ -56,11 +56,9 @@
|
|
|
| namespace blink {
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(short i)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(short i)
|
| {
|
| - m_primitiveUnitType = CSS_NUMBER;
|
| - m_value.num = static_cast<double>(i);
|
| + return create(static_cast<double>(i), CSS_NUMBER);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator short() const
|
| @@ -69,11 +67,9 @@ template<> inline CSSPrimitiveValue::operator short() const
|
| return clampTo<short>(getDoubleValue());
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(unsigned short i)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(unsigned short i)
|
| {
|
| - m_primitiveUnitType = CSS_NUMBER;
|
| - m_value.num = static_cast<double>(i);
|
| + return create(static_cast<double>(i), CSS_NUMBER);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator unsigned short() const
|
| @@ -95,11 +91,9 @@ template<> inline CSSPrimitiveValue::operator unsigned() const
|
| }
|
|
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(float i)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(float i)
|
| {
|
| - m_primitiveUnitType = CSS_NUMBER;
|
| - m_value.num = static_cast<double>(i);
|
| + return create(static_cast<double>(i), CSS_NUMBER);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator float() const
|
| @@ -108,11 +102,9 @@ template<> inline CSSPrimitiveValue::operator float() const
|
| return clampTo<float>(getDoubleValue());
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineClampValue i)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(LineClampValue i)
|
| {
|
| - m_primitiveUnitType = i.isPercentage() ? CSS_PERCENTAGE : CSS_NUMBER;
|
| - m_value.num = static_cast<double>(i.value());
|
| + return create(static_cast<double>(i.value()), i.isPercentage() ? CSS_PERCENTAGE : CSS_NUMBER);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator LineClampValue() const
|
| @@ -127,23 +119,23 @@ template<> inline CSSPrimitiveValue::operator LineClampValue() const
|
| return LineClampValue();
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSReflectionDirection e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(CSSReflectionDirection e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case ReflectionAbove:
|
| - m_value.valueID = CSSValueAbove;
|
| + valueID = CSSValueAbove;
|
| break;
|
| case ReflectionBelow:
|
| - m_value.valueID = CSSValueBelow;
|
| + valueID = CSSValueBelow;
|
| break;
|
| case ReflectionLeft:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| case ReflectionRight:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator CSSReflectionDirection() const
|
| @@ -166,18 +158,18 @@ template<> inline CSSPrimitiveValue::operator CSSReflectionDirection() const
|
| return ReflectionBelow;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnFill columnFill)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ColumnFill columnFill)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (columnFill) {
|
| case ColumnFillAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case ColumnFillBalance:
|
| - m_value.valueID = CSSValueBalance;
|
| + valueID = CSSValueBalance;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ColumnFill() const
|
| @@ -192,18 +184,18 @@ template<> inline CSSPrimitiveValue::operator ColumnFill() const
|
| return ColumnFillBalance;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnSpan columnSpan)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ColumnSpan columnSpan)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (columnSpan) {
|
| case ColumnSpanAll:
|
| - m_value.valueID = CSSValueAll;
|
| + valueID = CSSValueAll;
|
| break;
|
| case ColumnSpanNone:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ColumnSpan() const
|
| @@ -227,18 +219,18 @@ template<> inline CSSPrimitiveValue::operator ColumnSpan() const
|
| }
|
|
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(PrintColorAdjust value)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(PrintColorAdjust value)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (value) {
|
| case PrintColorAdjustExact:
|
| - m_value.valueID = CSSValueExact;
|
| + valueID = CSSValueExact;
|
| break;
|
| case PrintColorAdjustEconomy:
|
| - m_value.valueID = CSSValueEconomy;
|
| + valueID = CSSValueEconomy;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator PrintColorAdjust() const
|
| @@ -258,42 +250,42 @@ template<> inline CSSPrimitiveValue::operator PrintColorAdjust() const
|
| }
|
|
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBorderStyle e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBorderStyle e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case BNONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case BHIDDEN:
|
| - m_value.valueID = CSSValueHidden;
|
| + valueID = CSSValueHidden;
|
| break;
|
| case INSET:
|
| - m_value.valueID = CSSValueInset;
|
| + valueID = CSSValueInset;
|
| break;
|
| case GROOVE:
|
| - m_value.valueID = CSSValueGroove;
|
| + valueID = CSSValueGroove;
|
| break;
|
| case RIDGE:
|
| - m_value.valueID = CSSValueRidge;
|
| + valueID = CSSValueRidge;
|
| break;
|
| case OUTSET:
|
| - m_value.valueID = CSSValueOutset;
|
| + valueID = CSSValueOutset;
|
| break;
|
| case DOTTED:
|
| - m_value.valueID = CSSValueDotted;
|
| + valueID = CSSValueDotted;
|
| break;
|
| case DASHED:
|
| - m_value.valueID = CSSValueDashed;
|
| + valueID = CSSValueDashed;
|
| break;
|
| case SOLID:
|
| - m_value.valueID = CSSValueSolid;
|
| + valueID = CSSValueSolid;
|
| break;
|
| case DOUBLE:
|
| - m_value.valueID = CSSValueDouble;
|
| + valueID = CSSValueDouble;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBorderStyle() const
|
| @@ -311,51 +303,51 @@ template<> inline CSSPrimitiveValue::operator OutlineIsAuto() const
|
| return AUTO_OFF;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CompositeOperator e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(CompositeOperator e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case CompositeClear:
|
| - m_value.valueID = CSSValueClear;
|
| + valueID = CSSValueClear;
|
| break;
|
| case CompositeCopy:
|
| - m_value.valueID = CSSValueCopy;
|
| + valueID = CSSValueCopy;
|
| break;
|
| case CompositeSourceOver:
|
| - m_value.valueID = CSSValueSourceOver;
|
| + valueID = CSSValueSourceOver;
|
| break;
|
| case CompositeSourceIn:
|
| - m_value.valueID = CSSValueSourceIn;
|
| + valueID = CSSValueSourceIn;
|
| break;
|
| case CompositeSourceOut:
|
| - m_value.valueID = CSSValueSourceOut;
|
| + valueID = CSSValueSourceOut;
|
| break;
|
| case CompositeSourceAtop:
|
| - m_value.valueID = CSSValueSourceAtop;
|
| + valueID = CSSValueSourceAtop;
|
| break;
|
| case CompositeDestinationOver:
|
| - m_value.valueID = CSSValueDestinationOver;
|
| + valueID = CSSValueDestinationOver;
|
| break;
|
| case CompositeDestinationIn:
|
| - m_value.valueID = CSSValueDestinationIn;
|
| + valueID = CSSValueDestinationIn;
|
| break;
|
| case CompositeDestinationOut:
|
| - m_value.valueID = CSSValueDestinationOut;
|
| + valueID = CSSValueDestinationOut;
|
| break;
|
| case CompositeDestinationAtop:
|
| - m_value.valueID = CSSValueDestinationAtop;
|
| + valueID = CSSValueDestinationAtop;
|
| break;
|
| case CompositeXOR:
|
| - m_value.valueID = CSSValueXor;
|
| + valueID = CSSValueXor;
|
| break;
|
| case CompositePlusLighter:
|
| - m_value.valueID = CSSValuePlusLighter;
|
| + valueID = CSSValuePlusLighter;
|
| break;
|
| default:
|
| ASSERT_NOT_REACHED();
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator CompositeOperator() const
|
| @@ -394,168 +386,169 @@ template<> inline CSSPrimitiveValue::operator CompositeOperator() const
|
| return CompositeClear;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ControlPart e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ControlPart e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case NoControlPart:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case CheckboxPart:
|
| - m_value.valueID = CSSValueCheckbox;
|
| + valueID = CSSValueCheckbox;
|
| break;
|
| case RadioPart:
|
| - m_value.valueID = CSSValueRadio;
|
| + valueID = CSSValueRadio;
|
| break;
|
| case PushButtonPart:
|
| - m_value.valueID = CSSValuePushButton;
|
| + valueID = CSSValuePushButton;
|
| break;
|
| case SquareButtonPart:
|
| - m_value.valueID = CSSValueSquareButton;
|
| + valueID = CSSValueSquareButton;
|
| break;
|
| case ButtonPart:
|
| - m_value.valueID = CSSValueButton;
|
| + valueID = CSSValueButton;
|
| break;
|
| case ButtonBevelPart:
|
| - m_value.valueID = CSSValueButtonBevel;
|
| + valueID = CSSValueButtonBevel;
|
| break;
|
| case InnerSpinButtonPart:
|
| - m_value.valueID = CSSValueInnerSpinButton;
|
| + valueID = CSSValueInnerSpinButton;
|
| break;
|
| case ListboxPart:
|
| - m_value.valueID = CSSValueListbox;
|
| + valueID = CSSValueListbox;
|
| break;
|
| case ListItemPart:
|
| - m_value.valueID = CSSValueListitem;
|
| + valueID = CSSValueListitem;
|
| break;
|
| case MediaEnterFullscreenButtonPart:
|
| - m_value.valueID = CSSValueMediaEnterFullscreenButton;
|
| + valueID = CSSValueMediaEnterFullscreenButton;
|
| break;
|
| case MediaExitFullscreenButtonPart:
|
| - m_value.valueID = CSSValueMediaExitFullscreenButton;
|
| + valueID = CSSValueMediaExitFullscreenButton;
|
| break;
|
| case MediaPlayButtonPart:
|
| - m_value.valueID = CSSValueMediaPlayButton;
|
| + valueID = CSSValueMediaPlayButton;
|
| break;
|
| case MediaOverlayPlayButtonPart:
|
| - m_value.valueID = CSSValueMediaOverlayPlayButton;
|
| + valueID = CSSValueMediaOverlayPlayButton;
|
| break;
|
| case MediaMuteButtonPart:
|
| - m_value.valueID = CSSValueMediaMuteButton;
|
| + valueID = CSSValueMediaMuteButton;
|
| break;
|
| case MediaToggleClosedCaptionsButtonPart:
|
| - m_value.valueID = CSSValueMediaToggleClosedCaptionsButton;
|
| + valueID = CSSValueMediaToggleClosedCaptionsButton;
|
| break;
|
| case MediaCastOffButtonPart:
|
| - m_value.valueID = CSSValueInternalMediaCastOffButton;
|
| + valueID = CSSValueInternalMediaCastOffButton;
|
| break;
|
| case MediaOverlayCastOffButtonPart:
|
| - m_value.valueID = CSSValueInternalMediaOverlayCastOffButton;
|
| + valueID = CSSValueInternalMediaOverlayCastOffButton;
|
| break;
|
| case MediaSliderPart:
|
| - m_value.valueID = CSSValueMediaSlider;
|
| + valueID = CSSValueMediaSlider;
|
| break;
|
| case MediaSliderThumbPart:
|
| - m_value.valueID = CSSValueMediaSliderthumb;
|
| + valueID = CSSValueMediaSliderthumb;
|
| break;
|
| case MediaVolumeSliderContainerPart:
|
| - m_value.valueID = CSSValueMediaVolumeSliderContainer;
|
| + valueID = CSSValueMediaVolumeSliderContainer;
|
| break;
|
| case MediaVolumeSliderPart:
|
| - m_value.valueID = CSSValueMediaVolumeSlider;
|
| + valueID = CSSValueMediaVolumeSlider;
|
| break;
|
| case MediaVolumeSliderThumbPart:
|
| - m_value.valueID = CSSValueMediaVolumeSliderthumb;
|
| + valueID = CSSValueMediaVolumeSliderthumb;
|
| break;
|
| case MediaControlsBackgroundPart:
|
| - m_value.valueID = CSSValueMediaControlsBackground;
|
| + valueID = CSSValueMediaControlsBackground;
|
| break;
|
| case MediaControlsFullscreenBackgroundPart:
|
| - m_value.valueID = CSSValueMediaControlsFullscreenBackground;
|
| + valueID = CSSValueMediaControlsFullscreenBackground;
|
| break;
|
| case MediaFullScreenVolumeSliderPart:
|
| - m_value.valueID = CSSValueMediaFullscreenVolumeSlider;
|
| + valueID = CSSValueMediaFullscreenVolumeSlider;
|
| break;
|
| case MediaFullScreenVolumeSliderThumbPart:
|
| - m_value.valueID = CSSValueMediaFullscreenVolumeSliderThumb;
|
| + valueID = CSSValueMediaFullscreenVolumeSliderThumb;
|
| break;
|
| case MediaCurrentTimePart:
|
| - m_value.valueID = CSSValueMediaCurrentTimeDisplay;
|
| + valueID = CSSValueMediaCurrentTimeDisplay;
|
| break;
|
| case MediaTimeRemainingPart:
|
| - m_value.valueID = CSSValueMediaTimeRemainingDisplay;
|
| + valueID = CSSValueMediaTimeRemainingDisplay;
|
| break;
|
| case MenulistPart:
|
| - m_value.valueID = CSSValueMenulist;
|
| + valueID = CSSValueMenulist;
|
| break;
|
| case MenulistButtonPart:
|
| - m_value.valueID = CSSValueMenulistButton;
|
| + valueID = CSSValueMenulistButton;
|
| break;
|
| case MenulistTextPart:
|
| - m_value.valueID = CSSValueMenulistText;
|
| + valueID = CSSValueMenulistText;
|
| break;
|
| case MenulistTextFieldPart:
|
| - m_value.valueID = CSSValueMenulistTextfield;
|
| + valueID = CSSValueMenulistTextfield;
|
| break;
|
| case MeterPart:
|
| - m_value.valueID = CSSValueMeter;
|
| + valueID = CSSValueMeter;
|
| break;
|
| case RelevancyLevelIndicatorPart:
|
| - m_value.valueID = CSSValueRelevancyLevelIndicator;
|
| + valueID = CSSValueRelevancyLevelIndicator;
|
| break;
|
| case ContinuousCapacityLevelIndicatorPart:
|
| - m_value.valueID = CSSValueContinuousCapacityLevelIndicator;
|
| + valueID = CSSValueContinuousCapacityLevelIndicator;
|
| break;
|
| case DiscreteCapacityLevelIndicatorPart:
|
| - m_value.valueID = CSSValueDiscreteCapacityLevelIndicator;
|
| + valueID = CSSValueDiscreteCapacityLevelIndicator;
|
| break;
|
| case RatingLevelIndicatorPart:
|
| - m_value.valueID = CSSValueRatingLevelIndicator;
|
| + valueID = CSSValueRatingLevelIndicator;
|
| break;
|
| case ProgressBarPart:
|
| - m_value.valueID = CSSValueProgressBar;
|
| + valueID = CSSValueProgressBar;
|
| break;
|
| case ProgressBarValuePart:
|
| - m_value.valueID = CSSValueProgressBarValue;
|
| + valueID = CSSValueProgressBarValue;
|
| break;
|
| case SliderHorizontalPart:
|
| - m_value.valueID = CSSValueSliderHorizontal;
|
| + valueID = CSSValueSliderHorizontal;
|
| break;
|
| case SliderVerticalPart:
|
| - m_value.valueID = CSSValueSliderVertical;
|
| + valueID = CSSValueSliderVertical;
|
| break;
|
| case SliderThumbHorizontalPart:
|
| - m_value.valueID = CSSValueSliderthumbHorizontal;
|
| + valueID = CSSValueSliderthumbHorizontal;
|
| break;
|
| case SliderThumbVerticalPart:
|
| - m_value.valueID = CSSValueSliderthumbVertical;
|
| + valueID = CSSValueSliderthumbVertical;
|
| break;
|
| case CaretPart:
|
| - m_value.valueID = CSSValueCaret;
|
| + valueID = CSSValueCaret;
|
| break;
|
| case SearchFieldPart:
|
| - m_value.valueID = CSSValueSearchfield;
|
| + valueID = CSSValueSearchfield;
|
| break;
|
| case SearchFieldDecorationPart:
|
| - m_value.valueID = CSSValueSearchfieldDecoration;
|
| + valueID = CSSValueSearchfieldDecoration;
|
| break;
|
| case SearchFieldResultsDecorationPart:
|
| - m_value.valueID = CSSValueSearchfieldResultsDecoration;
|
| + valueID = CSSValueSearchfieldResultsDecoration;
|
| break;
|
| case SearchFieldCancelButtonPart:
|
| - m_value.valueID = CSSValueSearchfieldCancelButton;
|
| + valueID = CSSValueSearchfieldCancelButton;
|
| break;
|
| case TextFieldPart:
|
| - m_value.valueID = CSSValueTextfield;
|
| + valueID = CSSValueTextfield;
|
| break;
|
| case TextAreaPart:
|
| - m_value.valueID = CSSValueTextarea;
|
| + valueID = CSSValueTextarea;
|
| break;
|
| case CapsLockIndicatorPart:
|
| - m_value.valueID = CSSValueCapsLockIndicator;
|
| + valueID = CSSValueCapsLockIndicator;
|
| break;
|
| }
|
| + return create(valueID);
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ControlPart() const
|
| @@ -566,18 +559,18 @@ template<> inline CSSPrimitiveValue::operator ControlPart() const
|
| return ControlPart(value().valueID - CSSValueCheckbox + 1);
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBackfaceVisibility e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBackfaceVisibility e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case BackfaceVisibilityVisible:
|
| - m_value.valueID = CSSValueVisible;
|
| + valueID = CSSValueVisible;
|
| break;
|
| case BackfaceVisibilityHidden:
|
| - m_value.valueID = CSSValueHidden;
|
| + valueID = CSSValueHidden;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBackfaceVisibility() const
|
| @@ -597,21 +590,21 @@ template<> inline CSSPrimitiveValue::operator EBackfaceVisibility() const
|
| }
|
|
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillAttachment e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EFillAttachment e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case ScrollBackgroundAttachment:
|
| - m_value.valueID = CSSValueScroll;
|
| + valueID = CSSValueScroll;
|
| break;
|
| case LocalBackgroundAttachment:
|
| - m_value.valueID = CSSValueLocal;
|
| + valueID = CSSValueLocal;
|
| break;
|
| case FixedBackgroundAttachment:
|
| - m_value.valueID = CSSValueFixed;
|
| + valueID = CSSValueFixed;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EFillAttachment() const
|
| @@ -632,24 +625,24 @@ template<> inline CSSPrimitiveValue::operator EFillAttachment() const
|
| return ScrollBackgroundAttachment;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillBox e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EFillBox e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case BorderFillBox:
|
| - m_value.valueID = CSSValueBorderBox;
|
| + valueID = CSSValueBorderBox;
|
| break;
|
| case PaddingFillBox:
|
| - m_value.valueID = CSSValuePaddingBox;
|
| + valueID = CSSValuePaddingBox;
|
| break;
|
| case ContentFillBox:
|
| - m_value.valueID = CSSValueContentBox;
|
| + valueID = CSSValueContentBox;
|
| break;
|
| case TextFillBox:
|
| - m_value.valueID = CSSValueText;
|
| + valueID = CSSValueText;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EFillBox() const
|
| @@ -676,24 +669,24 @@ template<> inline CSSPrimitiveValue::operator EFillBox() const
|
| return BorderFillBox;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillRepeat e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EFillRepeat e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case RepeatFill:
|
| - m_value.valueID = CSSValueRepeat;
|
| + valueID = CSSValueRepeat;
|
| break;
|
| case NoRepeatFill:
|
| - m_value.valueID = CSSValueNoRepeat;
|
| + valueID = CSSValueNoRepeat;
|
| break;
|
| case RoundFill:
|
| - m_value.valueID = CSSValueRound;
|
| + valueID = CSSValueRound;
|
| break;
|
| case SpaceFill:
|
| - m_value.valueID = CSSValueSpace;
|
| + valueID = CSSValueSpace;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EFillRepeat() const
|
| @@ -716,24 +709,24 @@ template<> inline CSSPrimitiveValue::operator EFillRepeat() const
|
| return RepeatFill;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxPack e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBoxPack e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case Start:
|
| - m_value.valueID = CSSValueStart;
|
| + valueID = CSSValueStart;
|
| break;
|
| case Center:
|
| - m_value.valueID = CSSValueCenter;
|
| + valueID = CSSValueCenter;
|
| break;
|
| case End:
|
| - m_value.valueID = CSSValueEnd;
|
| + valueID = CSSValueEnd;
|
| break;
|
| case Justify:
|
| - m_value.valueID = CSSValueJustify;
|
| + valueID = CSSValueJustify;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBoxPack() const
|
| @@ -756,27 +749,27 @@ template<> inline CSSPrimitiveValue::operator EBoxPack() const
|
| return Justify;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxAlignment e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBoxAlignment e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case BSTRETCH:
|
| - m_value.valueID = CSSValueStretch;
|
| + valueID = CSSValueStretch;
|
| break;
|
| case BSTART:
|
| - m_value.valueID = CSSValueStart;
|
| + valueID = CSSValueStart;
|
| break;
|
| case BCENTER:
|
| - m_value.valueID = CSSValueCenter;
|
| + valueID = CSSValueCenter;
|
| break;
|
| case BEND:
|
| - m_value.valueID = CSSValueEnd;
|
| + valueID = CSSValueEnd;
|
| break;
|
| case BBASELINE:
|
| - m_value.valueID = CSSValueBaseline;
|
| + valueID = CSSValueBaseline;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBoxAlignment() const
|
| @@ -801,18 +794,18 @@ template<> inline CSSPrimitiveValue::operator EBoxAlignment() const
|
| return BSTRETCH;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxDecorationBreak e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBoxDecorationBreak e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case DSLICE:
|
| - m_value.valueID = CSSValueSlice;
|
| + valueID = CSSValueSlice;
|
| break;
|
| case DCLONE:
|
| - m_value.valueID = CSSValueClone;
|
| + valueID = CSSValueClone;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBoxDecorationBreak() const
|
| @@ -831,24 +824,24 @@ template<> inline CSSPrimitiveValue::operator EBoxDecorationBreak() const
|
| return DSLICE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(BackgroundEdgeOrigin e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(BackgroundEdgeOrigin e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TopEdge:
|
| - m_value.valueID = CSSValueTop;
|
| + valueID = CSSValueTop;
|
| break;
|
| case RightEdge:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| break;
|
| case BottomEdge:
|
| - m_value.valueID = CSSValueBottom;
|
| + valueID = CSSValueBottom;
|
| break;
|
| case LeftEdge:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator BackgroundEdgeOrigin() const
|
| @@ -871,18 +864,18 @@ template<> inline CSSPrimitiveValue::operator BackgroundEdgeOrigin() const
|
| return TopEdge;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxSizing e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBoxSizing e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case BORDER_BOX:
|
| - m_value.valueID = CSSValueBorderBox;
|
| + valueID = CSSValueBorderBox;
|
| break;
|
| case CONTENT_BOX:
|
| - m_value.valueID = CSSValueContentBox;
|
| + valueID = CSSValueContentBox;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBoxSizing() const
|
| @@ -901,18 +894,18 @@ template<> inline CSSPrimitiveValue::operator EBoxSizing() const
|
| return BORDER_BOX;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxDirection e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBoxDirection e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case BNORMAL:
|
| - m_value.valueID = CSSValueNormal;
|
| + valueID = CSSValueNormal;
|
| break;
|
| case BREVERSE:
|
| - m_value.valueID = CSSValueReverse;
|
| + valueID = CSSValueReverse;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBoxDirection() const
|
| @@ -931,18 +924,18 @@ template<> inline CSSPrimitiveValue::operator EBoxDirection() const
|
| return BNORMAL;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxLines e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBoxLines e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case SINGLE:
|
| - m_value.valueID = CSSValueSingle;
|
| + valueID = CSSValueSingle;
|
| break;
|
| case MULTIPLE:
|
| - m_value.valueID = CSSValueMultiple;
|
| + valueID = CSSValueMultiple;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBoxLines() const
|
| @@ -961,18 +954,18 @@ template<> inline CSSPrimitiveValue::operator EBoxLines() const
|
| return SINGLE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxOrient e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBoxOrient e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case HORIZONTAL:
|
| - m_value.valueID = CSSValueHorizontal;
|
| + valueID = CSSValueHorizontal;
|
| break;
|
| case VERTICAL:
|
| - m_value.valueID = CSSValueVertical;
|
| + valueID = CSSValueVertical;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBoxOrient() const
|
| @@ -993,24 +986,24 @@ template<> inline CSSPrimitiveValue::operator EBoxOrient() const
|
| return HORIZONTAL;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ECaptionSide e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ECaptionSide e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case CAPLEFT:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| case CAPRIGHT:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| break;
|
| case CAPTOP:
|
| - m_value.valueID = CSSValueTop;
|
| + valueID = CSSValueTop;
|
| break;
|
| case CAPBOTTOM:
|
| - m_value.valueID = CSSValueBottom;
|
| + valueID = CSSValueBottom;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ECaptionSide() const
|
| @@ -1033,24 +1026,24 @@ template<> inline CSSPrimitiveValue::operator ECaptionSide() const
|
| return CAPTOP;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EClear e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EClear e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case CNONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case CLEFT:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| case CRIGHT:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| break;
|
| case CBOTH:
|
| - m_value.valueID = CSSValueBoth;
|
| + valueID = CSSValueBoth;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EClear() const
|
| @@ -1073,120 +1066,120 @@ template<> inline CSSPrimitiveValue::operator EClear() const
|
| return CNONE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ECursor e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ECursor e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case CURSOR_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case CURSOR_CROSS:
|
| - m_value.valueID = CSSValueCrosshair;
|
| + valueID = CSSValueCrosshair;
|
| break;
|
| case CURSOR_DEFAULT:
|
| - m_value.valueID = CSSValueDefault;
|
| + valueID = CSSValueDefault;
|
| break;
|
| case CURSOR_POINTER:
|
| - m_value.valueID = CSSValuePointer;
|
| + valueID = CSSValuePointer;
|
| break;
|
| case CURSOR_MOVE:
|
| - m_value.valueID = CSSValueMove;
|
| + valueID = CSSValueMove;
|
| break;
|
| case CURSOR_CELL:
|
| - m_value.valueID = CSSValueCell;
|
| + valueID = CSSValueCell;
|
| break;
|
| case CURSOR_VERTICAL_TEXT:
|
| - m_value.valueID = CSSValueVerticalText;
|
| + valueID = CSSValueVerticalText;
|
| break;
|
| case CURSOR_CONTEXT_MENU:
|
| - m_value.valueID = CSSValueContextMenu;
|
| + valueID = CSSValueContextMenu;
|
| break;
|
| case CURSOR_ALIAS:
|
| - m_value.valueID = CSSValueAlias;
|
| + valueID = CSSValueAlias;
|
| break;
|
| case CURSOR_COPY:
|
| - m_value.valueID = CSSValueCopy;
|
| + valueID = CSSValueCopy;
|
| break;
|
| case CURSOR_NONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case CURSOR_PROGRESS:
|
| - m_value.valueID = CSSValueProgress;
|
| + valueID = CSSValueProgress;
|
| break;
|
| case CURSOR_NO_DROP:
|
| - m_value.valueID = CSSValueNoDrop;
|
| + valueID = CSSValueNoDrop;
|
| break;
|
| case CURSOR_NOT_ALLOWED:
|
| - m_value.valueID = CSSValueNotAllowed;
|
| + valueID = CSSValueNotAllowed;
|
| break;
|
| case CURSOR_ZOOM_IN:
|
| - m_value.valueID = CSSValueZoomIn;
|
| + valueID = CSSValueZoomIn;
|
| break;
|
| case CURSOR_ZOOM_OUT:
|
| - m_value.valueID = CSSValueZoomOut;
|
| + valueID = CSSValueZoomOut;
|
| break;
|
| case CURSOR_E_RESIZE:
|
| - m_value.valueID = CSSValueEResize;
|
| + valueID = CSSValueEResize;
|
| break;
|
| case CURSOR_NE_RESIZE:
|
| - m_value.valueID = CSSValueNeResize;
|
| + valueID = CSSValueNeResize;
|
| break;
|
| case CURSOR_NW_RESIZE:
|
| - m_value.valueID = CSSValueNwResize;
|
| + valueID = CSSValueNwResize;
|
| break;
|
| case CURSOR_N_RESIZE:
|
| - m_value.valueID = CSSValueNResize;
|
| + valueID = CSSValueNResize;
|
| break;
|
| case CURSOR_SE_RESIZE:
|
| - m_value.valueID = CSSValueSeResize;
|
| + valueID = CSSValueSeResize;
|
| break;
|
| case CURSOR_SW_RESIZE:
|
| - m_value.valueID = CSSValueSwResize;
|
| + valueID = CSSValueSwResize;
|
| break;
|
| case CURSOR_S_RESIZE:
|
| - m_value.valueID = CSSValueSResize;
|
| + valueID = CSSValueSResize;
|
| break;
|
| case CURSOR_W_RESIZE:
|
| - m_value.valueID = CSSValueWResize;
|
| + valueID = CSSValueWResize;
|
| break;
|
| case CURSOR_EW_RESIZE:
|
| - m_value.valueID = CSSValueEwResize;
|
| + valueID = CSSValueEwResize;
|
| break;
|
| case CURSOR_NS_RESIZE:
|
| - m_value.valueID = CSSValueNsResize;
|
| + valueID = CSSValueNsResize;
|
| break;
|
| case CURSOR_NESW_RESIZE:
|
| - m_value.valueID = CSSValueNeswResize;
|
| + valueID = CSSValueNeswResize;
|
| break;
|
| case CURSOR_NWSE_RESIZE:
|
| - m_value.valueID = CSSValueNwseResize;
|
| + valueID = CSSValueNwseResize;
|
| break;
|
| case CURSOR_COL_RESIZE:
|
| - m_value.valueID = CSSValueColResize;
|
| + valueID = CSSValueColResize;
|
| break;
|
| case CURSOR_ROW_RESIZE:
|
| - m_value.valueID = CSSValueRowResize;
|
| + valueID = CSSValueRowResize;
|
| break;
|
| case CURSOR_TEXT:
|
| - m_value.valueID = CSSValueText;
|
| + valueID = CSSValueText;
|
| break;
|
| case CURSOR_WAIT:
|
| - m_value.valueID = CSSValueWait;
|
| + valueID = CSSValueWait;
|
| break;
|
| case CURSOR_HELP:
|
| - m_value.valueID = CSSValueHelp;
|
| + valueID = CSSValueHelp;
|
| break;
|
| case CURSOR_ALL_SCROLL:
|
| - m_value.valueID = CSSValueAllScroll;
|
| + valueID = CSSValueAllScroll;
|
| break;
|
| case CURSOR_WEBKIT_GRAB:
|
| - m_value.valueID = CSSValueWebkitGrab;
|
| + valueID = CSSValueWebkitGrab;
|
| break;
|
| case CURSOR_WEBKIT_GRABBING:
|
| - m_value.valueID = CSSValueWebkitGrabbing;
|
| + valueID = CSSValueWebkitGrabbing;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ECursor() const
|
| @@ -1206,75 +1199,75 @@ template<> inline CSSPrimitiveValue::operator ECursor() const
|
| }
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EDisplay e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case INLINE:
|
| - m_value.valueID = CSSValueInline;
|
| + valueID = CSSValueInline;
|
| break;
|
| case BLOCK:
|
| - m_value.valueID = CSSValueBlock;
|
| + valueID = CSSValueBlock;
|
| break;
|
| case LIST_ITEM:
|
| - m_value.valueID = CSSValueListItem;
|
| + valueID = CSSValueListItem;
|
| break;
|
| case INLINE_BLOCK:
|
| - m_value.valueID = CSSValueInlineBlock;
|
| + valueID = CSSValueInlineBlock;
|
| break;
|
| case TABLE:
|
| - m_value.valueID = CSSValueTable;
|
| + valueID = CSSValueTable;
|
| break;
|
| case INLINE_TABLE:
|
| - m_value.valueID = CSSValueInlineTable;
|
| + valueID = CSSValueInlineTable;
|
| break;
|
| case TABLE_ROW_GROUP:
|
| - m_value.valueID = CSSValueTableRowGroup;
|
| + valueID = CSSValueTableRowGroup;
|
| break;
|
| case TABLE_HEADER_GROUP:
|
| - m_value.valueID = CSSValueTableHeaderGroup;
|
| + valueID = CSSValueTableHeaderGroup;
|
| break;
|
| case TABLE_FOOTER_GROUP:
|
| - m_value.valueID = CSSValueTableFooterGroup;
|
| + valueID = CSSValueTableFooterGroup;
|
| break;
|
| case TABLE_ROW:
|
| - m_value.valueID = CSSValueTableRow;
|
| + valueID = CSSValueTableRow;
|
| break;
|
| case TABLE_COLUMN_GROUP:
|
| - m_value.valueID = CSSValueTableColumnGroup;
|
| + valueID = CSSValueTableColumnGroup;
|
| break;
|
| case TABLE_COLUMN:
|
| - m_value.valueID = CSSValueTableColumn;
|
| + valueID = CSSValueTableColumn;
|
| break;
|
| case TABLE_CELL:
|
| - m_value.valueID = CSSValueTableCell;
|
| + valueID = CSSValueTableCell;
|
| break;
|
| case TABLE_CAPTION:
|
| - m_value.valueID = CSSValueTableCaption;
|
| + valueID = CSSValueTableCaption;
|
| break;
|
| case BOX:
|
| - m_value.valueID = CSSValueWebkitBox;
|
| + valueID = CSSValueWebkitBox;
|
| break;
|
| case INLINE_BOX:
|
| - m_value.valueID = CSSValueWebkitInlineBox;
|
| + valueID = CSSValueWebkitInlineBox;
|
| break;
|
| case FLEX:
|
| - m_value.valueID = CSSValueFlex;
|
| + valueID = CSSValueFlex;
|
| break;
|
| case INLINE_FLEX:
|
| - m_value.valueID = CSSValueInlineFlex;
|
| + valueID = CSSValueInlineFlex;
|
| break;
|
| case GRID:
|
| - m_value.valueID = CSSValueGrid;
|
| + valueID = CSSValueGrid;
|
| break;
|
| case INLINE_GRID:
|
| - m_value.valueID = CSSValueInlineGrid;
|
| + valueID = CSSValueInlineGrid;
|
| break;
|
| case NONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EDisplay() const
|
| @@ -1293,18 +1286,18 @@ template<> inline CSSPrimitiveValue::operator EDisplay() const
|
| return display;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCell e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EEmptyCell e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case SHOW:
|
| - m_value.valueID = CSSValueShow;
|
| + valueID = CSSValueShow;
|
| break;
|
| case HIDE:
|
| - m_value.valueID = CSSValueHide;
|
| + valueID = CSSValueHide;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EEmptyCell() const
|
| @@ -1323,24 +1316,24 @@ template<> inline CSSPrimitiveValue::operator EEmptyCell() const
|
| return SHOW;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexDirection e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EFlexDirection e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case FlowRow:
|
| - m_value.valueID = CSSValueRow;
|
| + valueID = CSSValueRow;
|
| break;
|
| case FlowRowReverse:
|
| - m_value.valueID = CSSValueRowReverse;
|
| + valueID = CSSValueRowReverse;
|
| break;
|
| case FlowColumn:
|
| - m_value.valueID = CSSValueColumn;
|
| + valueID = CSSValueColumn;
|
| break;
|
| case FlowColumnReverse:
|
| - m_value.valueID = CSSValueColumnReverse;
|
| + valueID = CSSValueColumnReverse;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EFlexDirection() const
|
| @@ -1363,21 +1356,21 @@ template<> inline CSSPrimitiveValue::operator EFlexDirection() const
|
| return FlowRow;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexWrap e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EFlexWrap e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case FlexNoWrap:
|
| - m_value.valueID = CSSValueNowrap;
|
| + valueID = CSSValueNowrap;
|
| break;
|
| case FlexWrap:
|
| - m_value.valueID = CSSValueWrap;
|
| + valueID = CSSValueWrap;
|
| break;
|
| case FlexWrapReverse:
|
| - m_value.valueID = CSSValueWrapReverse;
|
| + valueID = CSSValueWrapReverse;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EFlexWrap() const
|
| @@ -1398,21 +1391,21 @@ template<> inline CSSPrimitiveValue::operator EFlexWrap() const
|
| return FlexNoWrap;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFloat e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EFloat e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case NoFloat:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case LeftFloat:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| case RightFloat:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EFloat() const
|
| @@ -1433,27 +1426,27 @@ template<> inline CSSPrimitiveValue::operator EFloat() const
|
| return NoFloat;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineBreak e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(LineBreak e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case LineBreakAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case LineBreakLoose:
|
| - m_value.valueID = CSSValueLoose;
|
| + valueID = CSSValueLoose;
|
| break;
|
| case LineBreakNormal:
|
| - m_value.valueID = CSSValueNormal;
|
| + valueID = CSSValueNormal;
|
| break;
|
| case LineBreakStrict:
|
| - m_value.valueID = CSSValueStrict;
|
| + valueID = CSSValueStrict;
|
| break;
|
| case LineBreakAfterWhiteSpace:
|
| - m_value.valueID = CSSValueAfterWhiteSpace;
|
| + valueID = CSSValueAfterWhiteSpace;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator LineBreak() const
|
| @@ -1478,18 +1471,18 @@ template<> inline CSSPrimitiveValue::operator LineBreak() const
|
| return LineBreakAuto;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EListStylePosition e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EListStylePosition e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case OUTSIDE:
|
| - m_value.valueID = CSSValueOutside;
|
| + valueID = CSSValueOutside;
|
| break;
|
| case INSIDE:
|
| - m_value.valueID = CSSValueInside;
|
| + valueID = CSSValueInside;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EListStylePosition() const
|
| @@ -1508,180 +1501,180 @@ template<> inline CSSPrimitiveValue::operator EListStylePosition() const
|
| return OUTSIDE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EListStyleType e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EListStyleType e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case ArabicIndic:
|
| - m_value.valueID = CSSValueArabicIndic;
|
| + valueID = CSSValueArabicIndic;
|
| break;
|
| case Armenian:
|
| - m_value.valueID = CSSValueArmenian;
|
| + valueID = CSSValueArmenian;
|
| break;
|
| case Bengali:
|
| - m_value.valueID = CSSValueBengali;
|
| + valueID = CSSValueBengali;
|
| break;
|
| case Cambodian:
|
| - m_value.valueID = CSSValueCambodian;
|
| + valueID = CSSValueCambodian;
|
| break;
|
| case Circle:
|
| - m_value.valueID = CSSValueCircle;
|
| + valueID = CSSValueCircle;
|
| break;
|
| case CjkEarthlyBranch:
|
| - m_value.valueID = CSSValueCjkEarthlyBranch;
|
| + valueID = CSSValueCjkEarthlyBranch;
|
| break;
|
| case CjkHeavenlyStem:
|
| - m_value.valueID = CSSValueCjkHeavenlyStem;
|
| + valueID = CSSValueCjkHeavenlyStem;
|
| break;
|
| case CJKIdeographic:
|
| - m_value.valueID = CSSValueCjkIdeographic;
|
| + valueID = CSSValueCjkIdeographic;
|
| break;
|
| case DecimalLeadingZero:
|
| - m_value.valueID = CSSValueDecimalLeadingZero;
|
| + valueID = CSSValueDecimalLeadingZero;
|
| break;
|
| case DecimalListStyle:
|
| - m_value.valueID = CSSValueDecimal;
|
| + valueID = CSSValueDecimal;
|
| break;
|
| case Devanagari:
|
| - m_value.valueID = CSSValueDevanagari;
|
| + valueID = CSSValueDevanagari;
|
| break;
|
| case Disc:
|
| - m_value.valueID = CSSValueDisc;
|
| + valueID = CSSValueDisc;
|
| break;
|
| case EthiopicHalehame:
|
| - m_value.valueID = CSSValueEthiopicHalehame;
|
| + valueID = CSSValueEthiopicHalehame;
|
| break;
|
| case EthiopicHalehameAm:
|
| - m_value.valueID = CSSValueEthiopicHalehameAm;
|
| + valueID = CSSValueEthiopicHalehameAm;
|
| break;
|
| case EthiopicHalehameTiEt:
|
| - m_value.valueID = CSSValueEthiopicHalehameTiEt;
|
| + valueID = CSSValueEthiopicHalehameTiEt;
|
| break;
|
| case EthiopicHalehameTiEr:
|
| - m_value.valueID = CSSValueEthiopicHalehameTiEr;
|
| + valueID = CSSValueEthiopicHalehameTiEr;
|
| break;
|
| case Georgian:
|
| - m_value.valueID = CSSValueGeorgian;
|
| + valueID = CSSValueGeorgian;
|
| break;
|
| case Gujarati:
|
| - m_value.valueID = CSSValueGujarati;
|
| + valueID = CSSValueGujarati;
|
| break;
|
| case Gurmukhi:
|
| - m_value.valueID = CSSValueGurmukhi;
|
| + valueID = CSSValueGurmukhi;
|
| break;
|
| case Hangul:
|
| - m_value.valueID = CSSValueHangul;
|
| + valueID = CSSValueHangul;
|
| break;
|
| case HangulConsonant:
|
| - m_value.valueID = CSSValueHangulConsonant;
|
| + valueID = CSSValueHangulConsonant;
|
| break;
|
| case KoreanHangulFormal:
|
| - m_value.valueID = CSSValueKoreanHangulFormal;
|
| + valueID = CSSValueKoreanHangulFormal;
|
| break;
|
| case KoreanHanjaFormal:
|
| - m_value.valueID = CSSValueKoreanHanjaFormal;
|
| + valueID = CSSValueKoreanHanjaFormal;
|
| break;
|
| case KoreanHanjaInformal:
|
| - m_value.valueID = CSSValueKoreanHanjaInformal;
|
| + valueID = CSSValueKoreanHanjaInformal;
|
| break;
|
| case Hebrew:
|
| - m_value.valueID = CSSValueHebrew;
|
| + valueID = CSSValueHebrew;
|
| break;
|
| case Hiragana:
|
| - m_value.valueID = CSSValueHiragana;
|
| + valueID = CSSValueHiragana;
|
| break;
|
| case HiraganaIroha:
|
| - m_value.valueID = CSSValueHiraganaIroha;
|
| + valueID = CSSValueHiraganaIroha;
|
| break;
|
| case Kannada:
|
| - m_value.valueID = CSSValueKannada;
|
| + valueID = CSSValueKannada;
|
| break;
|
| case Katakana:
|
| - m_value.valueID = CSSValueKatakana;
|
| + valueID = CSSValueKatakana;
|
| break;
|
| case KatakanaIroha:
|
| - m_value.valueID = CSSValueKatakanaIroha;
|
| + valueID = CSSValueKatakanaIroha;
|
| break;
|
| case Khmer:
|
| - m_value.valueID = CSSValueKhmer;
|
| + valueID = CSSValueKhmer;
|
| break;
|
| case Lao:
|
| - m_value.valueID = CSSValueLao;
|
| + valueID = CSSValueLao;
|
| break;
|
| case LowerAlpha:
|
| - m_value.valueID = CSSValueLowerAlpha;
|
| + valueID = CSSValueLowerAlpha;
|
| break;
|
| case LowerArmenian:
|
| - m_value.valueID = CSSValueLowerArmenian;
|
| + valueID = CSSValueLowerArmenian;
|
| break;
|
| case LowerGreek:
|
| - m_value.valueID = CSSValueLowerGreek;
|
| + valueID = CSSValueLowerGreek;
|
| break;
|
| case LowerLatin:
|
| - m_value.valueID = CSSValueLowerLatin;
|
| + valueID = CSSValueLowerLatin;
|
| break;
|
| case LowerRoman:
|
| - m_value.valueID = CSSValueLowerRoman;
|
| + valueID = CSSValueLowerRoman;
|
| break;
|
| case Malayalam:
|
| - m_value.valueID = CSSValueMalayalam;
|
| + valueID = CSSValueMalayalam;
|
| break;
|
| case Mongolian:
|
| - m_value.valueID = CSSValueMongolian;
|
| + valueID = CSSValueMongolian;
|
| break;
|
| case Myanmar:
|
| - m_value.valueID = CSSValueMyanmar;
|
| + valueID = CSSValueMyanmar;
|
| break;
|
| case NoneListStyle:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case Oriya:
|
| - m_value.valueID = CSSValueOriya;
|
| + valueID = CSSValueOriya;
|
| break;
|
| case Persian:
|
| - m_value.valueID = CSSValuePersian;
|
| + valueID = CSSValuePersian;
|
| break;
|
| case SimpChineseFormal:
|
| - m_value.valueID = CSSValueSimpChineseFormal;
|
| + valueID = CSSValueSimpChineseFormal;
|
| break;
|
| case SimpChineseInformal:
|
| - m_value.valueID = CSSValueSimpChineseInformal;
|
| + valueID = CSSValueSimpChineseInformal;
|
| break;
|
| case Square:
|
| - m_value.valueID = CSSValueSquare;
|
| + valueID = CSSValueSquare;
|
| break;
|
| case Telugu:
|
| - m_value.valueID = CSSValueTelugu;
|
| + valueID = CSSValueTelugu;
|
| break;
|
| case Thai:
|
| - m_value.valueID = CSSValueThai;
|
| + valueID = CSSValueThai;
|
| break;
|
| case Tibetan:
|
| - m_value.valueID = CSSValueTibetan;
|
| + valueID = CSSValueTibetan;
|
| break;
|
| case TradChineseFormal:
|
| - m_value.valueID = CSSValueTradChineseFormal;
|
| + valueID = CSSValueTradChineseFormal;
|
| break;
|
| case TradChineseInformal:
|
| - m_value.valueID = CSSValueTradChineseInformal;
|
| + valueID = CSSValueTradChineseInformal;
|
| break;
|
| case UpperAlpha:
|
| - m_value.valueID = CSSValueUpperAlpha;
|
| + valueID = CSSValueUpperAlpha;
|
| break;
|
| case UpperArmenian:
|
| - m_value.valueID = CSSValueUpperArmenian;
|
| + valueID = CSSValueUpperArmenian;
|
| break;
|
| case UpperLatin:
|
| - m_value.valueID = CSSValueUpperLatin;
|
| + valueID = CSSValueUpperLatin;
|
| break;
|
| case UpperRoman:
|
| - m_value.valueID = CSSValueUpperRoman;
|
| + valueID = CSSValueUpperRoman;
|
| break;
|
| case Urdu:
|
| - m_value.valueID = CSSValueUrdu;
|
| + valueID = CSSValueUrdu;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EListStyleType() const
|
| @@ -1695,21 +1688,21 @@ template<> inline CSSPrimitiveValue::operator EListStyleType() const
|
| }
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMarginCollapse e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EMarginCollapse e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case MCOLLAPSE:
|
| - m_value.valueID = CSSValueCollapse;
|
| + valueID = CSSValueCollapse;
|
| break;
|
| case MSEPARATE:
|
| - m_value.valueID = CSSValueSeparate;
|
| + valueID = CSSValueSeparate;
|
| break;
|
| case MDISCARD:
|
| - m_value.valueID = CSSValueDiscard;
|
| + valueID = CSSValueDiscard;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EMarginCollapse() const
|
| @@ -1730,33 +1723,33 @@ template<> inline CSSPrimitiveValue::operator EMarginCollapse() const
|
| return MCOLLAPSE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EOverflow e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EOverflow e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case OVISIBLE:
|
| - m_value.valueID = CSSValueVisible;
|
| + valueID = CSSValueVisible;
|
| break;
|
| case OHIDDEN:
|
| - m_value.valueID = CSSValueHidden;
|
| + valueID = CSSValueHidden;
|
| break;
|
| case OSCROLL:
|
| - m_value.valueID = CSSValueScroll;
|
| + valueID = CSSValueScroll;
|
| break;
|
| case OAUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case OOVERLAY:
|
| - m_value.valueID = CSSValueOverlay;
|
| + valueID = CSSValueOverlay;
|
| break;
|
| case OPAGEDX:
|
| - m_value.valueID = CSSValueWebkitPagedX;
|
| + valueID = CSSValueWebkitPagedX;
|
| break;
|
| case OPAGEDY:
|
| - m_value.valueID = CSSValueWebkitPagedY;
|
| + valueID = CSSValueWebkitPagedY;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EOverflow() const
|
| @@ -1785,21 +1778,21 @@ template<> inline CSSPrimitiveValue::operator EOverflow() const
|
| return OVISIBLE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPageBreak e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EPageBreak e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case PBAUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case PBALWAYS:
|
| - m_value.valueID = CSSValueAlways;
|
| + valueID = CSSValueAlways;
|
| break;
|
| case PBAVOID:
|
| - m_value.valueID = CSSValueAvoid;
|
| + valueID = CSSValueAvoid;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EPageBreak() const
|
| @@ -1822,27 +1815,27 @@ template<> inline CSSPrimitiveValue::operator EPageBreak() const
|
| return PBAUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPosition e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EPosition e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case StaticPosition:
|
| - m_value.valueID = CSSValueStatic;
|
| + valueID = CSSValueStatic;
|
| break;
|
| case RelativePosition:
|
| - m_value.valueID = CSSValueRelative;
|
| + valueID = CSSValueRelative;
|
| break;
|
| case AbsolutePosition:
|
| - m_value.valueID = CSSValueAbsolute;
|
| + valueID = CSSValueAbsolute;
|
| break;
|
| case FixedPosition:
|
| - m_value.valueID = CSSValueFixed;
|
| + valueID = CSSValueFixed;
|
| break;
|
| case StickyPosition:
|
| - m_value.valueID = CSSValueSticky;
|
| + valueID = CSSValueSticky;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EPosition() const
|
| @@ -1867,24 +1860,24 @@ template<> inline CSSPrimitiveValue::operator EPosition() const
|
| return StaticPosition;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EResize e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EResize e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case RESIZE_BOTH:
|
| - m_value.valueID = CSSValueBoth;
|
| + valueID = CSSValueBoth;
|
| break;
|
| case RESIZE_HORIZONTAL:
|
| - m_value.valueID = CSSValueHorizontal;
|
| + valueID = CSSValueHorizontal;
|
| break;
|
| case RESIZE_VERTICAL:
|
| - m_value.valueID = CSSValueVertical;
|
| + valueID = CSSValueVertical;
|
| break;
|
| case RESIZE_NONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EResize() const
|
| @@ -1910,18 +1903,18 @@ template<> inline CSSPrimitiveValue::operator EResize() const
|
| return RESIZE_NONE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETableLayout e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ETableLayout e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TAUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case TFIXED:
|
| - m_value.valueID = CSSValueFixed;
|
| + valueID = CSSValueFixed;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ETableLayout() const
|
| @@ -1940,39 +1933,39 @@ template<> inline CSSPrimitiveValue::operator ETableLayout() const
|
| return TAUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextAlign e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ETextAlign e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TASTART:
|
| - m_value.valueID = CSSValueStart;
|
| + valueID = CSSValueStart;
|
| break;
|
| case TAEND:
|
| - m_value.valueID = CSSValueEnd;
|
| + valueID = CSSValueEnd;
|
| break;
|
| case LEFT:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| case RIGHT:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| break;
|
| case CENTER:
|
| - m_value.valueID = CSSValueCenter;
|
| + valueID = CSSValueCenter;
|
| break;
|
| case JUSTIFY:
|
| - m_value.valueID = CSSValueJustify;
|
| + valueID = CSSValueJustify;
|
| break;
|
| case WEBKIT_LEFT:
|
| - m_value.valueID = CSSValueWebkitLeft;
|
| + valueID = CSSValueWebkitLeft;
|
| break;
|
| case WEBKIT_RIGHT:
|
| - m_value.valueID = CSSValueWebkitRight;
|
| + valueID = CSSValueWebkitRight;
|
| break;
|
| case WEBKIT_CENTER:
|
| - m_value.valueID = CSSValueWebkitCenter;
|
| + valueID = CSSValueWebkitCenter;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ETextAlign() const
|
| @@ -1989,33 +1982,33 @@ template<> inline CSSPrimitiveValue::operator ETextAlign() const
|
| }
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextAlignLast e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextAlignLast e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TextAlignLastStart:
|
| - m_value.valueID = CSSValueStart;
|
| + valueID = CSSValueStart;
|
| break;
|
| case TextAlignLastEnd:
|
| - m_value.valueID = CSSValueEnd;
|
| + valueID = CSSValueEnd;
|
| break;
|
| case TextAlignLastLeft:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| case TextAlignLastRight:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| break;
|
| case TextAlignLastCenter:
|
| - m_value.valueID = CSSValueCenter;
|
| + valueID = CSSValueCenter;
|
| break;
|
| case TextAlignLastJustify:
|
| - m_value.valueID = CSSValueJustify;
|
| + valueID = CSSValueJustify;
|
| break;
|
| case TextAlignLastAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextAlignLast() const
|
| @@ -2044,24 +2037,24 @@ template<> inline CSSPrimitiveValue::operator TextAlignLast() const
|
| return TextAlignLastAuto;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextJustify e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextJustify e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TextJustifyAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case TextJustifyNone:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case TextJustifyInterWord:
|
| - m_value.valueID = CSSValueInterWord;
|
| + valueID = CSSValueInterWord;
|
| break;
|
| case TextJustifyDistribute:
|
| - m_value.valueID = CSSValueDistribute;
|
| + valueID = CSSValueDistribute;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextJustify() const
|
| @@ -2127,20 +2120,20 @@ template<> inline CSSPrimitiveValue::operator TextDecorationStyle() const
|
| return TextDecorationStyleSolid;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextUnderlinePosition e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextUnderlinePosition e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TextUnderlinePositionAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case TextUnderlinePositionUnder:
|
| - m_value.valueID = CSSValueUnder;
|
| + valueID = CSSValueUnder;
|
| break;
|
| }
|
|
|
| // FIXME: Implement support for 'under left' and 'under right' values.
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextUnderlinePosition() const
|
| @@ -2161,24 +2154,24 @@ template<> inline CSSPrimitiveValue::operator TextUnderlinePosition() const
|
| return TextUnderlinePositionAuto;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextSecurity e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ETextSecurity e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TSNONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case TSDISC:
|
| - m_value.valueID = CSSValueDisc;
|
| + valueID = CSSValueDisc;
|
| break;
|
| case TSCIRCLE:
|
| - m_value.valueID = CSSValueCircle;
|
| + valueID = CSSValueCircle;
|
| break;
|
| case TSSQUARE:
|
| - m_value.valueID = CSSValueSquare;
|
| + valueID = CSSValueSquare;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ETextSecurity() const
|
| @@ -2201,24 +2194,24 @@ template<> inline CSSPrimitiveValue::operator ETextSecurity() const
|
| return TSNONE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextTransform e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ETextTransform e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case CAPITALIZE:
|
| - m_value.valueID = CSSValueCapitalize;
|
| + valueID = CSSValueCapitalize;
|
| break;
|
| case UPPERCASE:
|
| - m_value.valueID = CSSValueUppercase;
|
| + valueID = CSSValueUppercase;
|
| break;
|
| case LOWERCASE:
|
| - m_value.valueID = CSSValueLowercase;
|
| + valueID = CSSValueLowercase;
|
| break;
|
| case TTNONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ETextTransform() const
|
| @@ -2241,30 +2234,30 @@ template<> inline CSSPrimitiveValue::operator ETextTransform() const
|
| return TTNONE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EUnicodeBidi e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EUnicodeBidi e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case UBNormal:
|
| - m_value.valueID = CSSValueNormal;
|
| + valueID = CSSValueNormal;
|
| break;
|
| case Embed:
|
| - m_value.valueID = CSSValueEmbed;
|
| + valueID = CSSValueEmbed;
|
| break;
|
| case Override:
|
| - m_value.valueID = CSSValueBidiOverride;
|
| + valueID = CSSValueBidiOverride;
|
| break;
|
| case Isolate:
|
| - m_value.valueID = CSSValueWebkitIsolate;
|
| + valueID = CSSValueWebkitIsolate;
|
| break;
|
| case IsolateOverride:
|
| - m_value.valueID = CSSValueWebkitIsolateOverride;
|
| + valueID = CSSValueWebkitIsolateOverride;
|
| break;
|
| case Plaintext:
|
| - m_value.valueID = CSSValueWebkitPlaintext;
|
| + valueID = CSSValueWebkitPlaintext;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EUnicodeBidi() const
|
| @@ -2291,23 +2284,23 @@ template<> inline CSSPrimitiveValue::operator EUnicodeBidi() const
|
| return UBNormal;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EUserDrag e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EUserDrag e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case DRAG_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case DRAG_NONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case DRAG_ELEMENT:
|
| - m_value.valueID = CSSValueElement;
|
| + valueID = CSSValueElement;
|
| break;
|
| default:
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EUserDrag() const
|
| @@ -2328,21 +2321,21 @@ template<> inline CSSPrimitiveValue::operator EUserDrag() const
|
| return DRAG_AUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EUserModify e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EUserModify e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case READ_ONLY:
|
| - m_value.valueID = CSSValueReadOnly;
|
| + valueID = CSSValueReadOnly;
|
| break;
|
| case READ_WRITE:
|
| - m_value.valueID = CSSValueReadWrite;
|
| + valueID = CSSValueReadWrite;
|
| break;
|
| case READ_WRITE_PLAINTEXT_ONLY:
|
| - m_value.valueID = CSSValueReadWritePlaintextOnly;
|
| + valueID = CSSValueReadWritePlaintextOnly;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EUserModify() const
|
| @@ -2363,21 +2356,21 @@ template<> inline CSSPrimitiveValue::operator EUserModify() const
|
| return READ_ONLY;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EUserSelect e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EUserSelect e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case SELECT_NONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case SELECT_TEXT:
|
| - m_value.valueID = CSSValueText;
|
| + valueID = CSSValueText;
|
| break;
|
| case SELECT_ALL:
|
| - m_value.valueID = CSSValueAll;
|
| + valueID = CSSValueAll;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EUserSelect() const
|
| @@ -2400,41 +2393,41 @@ template<> inline CSSPrimitiveValue::operator EUserSelect() const
|
| return SELECT_TEXT;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EVerticalAlign a)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EVerticalAlign a)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (a) {
|
| case TOP:
|
| - m_value.valueID = CSSValueTop;
|
| + valueID = CSSValueTop;
|
| break;
|
| case BOTTOM:
|
| - m_value.valueID = CSSValueBottom;
|
| + valueID = CSSValueBottom;
|
| break;
|
| case MIDDLE:
|
| - m_value.valueID = CSSValueMiddle;
|
| + valueID = CSSValueMiddle;
|
| break;
|
| case BASELINE:
|
| - m_value.valueID = CSSValueBaseline;
|
| + valueID = CSSValueBaseline;
|
| break;
|
| case TEXT_BOTTOM:
|
| - m_value.valueID = CSSValueTextBottom;
|
| + valueID = CSSValueTextBottom;
|
| break;
|
| case TEXT_TOP:
|
| - m_value.valueID = CSSValueTextTop;
|
| + valueID = CSSValueTextTop;
|
| break;
|
| case SUB:
|
| - m_value.valueID = CSSValueSub;
|
| + valueID = CSSValueSub;
|
| break;
|
| case SUPER:
|
| - m_value.valueID = CSSValueSuper;
|
| + valueID = CSSValueSuper;
|
| break;
|
| case BASELINE_MIDDLE:
|
| - m_value.valueID = CSSValueWebkitBaselineMiddle;
|
| + valueID = CSSValueWebkitBaselineMiddle;
|
| break;
|
| case LENGTH:
|
| - m_value.valueID = CSSValueInvalid;
|
| + valueID = CSSValueInvalid;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EVerticalAlign() const
|
| @@ -2467,21 +2460,21 @@ template<> inline CSSPrimitiveValue::operator EVerticalAlign() const
|
| return TOP;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EVisibility e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EVisibility e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case VISIBLE:
|
| - m_value.valueID = CSSValueVisible;
|
| + valueID = CSSValueVisible;
|
| break;
|
| case HIDDEN:
|
| - m_value.valueID = CSSValueHidden;
|
| + valueID = CSSValueHidden;
|
| break;
|
| case COLLAPSE:
|
| - m_value.valueID = CSSValueCollapse;
|
| + valueID = CSSValueCollapse;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EVisibility() const
|
| @@ -2502,30 +2495,30 @@ template<> inline CSSPrimitiveValue::operator EVisibility() const
|
| return VISIBLE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EWhiteSpace e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EWhiteSpace e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case NORMAL:
|
| - m_value.valueID = CSSValueNormal;
|
| + valueID = CSSValueNormal;
|
| break;
|
| case PRE:
|
| - m_value.valueID = CSSValuePre;
|
| + valueID = CSSValuePre;
|
| break;
|
| case PRE_WRAP:
|
| - m_value.valueID = CSSValuePreWrap;
|
| + valueID = CSSValuePreWrap;
|
| break;
|
| case PRE_LINE:
|
| - m_value.valueID = CSSValuePreLine;
|
| + valueID = CSSValuePreLine;
|
| break;
|
| case NOWRAP:
|
| - m_value.valueID = CSSValueNowrap;
|
| + valueID = CSSValueNowrap;
|
| break;
|
| case KHTML_NOWRAP:
|
| - m_value.valueID = CSSValueWebkitNowrap;
|
| + valueID = CSSValueWebkitNowrap;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EWhiteSpace() const
|
| @@ -2552,24 +2545,24 @@ template<> inline CSSPrimitiveValue::operator EWhiteSpace() const
|
| return NORMAL;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EWordBreak e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EWordBreak e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case NormalWordBreak:
|
| - m_value.valueID = CSSValueNormal;
|
| + valueID = CSSValueNormal;
|
| break;
|
| case BreakAllWordBreak:
|
| - m_value.valueID = CSSValueBreakAll;
|
| + valueID = CSSValueBreakAll;
|
| break;
|
| case BreakWordBreak:
|
| - m_value.valueID = CSSValueBreakWord;
|
| + valueID = CSSValueBreakWord;
|
| break;
|
| case KeepAllWordBreak:
|
| - m_value.valueID = CSSValueKeepAll;
|
| + valueID = CSSValueKeepAll;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EWordBreak() const
|
| @@ -2592,18 +2585,18 @@ template<> inline CSSPrimitiveValue::operator EWordBreak() const
|
| return NormalWordBreak;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EOverflowWrap e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EOverflowWrap e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case NormalOverflowWrap:
|
| - m_value.valueID = CSSValueNormal;
|
| + valueID = CSSValueNormal;
|
| break;
|
| case BreakOverflowWrap:
|
| - m_value.valueID = CSSValueBreakWord;
|
| + valueID = CSSValueBreakWord;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EOverflowWrap() const
|
| @@ -2622,18 +2615,18 @@ template<> inline CSSPrimitiveValue::operator EOverflowWrap() const
|
| return NormalOverflowWrap;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextDirection e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextDirection e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case LTR:
|
| - m_value.valueID = CSSValueLtr;
|
| + valueID = CSSValueLtr;
|
| break;
|
| case RTL:
|
| - m_value.valueID = CSSValueRtl;
|
| + valueID = CSSValueRtl;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextDirection() const
|
| @@ -2652,24 +2645,24 @@ template<> inline CSSPrimitiveValue::operator TextDirection() const
|
| return LTR;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WritingMode e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(WritingMode e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TopToBottomWritingMode:
|
| - m_value.valueID = CSSValueHorizontalTb;
|
| + valueID = CSSValueHorizontalTb;
|
| break;
|
| case RightToLeftWritingMode:
|
| - m_value.valueID = CSSValueVerticalRl;
|
| + valueID = CSSValueVerticalRl;
|
| break;
|
| case LeftToRightWritingMode:
|
| - m_value.valueID = CSSValueVerticalLr;
|
| + valueID = CSSValueVerticalLr;
|
| break;
|
| case BottomToTopWritingMode:
|
| - m_value.valueID = CSSValueHorizontalBt;
|
| + valueID = CSSValueHorizontalBt;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator WritingMode() const
|
| @@ -2692,18 +2685,18 @@ template<> inline CSSPrimitiveValue::operator WritingMode() const
|
| return TopToBottomWritingMode;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextCombine e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextCombine e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TextCombineNone:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case TextCombineHorizontal:
|
| - m_value.valueID = CSSValueHorizontal;
|
| + valueID = CSSValueHorizontal;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextCombine() const
|
| @@ -2722,18 +2715,18 @@ template<> inline CSSPrimitiveValue::operator TextCombine() const
|
| return TextCombineNone;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(RubyPosition position)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(RubyPosition position)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (position) {
|
| case RubyPositionBefore:
|
| - m_value.valueID = CSSValueBefore;
|
| + valueID = CSSValueBefore;
|
| break;
|
| case RubyPositionAfter:
|
| - m_value.valueID = CSSValueAfter;
|
| + valueID = CSSValueAfter;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator RubyPosition() const
|
| @@ -2752,18 +2745,18 @@ template<> inline CSSPrimitiveValue::operator RubyPosition() const
|
| return RubyPositionBefore;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextEmphasisPosition position)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextEmphasisPosition position)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (position) {
|
| case TextEmphasisPositionOver:
|
| - m_value.valueID = CSSValueOver;
|
| + valueID = CSSValueOver;
|
| break;
|
| case TextEmphasisPositionUnder:
|
| - m_value.valueID = CSSValueUnder;
|
| + valueID = CSSValueUnder;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextEmphasisPosition() const
|
| @@ -2782,18 +2775,18 @@ template<> inline CSSPrimitiveValue::operator TextEmphasisPosition() const
|
| return TextEmphasisPositionOver;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextOverflow overflow)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextOverflow overflow)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (overflow) {
|
| case TextOverflowClip:
|
| - m_value.valueID = CSSValueClip;
|
| + valueID = CSSValueClip;
|
| break;
|
| case TextOverflowEllipsis:
|
| - m_value.valueID = CSSValueEllipsis;
|
| + valueID = CSSValueEllipsis;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextOverflow() const
|
| @@ -2812,18 +2805,18 @@ template<> inline CSSPrimitiveValue::operator TextOverflow() const
|
| return TextOverflowClip;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextEmphasisFill fill)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextEmphasisFill fill)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (fill) {
|
| case TextEmphasisFillFilled:
|
| - m_value.valueID = CSSValueFilled;
|
| + valueID = CSSValueFilled;
|
| break;
|
| case TextEmphasisFillOpen:
|
| - m_value.valueID = CSSValueOpen;
|
| + valueID = CSSValueOpen;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextEmphasisFill() const
|
| @@ -2842,33 +2835,33 @@ template<> inline CSSPrimitiveValue::operator TextEmphasisFill() const
|
| return TextEmphasisFillFilled;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextEmphasisMark mark)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextEmphasisMark mark)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (mark) {
|
| case TextEmphasisMarkDot:
|
| - m_value.valueID = CSSValueDot;
|
| + valueID = CSSValueDot;
|
| break;
|
| case TextEmphasisMarkCircle:
|
| - m_value.valueID = CSSValueCircle;
|
| + valueID = CSSValueCircle;
|
| break;
|
| case TextEmphasisMarkDoubleCircle:
|
| - m_value.valueID = CSSValueDoubleCircle;
|
| + valueID = CSSValueDoubleCircle;
|
| break;
|
| case TextEmphasisMarkTriangle:
|
| - m_value.valueID = CSSValueTriangle;
|
| + valueID = CSSValueTriangle;
|
| break;
|
| case TextEmphasisMarkSesame:
|
| - m_value.valueID = CSSValueSesame;
|
| + valueID = CSSValueSesame;
|
| break;
|
| case TextEmphasisMarkNone:
|
| case TextEmphasisMarkAuto:
|
| case TextEmphasisMarkCustom:
|
| ASSERT_NOT_REACHED();
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextEmphasisMark() const
|
| @@ -2895,24 +2888,24 @@ template<> inline CSSPrimitiveValue::operator TextEmphasisMark() const
|
| return TextEmphasisMarkNone;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextOrientation e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextOrientation e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TextOrientationSideways:
|
| - m_value.valueID = CSSValueSideways;
|
| + valueID = CSSValueSideways;
|
| break;
|
| case TextOrientationSidewaysRight:
|
| - m_value.valueID = CSSValueSidewaysRight;
|
| + valueID = CSSValueSidewaysRight;
|
| break;
|
| case TextOrientationVerticalRight:
|
| - m_value.valueID = CSSValueVerticalRight;
|
| + valueID = CSSValueVerticalRight;
|
| break;
|
| case TextOrientationUpright:
|
| - m_value.valueID = CSSValueUpright;
|
| + valueID = CSSValueUpright;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextOrientation() const
|
| @@ -2935,45 +2928,45 @@ template<> inline CSSPrimitiveValue::operator TextOrientation() const
|
| return TextOrientationVerticalRight;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPointerEvents e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EPointerEvents e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case PE_NONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case PE_STROKE:
|
| - m_value.valueID = CSSValueStroke;
|
| + valueID = CSSValueStroke;
|
| break;
|
| case PE_FILL:
|
| - m_value.valueID = CSSValueFill;
|
| + valueID = CSSValueFill;
|
| break;
|
| case PE_PAINTED:
|
| - m_value.valueID = CSSValuePainted;
|
| + valueID = CSSValuePainted;
|
| break;
|
| case PE_VISIBLE:
|
| - m_value.valueID = CSSValueVisible;
|
| + valueID = CSSValueVisible;
|
| break;
|
| case PE_VISIBLE_STROKE:
|
| - m_value.valueID = CSSValueVisibleStroke;
|
| + valueID = CSSValueVisibleStroke;
|
| break;
|
| case PE_VISIBLE_FILL:
|
| - m_value.valueID = CSSValueVisibleFill;
|
| + valueID = CSSValueVisibleFill;
|
| break;
|
| case PE_VISIBLE_PAINTED:
|
| - m_value.valueID = CSSValueVisiblePainted;
|
| + valueID = CSSValueVisiblePainted;
|
| break;
|
| case PE_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case PE_ALL:
|
| - m_value.valueID = CSSValueAll;
|
| + valueID = CSSValueAll;
|
| break;
|
| case PE_BOUNDINGBOX:
|
| - m_value.valueID = CSSValueBoundingBox;
|
| + valueID = CSSValueBoundingBox;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EPointerEvents() const
|
| @@ -3010,24 +3003,23 @@ template<> inline CSSPrimitiveValue::operator EPointerEvents() const
|
| return PE_ALL;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontDescription::Kerning kerning)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(FontDescription::Kerning kerning)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (kerning) {
|
| case FontDescription::AutoKerning:
|
| - m_value.valueID = CSSValueAuto;
|
| - return;
|
| + valueID = CSSValueAuto;
|
| + break;
|
| case FontDescription::NormalKerning:
|
| - m_value.valueID = CSSValueNormal;
|
| - return;
|
| + valueID = CSSValueNormal;
|
| + break;
|
| case FontDescription::NoneKerning:
|
| - m_value.valueID = CSSValueNone;
|
| - return;
|
| + valueID = CSSValueNone;
|
| + break;
|
| + default:
|
| + valueID = CSSValueAuto;
|
| }
|
| -
|
| - ASSERT_NOT_REACHED();
|
| - m_value.valueID = CSSValueAuto;
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator FontDescription::Kerning() const
|
| @@ -3048,27 +3040,27 @@ template<> inline CSSPrimitiveValue::operator FontDescription::Kerning() const
|
| return FontDescription::AutoKerning;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ObjectFit fit)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ObjectFit fit)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (fit) {
|
| case ObjectFitFill:
|
| - m_value.valueID = CSSValueFill;
|
| + valueID = CSSValueFill;
|
| break;
|
| case ObjectFitContain:
|
| - m_value.valueID = CSSValueContain;
|
| + valueID = CSSValueContain;
|
| break;
|
| case ObjectFitCover:
|
| - m_value.valueID = CSSValueCover;
|
| + valueID = CSSValueCover;
|
| break;
|
| case ObjectFitNone:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case ObjectFitScaleDown:
|
| - m_value.valueID = CSSValueScaleDown;
|
| + valueID = CSSValueScaleDown;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ObjectFit() const
|
| @@ -3090,47 +3082,46 @@ template<> inline CSSPrimitiveValue::operator ObjectFit() const
|
| }
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillSizeType fillSize)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EFillSizeType fillSize)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (fillSize) {
|
| case Contain:
|
| - m_value.valueID = CSSValueContain;
|
| + valueID = CSSValueContain;
|
| break;
|
| case Cover:
|
| - m_value.valueID = CSSValueCover;
|
| + valueID = CSSValueCover;
|
| break;
|
| case SizeNone:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case SizeLength:
|
| default:
|
| ASSERT_NOT_REACHED();
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontSmoothingMode smoothing)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(FontSmoothingMode smoothing)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (smoothing) {
|
| case AutoSmoothing:
|
| - m_value.valueID = CSSValueAuto;
|
| - return;
|
| + valueID = CSSValueAuto;
|
| + break;
|
| case NoSmoothing:
|
| - m_value.valueID = CSSValueNone;
|
| - return;
|
| + valueID = CSSValueNone;
|
| + break;
|
| case Antialiased:
|
| - m_value.valueID = CSSValueAntialiased;
|
| - return;
|
| + valueID = CSSValueAntialiased;
|
| + break;
|
| case SubpixelAntialiased:
|
| - m_value.valueID = CSSValueSubpixelAntialiased;
|
| - return;
|
| + valueID = CSSValueSubpixelAntialiased;
|
| + break;
|
| + default:
|
| + valueID = CSSValueAuto;
|
| }
|
| -
|
| - ASSERT_NOT_REACHED();
|
| - m_value.valueID = CSSValueAuto;
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator FontSmoothingMode() const
|
| @@ -3153,42 +3144,41 @@ template<> inline CSSPrimitiveValue::operator FontSmoothingMode() const
|
| return AutoSmoothing;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontWeight weight)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(FontWeight weight)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (weight) {
|
| case FontWeight900:
|
| - m_value.valueID = CSSValue900;
|
| - return;
|
| + valueID = CSSValue900;
|
| + break;
|
| case FontWeight800:
|
| - m_value.valueID = CSSValue800;
|
| - return;
|
| + valueID = CSSValue800;
|
| + break;
|
| case FontWeight700:
|
| - m_value.valueID = CSSValueBold;
|
| - return;
|
| + valueID = CSSValueBold;
|
| + break;
|
| case FontWeight600:
|
| - m_value.valueID = CSSValue600;
|
| - return;
|
| + valueID = CSSValue600;
|
| + break;
|
| case FontWeight500:
|
| - m_value.valueID = CSSValue500;
|
| - return;
|
| + valueID = CSSValue500;
|
| + break;
|
| case FontWeight400:
|
| - m_value.valueID = CSSValueNormal;
|
| - return;
|
| + valueID = CSSValueNormal;
|
| + break;
|
| case FontWeight300:
|
| - m_value.valueID = CSSValue300;
|
| - return;
|
| + valueID = CSSValue300;
|
| + break;
|
| case FontWeight200:
|
| - m_value.valueID = CSSValue200;
|
| - return;
|
| + valueID = CSSValue200;
|
| + break;
|
| case FontWeight100:
|
| - m_value.valueID = CSSValue100;
|
| - return;
|
| + valueID = CSSValue100;
|
| + break;
|
| + default:
|
| + valueID = CSSValueNormal;
|
| }
|
| -
|
| - ASSERT_NOT_REACHED();
|
| - m_value.valueID = CSSValueNormal;
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator FontWeight() const
|
| @@ -3225,21 +3215,20 @@ template<> inline CSSPrimitiveValue::operator FontWeight() const
|
| return FontWeightNormal;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontStyle italic)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(FontStyle italic)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (italic) {
|
| case FontStyleNormal:
|
| - m_value.valueID = CSSValueNormal;
|
| - return;
|
| + valueID = CSSValueNormal;
|
| + break;
|
| case FontStyleItalic:
|
| - m_value.valueID = CSSValueItalic;
|
| - return;
|
| + valueID = CSSValueItalic;
|
| + break;
|
| + default:
|
| + valueID = CSSValueNormal;
|
| }
|
| -
|
| - ASSERT_NOT_REACHED();
|
| - m_value.valueID = CSSValueNormal;
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator FontStyle() const
|
| @@ -3259,42 +3248,42 @@ template<> inline CSSPrimitiveValue::operator FontStyle() const
|
| return FontStyleNormal;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontStretch stretch)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(FontStretch stretch)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (stretch) {
|
| case FontStretchUltraCondensed:
|
| - m_value.valueID = CSSValueUltraCondensed;
|
| - return;
|
| + valueID = CSSValueUltraCondensed;
|
| + break;
|
| case FontStretchExtraCondensed:
|
| - m_value.valueID = CSSValueExtraCondensed;
|
| - return;
|
| + valueID = CSSValueExtraCondensed;
|
| + break;
|
| case FontStretchCondensed:
|
| - m_value.valueID = CSSValueCondensed;
|
| - return;
|
| + valueID = CSSValueCondensed;
|
| + break;
|
| case FontStretchSemiCondensed:
|
| - m_value.valueID = CSSValueSemiCondensed;
|
| - return;
|
| + valueID = CSSValueSemiCondensed;
|
| + break;
|
| case FontStretchNormal:
|
| - m_value.valueID = CSSValueNormal;
|
| - return;
|
| + valueID = CSSValueNormal;
|
| + break;
|
| case FontStretchSemiExpanded:
|
| - m_value.valueID = CSSValueSemiExpanded;
|
| - return;
|
| + valueID = CSSValueSemiExpanded;
|
| + break;
|
| case FontStretchExpanded:
|
| - m_value.valueID = CSSValueExpanded;
|
| - return;
|
| + valueID = CSSValueExpanded;
|
| + break;
|
| case FontStretchExtraExpanded:
|
| - m_value.valueID = CSSValueExtraExpanded;
|
| - return;
|
| + valueID = CSSValueExtraExpanded;
|
| + break;
|
| case FontStretchUltraExpanded:
|
| - m_value.valueID = CSSValueUltraExpanded;
|
| - return;
|
| + valueID = CSSValueUltraExpanded;
|
| + break;
|
| + default:
|
| + valueID = CSSValueNormal;
|
| }
|
|
|
| - ASSERT_NOT_REACHED();
|
| - m_value.valueID = CSSValueNormal;
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator FontStretch() const
|
| @@ -3327,21 +3316,20 @@ template<> inline CSSPrimitiveValue::operator FontStretch() const
|
| return FontStretchNormal;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontVariant smallCaps)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(FontVariant smallCaps)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (smallCaps) {
|
| case FontVariantNormal:
|
| - m_value.valueID = CSSValueNormal;
|
| - return;
|
| + valueID = CSSValueNormal;
|
| + break;
|
| case FontVariantSmallCaps:
|
| - m_value.valueID = CSSValueSmallCaps;
|
| - return;
|
| + valueID = CSSValueSmallCaps;
|
| + break;
|
| + default:
|
| + valueID = CSSValueNormal;
|
| }
|
| -
|
| - ASSERT_NOT_REACHED();
|
| - m_value.valueID = CSSValueNormal;
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator FontVariant() const
|
| @@ -3359,24 +3347,24 @@ template<> inline CSSPrimitiveValue::operator FontVariant() const
|
| return FontVariantNormal;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextRenderingMode e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(TextRenderingMode e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case AutoTextRendering:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case OptimizeSpeed:
|
| - m_value.valueID = CSSValueOptimizeSpeed;
|
| + valueID = CSSValueOptimizeSpeed;
|
| break;
|
| case OptimizeLegibility:
|
| - m_value.valueID = CSSValueOptimizeLegibility;
|
| + valueID = CSSValueOptimizeLegibility;
|
| break;
|
| case GeometricPrecision:
|
| - m_value.valueID = CSSValueGeometricPrecision;
|
| + valueID = CSSValueGeometricPrecision;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator TextRenderingMode() const
|
| @@ -3399,30 +3387,30 @@ template<> inline CSSPrimitiveValue::operator TextRenderingMode() const
|
| return AutoTextRendering;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ESpeak e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ESpeak e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case SpeakNone:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case SpeakNormal:
|
| - m_value.valueID = CSSValueNormal;
|
| + valueID = CSSValueNormal;
|
| break;
|
| case SpeakSpellOut:
|
| - m_value.valueID = CSSValueSpellOut;
|
| + valueID = CSSValueSpellOut;
|
| break;
|
| case SpeakDigits:
|
| - m_value.valueID = CSSValueDigits;
|
| + valueID = CSSValueDigits;
|
| break;
|
| case SpeakLiteralPunctuation:
|
| - m_value.valueID = CSSValueLiteralPunctuation;
|
| + valueID = CSSValueLiteralPunctuation;
|
| break;
|
| case SpeakNoPunctuation:
|
| - m_value.valueID = CSSValueNoPunctuation;
|
| + valueID = CSSValueNoPunctuation;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator Order() const
|
| @@ -3441,18 +3429,18 @@ template<> inline CSSPrimitiveValue::operator Order() const
|
| return LogicalOrder;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Order e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(Order e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case LogicalOrder:
|
| - m_value.valueID = CSSValueLogical;
|
| + valueID = CSSValueLogical;
|
| break;
|
| case VisualOrder:
|
| - m_value.valueID = CSSValueVisual;
|
| + valueID = CSSValueVisual;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ESpeak() const
|
| @@ -3479,60 +3467,60 @@ template<> inline CSSPrimitiveValue::operator ESpeak() const
|
| return SpeakNormal;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WebBlendMode blendMode)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(WebBlendMode blendMode)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (blendMode) {
|
| case WebBlendModeNormal:
|
| - m_value.valueID = CSSValueNormal;
|
| + valueID = CSSValueNormal;
|
| break;
|
| case WebBlendModeMultiply:
|
| - m_value.valueID = CSSValueMultiply;
|
| + valueID = CSSValueMultiply;
|
| break;
|
| case WebBlendModeScreen:
|
| - m_value.valueID = CSSValueScreen;
|
| + valueID = CSSValueScreen;
|
| break;
|
| case WebBlendModeOverlay:
|
| - m_value.valueID = CSSValueOverlay;
|
| + valueID = CSSValueOverlay;
|
| break;
|
| case WebBlendModeDarken:
|
| - m_value.valueID = CSSValueDarken;
|
| + valueID = CSSValueDarken;
|
| break;
|
| case WebBlendModeLighten:
|
| - m_value.valueID = CSSValueLighten;
|
| + valueID = CSSValueLighten;
|
| break;
|
| case WebBlendModeColorDodge:
|
| - m_value.valueID = CSSValueColorDodge;
|
| + valueID = CSSValueColorDodge;
|
| break;
|
| case WebBlendModeColorBurn:
|
| - m_value.valueID = CSSValueColorBurn;
|
| + valueID = CSSValueColorBurn;
|
| break;
|
| case WebBlendModeHardLight:
|
| - m_value.valueID = CSSValueHardLight;
|
| + valueID = CSSValueHardLight;
|
| break;
|
| case WebBlendModeSoftLight:
|
| - m_value.valueID = CSSValueSoftLight;
|
| + valueID = CSSValueSoftLight;
|
| break;
|
| case WebBlendModeDifference:
|
| - m_value.valueID = CSSValueDifference;
|
| + valueID = CSSValueDifference;
|
| break;
|
| case WebBlendModeExclusion:
|
| - m_value.valueID = CSSValueExclusion;
|
| + valueID = CSSValueExclusion;
|
| break;
|
| case WebBlendModeHue:
|
| - m_value.valueID = CSSValueHue;
|
| + valueID = CSSValueHue;
|
| break;
|
| case WebBlendModeSaturation:
|
| - m_value.valueID = CSSValueSaturation;
|
| + valueID = CSSValueSaturation;
|
| break;
|
| case WebBlendModeColor:
|
| - m_value.valueID = CSSValueColor;
|
| + valueID = CSSValueColor;
|
| break;
|
| case WebBlendModeLuminosity:
|
| - m_value.valueID = CSSValueLuminosity;
|
| + valueID = CSSValueLuminosity;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator WebBlendMode() const
|
| @@ -3579,21 +3567,21 @@ template<> inline CSSPrimitiveValue::operator WebBlendMode() const
|
| return WebBlendModeNormal;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineCap e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(LineCap e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case ButtCap:
|
| - m_value.valueID = CSSValueButt;
|
| + valueID = CSSValueButt;
|
| break;
|
| case RoundCap:
|
| - m_value.valueID = CSSValueRound;
|
| + valueID = CSSValueRound;
|
| break;
|
| case SquareCap:
|
| - m_value.valueID = CSSValueSquare;
|
| + valueID = CSSValueSquare;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator LineCap() const
|
| @@ -3614,21 +3602,21 @@ template<> inline CSSPrimitiveValue::operator LineCap() const
|
| return ButtCap;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineJoin e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(LineJoin e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case MiterJoin:
|
| - m_value.valueID = CSSValueMiter;
|
| + valueID = CSSValueMiter;
|
| break;
|
| case RoundJoin:
|
| - m_value.valueID = CSSValueRound;
|
| + valueID = CSSValueRound;
|
| break;
|
| case BevelJoin:
|
| - m_value.valueID = CSSValueBevel;
|
| + valueID = CSSValueBevel;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator LineJoin() const
|
| @@ -3649,18 +3637,18 @@ template<> inline CSSPrimitiveValue::operator LineJoin() const
|
| return MiterJoin;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WindRule e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(WindRule e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case RULE_NONZERO:
|
| - m_value.valueID = CSSValueNonzero;
|
| + valueID = CSSValueNonzero;
|
| break;
|
| case RULE_EVENODD:
|
| - m_value.valueID = CSSValueEvenodd;
|
| + valueID = CSSValueEvenodd;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator WindRule() const
|
| @@ -3680,48 +3668,48 @@ template<> inline CSSPrimitiveValue::operator WindRule() const
|
| }
|
|
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EAlignmentBaseline e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EAlignmentBaseline e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case AB_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case AB_BASELINE:
|
| - m_value.valueID = CSSValueBaseline;
|
| + valueID = CSSValueBaseline;
|
| break;
|
| case AB_BEFORE_EDGE:
|
| - m_value.valueID = CSSValueBeforeEdge;
|
| + valueID = CSSValueBeforeEdge;
|
| break;
|
| case AB_TEXT_BEFORE_EDGE:
|
| - m_value.valueID = CSSValueTextBeforeEdge;
|
| + valueID = CSSValueTextBeforeEdge;
|
| break;
|
| case AB_MIDDLE:
|
| - m_value.valueID = CSSValueMiddle;
|
| + valueID = CSSValueMiddle;
|
| break;
|
| case AB_CENTRAL:
|
| - m_value.valueID = CSSValueCentral;
|
| + valueID = CSSValueCentral;
|
| break;
|
| case AB_AFTER_EDGE:
|
| - m_value.valueID = CSSValueAfterEdge;
|
| + valueID = CSSValueAfterEdge;
|
| break;
|
| case AB_TEXT_AFTER_EDGE:
|
| - m_value.valueID = CSSValueTextAfterEdge;
|
| + valueID = CSSValueTextAfterEdge;
|
| break;
|
| case AB_IDEOGRAPHIC:
|
| - m_value.valueID = CSSValueIdeographic;
|
| + valueID = CSSValueIdeographic;
|
| break;
|
| case AB_ALPHABETIC:
|
| - m_value.valueID = CSSValueAlphabetic;
|
| + valueID = CSSValueAlphabetic;
|
| break;
|
| case AB_HANGING:
|
| - m_value.valueID = CSSValueHanging;
|
| + valueID = CSSValueHanging;
|
| break;
|
| case AB_MATHEMATICAL:
|
| - m_value.valueID = CSSValueMathematical;
|
| + valueID = CSSValueMathematical;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EAlignmentBaseline() const
|
| @@ -3760,18 +3748,18 @@ template<> inline CSSPrimitiveValue::operator EAlignmentBaseline() const
|
| return AB_AUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBorderCollapse e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBorderCollapse e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case BSEPARATE:
|
| - m_value.valueID = CSSValueSeparate;
|
| + valueID = CSSValueSeparate;
|
| break;
|
| case BCOLLAPSE:
|
| - m_value.valueID = CSSValueCollapse;
|
| + valueID = CSSValueCollapse;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBorderCollapse() const
|
| @@ -3790,27 +3778,27 @@ template<> inline CSSPrimitiveValue::operator EBorderCollapse() const
|
| return BSEPARATE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EImageRendering e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EImageRendering e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case ImageRenderingAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case ImageRenderingOptimizeSpeed:
|
| - m_value.valueID = CSSValueOptimizeSpeed;
|
| + valueID = CSSValueOptimizeSpeed;
|
| break;
|
| case ImageRenderingOptimizeQuality:
|
| - m_value.valueID = CSSValueOptimizeQuality;
|
| + valueID = CSSValueOptimizeQuality;
|
| break;
|
| case ImageRenderingPixelated:
|
| - m_value.valueID = CSSValuePixelated;
|
| + valueID = CSSValuePixelated;
|
| break;
|
| case ImageRenderingOptimizeContrast:
|
| - m_value.valueID = CSSValueWebkitOptimizeContrast;
|
| + valueID = CSSValueWebkitOptimizeContrast;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EImageRendering() const
|
| @@ -3835,18 +3823,18 @@ template<> inline CSSPrimitiveValue::operator EImageRendering() const
|
| return ImageRenderingAuto;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETransformStyle3D e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ETransformStyle3D e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TransformStyle3DFlat:
|
| - m_value.valueID = CSSValueFlat;
|
| + valueID = CSSValueFlat;
|
| break;
|
| case TransformStyle3DPreserve3D:
|
| - m_value.valueID = CSSValuePreserve3d;
|
| + valueID = CSSValuePreserve3d;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ETransformStyle3D() const
|
| @@ -3865,21 +3853,21 @@ template<> inline CSSPrimitiveValue::operator ETransformStyle3D() const
|
| return TransformStyle3DFlat;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBufferedRendering e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EBufferedRendering e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case BR_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case BR_DYNAMIC:
|
| - m_value.valueID = CSSValueDynamic;
|
| + valueID = CSSValueDynamic;
|
| break;
|
| case BR_STATIC:
|
| - m_value.valueID = CSSValueStatic;
|
| + valueID = CSSValueStatic;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EBufferedRendering() const
|
| @@ -3900,21 +3888,21 @@ template<> inline CSSPrimitiveValue::operator EBufferedRendering() const
|
| return BR_AUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EColorInterpolation e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EColorInterpolation e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case CI_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case CI_SRGB:
|
| - m_value.valueID = CSSValueSRGB;
|
| + valueID = CSSValueSRGB;
|
| break;
|
| case CI_LINEARRGB:
|
| - m_value.valueID = CSSValueLinearRGB;
|
| + valueID = CSSValueLinearRGB;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EColorInterpolation() const
|
| @@ -3935,21 +3923,21 @@ template<> inline CSSPrimitiveValue::operator EColorInterpolation() const
|
| return CI_AUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EColorRendering e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EColorRendering e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case CR_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case CR_OPTIMIZESPEED:
|
| - m_value.valueID = CSSValueOptimizeSpeed;
|
| + valueID = CSSValueOptimizeSpeed;
|
| break;
|
| case CR_OPTIMIZEQUALITY:
|
| - m_value.valueID = CSSValueOptimizeQuality;
|
| + valueID = CSSValueOptimizeQuality;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EColorRendering() const
|
| @@ -3970,48 +3958,48 @@ template<> inline CSSPrimitiveValue::operator EColorRendering() const
|
| return CR_AUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDominantBaseline e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EDominantBaseline e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case DB_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case DB_USE_SCRIPT:
|
| - m_value.valueID = CSSValueUseScript;
|
| + valueID = CSSValueUseScript;
|
| break;
|
| case DB_NO_CHANGE:
|
| - m_value.valueID = CSSValueNoChange;
|
| + valueID = CSSValueNoChange;
|
| break;
|
| case DB_RESET_SIZE:
|
| - m_value.valueID = CSSValueResetSize;
|
| + valueID = CSSValueResetSize;
|
| break;
|
| case DB_CENTRAL:
|
| - m_value.valueID = CSSValueCentral;
|
| + valueID = CSSValueCentral;
|
| break;
|
| case DB_MIDDLE:
|
| - m_value.valueID = CSSValueMiddle;
|
| + valueID = CSSValueMiddle;
|
| break;
|
| case DB_TEXT_BEFORE_EDGE:
|
| - m_value.valueID = CSSValueTextBeforeEdge;
|
| + valueID = CSSValueTextBeforeEdge;
|
| break;
|
| case DB_TEXT_AFTER_EDGE:
|
| - m_value.valueID = CSSValueTextAfterEdge;
|
| + valueID = CSSValueTextAfterEdge;
|
| break;
|
| case DB_IDEOGRAPHIC:
|
| - m_value.valueID = CSSValueIdeographic;
|
| + valueID = CSSValueIdeographic;
|
| break;
|
| case DB_ALPHABETIC:
|
| - m_value.valueID = CSSValueAlphabetic;
|
| + valueID = CSSValueAlphabetic;
|
| break;
|
| case DB_HANGING:
|
| - m_value.valueID = CSSValueHanging;
|
| + valueID = CSSValueHanging;
|
| break;
|
| case DB_MATHEMATICAL:
|
| - m_value.valueID = CSSValueMathematical;
|
| + valueID = CSSValueMathematical;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EDominantBaseline() const
|
| @@ -4050,24 +4038,24 @@ template<> inline CSSPrimitiveValue::operator EDominantBaseline() const
|
| return DB_AUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EShapeRendering e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EShapeRendering e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case SR_AUTO:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case SR_OPTIMIZESPEED:
|
| - m_value.valueID = CSSValueOptimizeSpeed;
|
| + valueID = CSSValueOptimizeSpeed;
|
| break;
|
| case SR_CRISPEDGES:
|
| - m_value.valueID = CSSValueCrispEdges;
|
| + valueID = CSSValueCrispEdges;
|
| break;
|
| case SR_GEOMETRICPRECISION:
|
| - m_value.valueID = CSSValueGeometricPrecision;
|
| + valueID = CSSValueGeometricPrecision;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EShapeRendering() const
|
| @@ -4090,21 +4078,21 @@ template<> inline CSSPrimitiveValue::operator EShapeRendering() const
|
| return SR_AUTO;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextAnchor e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ETextAnchor e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case TA_START:
|
| - m_value.valueID = CSSValueStart;
|
| + valueID = CSSValueStart;
|
| break;
|
| case TA_MIDDLE:
|
| - m_value.valueID = CSSValueMiddle;
|
| + valueID = CSSValueMiddle;
|
| break;
|
| case TA_END:
|
| - m_value.valueID = CSSValueEnd;
|
| + valueID = CSSValueEnd;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ETextAnchor() const
|
| @@ -4125,30 +4113,30 @@ template<> inline CSSPrimitiveValue::operator ETextAnchor() const
|
| return TA_START;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(SVGWritingMode e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(SVGWritingMode e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case WM_LRTB:
|
| - m_value.valueID = CSSValueLrTb;
|
| + valueID = CSSValueLrTb;
|
| break;
|
| case WM_LR:
|
| - m_value.valueID = CSSValueLr;
|
| + valueID = CSSValueLr;
|
| break;
|
| case WM_RLTB:
|
| - m_value.valueID = CSSValueRlTb;
|
| + valueID = CSSValueRlTb;
|
| break;
|
| case WM_RL:
|
| - m_value.valueID = CSSValueRl;
|
| + valueID = CSSValueRl;
|
| break;
|
| case WM_TBRL:
|
| - m_value.valueID = CSSValueTbRl;
|
| + valueID = CSSValueTbRl;
|
| break;
|
| case WM_TB:
|
| - m_value.valueID = CSSValueTb;
|
| + valueID = CSSValueTb;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator SVGWritingMode() const
|
| @@ -4175,18 +4163,18 @@ template<> inline CSSPrimitiveValue::operator SVGWritingMode() const
|
| return WM_LRTB;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EVectorEffect e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EVectorEffect e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case VE_NONE:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case VE_NON_SCALING_STROKE:
|
| - m_value.valueID = CSSValueNonScalingStroke;
|
| + valueID = CSSValueNonScalingStroke;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EVectorEffect() const
|
| @@ -4205,25 +4193,25 @@ template<> inline CSSPrimitiveValue::operator EVectorEffect() const
|
| return VE_NONE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPaintOrderType e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EPaintOrderType e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case PT_FILL:
|
| - m_value.valueID = CSSValueFill;
|
| + valueID = CSSValueFill;
|
| break;
|
| case PT_STROKE:
|
| - m_value.valueID = CSSValueStroke;
|
| + valueID = CSSValueStroke;
|
| break;
|
| case PT_MARKERS:
|
| - m_value.valueID = CSSValueMarkers;
|
| + valueID = CSSValueMarkers;
|
| break;
|
| default:
|
| ASSERT_NOT_REACHED();
|
| - m_value.valueID = CSSValueFill;
|
| + valueID = CSSValueFill;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EPaintOrderType() const
|
| @@ -4244,18 +4232,18 @@ template<> inline CSSPrimitiveValue::operator EPaintOrderType() const
|
| return PT_NONE;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMaskType e)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EMaskType e)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (e) {
|
| case MT_LUMINANCE:
|
| - m_value.valueID = CSSValueLuminance;
|
| + valueID = CSSValueLuminance;
|
| break;
|
| case MT_ALPHA:
|
| - m_value.valueID = CSSValueAlpha;
|
| + valueID = CSSValueAlpha;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EMaskType() const
|
| @@ -4304,18 +4292,18 @@ template<> inline CSSPrimitiveValue::operator TouchAction() const
|
| return TouchActionNone;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(EIsolation i)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (i) {
|
| case IsolationAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case IsolationIsolate:
|
| - m_value.valueID = CSSValueIsolate;
|
| + valueID = CSSValueIsolate;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator EIsolation() const
|
| @@ -4353,27 +4341,27 @@ template<> inline CSSPrimitiveValue::operator WebScrollBlocksOn() const
|
| return WebScrollBlocksOnNone;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSBoxType cssBox)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(CSSBoxType cssBox)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (cssBox) {
|
| case MarginBox:
|
| - m_value.valueID = CSSValueMarginBox;
|
| + valueID = CSSValueMarginBox;
|
| break;
|
| case BorderBox:
|
| - m_value.valueID = CSSValueBorderBox;
|
| + valueID = CSSValueBorderBox;
|
| break;
|
| case PaddingBox:
|
| - m_value.valueID = CSSValuePaddingBox;
|
| + valueID = CSSValuePaddingBox;
|
| break;
|
| case ContentBox:
|
| - m_value.valueID = CSSValueContentBox;
|
| + valueID = CSSValueContentBox;
|
| break;
|
| case BoxMissing:
|
| // The missing box should convert to a null primitive value.
|
| ASSERT_NOT_REACHED();
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator CSSBoxType() const
|
| @@ -4394,51 +4382,51 @@ template<> inline CSSPrimitiveValue::operator CSSBoxType() const
|
| return ContentBox;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ItemPosition itemPosition)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ItemPosition itemPosition)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (itemPosition) {
|
| case ItemPositionAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case ItemPositionStretch:
|
| - m_value.valueID = CSSValueStretch;
|
| + valueID = CSSValueStretch;
|
| break;
|
| case ItemPositionBaseline:
|
| - m_value.valueID = CSSValueBaseline;
|
| + valueID = CSSValueBaseline;
|
| break;
|
| case ItemPositionLastBaseline:
|
| - m_value.valueID = CSSValueLastBaseline;
|
| + valueID = CSSValueLastBaseline;
|
| break;
|
| case ItemPositionCenter:
|
| - m_value.valueID = CSSValueCenter;
|
| + valueID = CSSValueCenter;
|
| break;
|
| case ItemPositionStart:
|
| - m_value.valueID = CSSValueStart;
|
| + valueID = CSSValueStart;
|
| break;
|
| case ItemPositionEnd:
|
| - m_value.valueID = CSSValueEnd;
|
| + valueID = CSSValueEnd;
|
| break;
|
| case ItemPositionSelfStart:
|
| - m_value.valueID = CSSValueSelfStart;
|
| + valueID = CSSValueSelfStart;
|
| break;
|
| case ItemPositionSelfEnd:
|
| - m_value.valueID = CSSValueSelfEnd;
|
| + valueID = CSSValueSelfEnd;
|
| break;
|
| case ItemPositionFlexStart:
|
| - m_value.valueID = CSSValueFlexStart;
|
| + valueID = CSSValueFlexStart;
|
| break;
|
| case ItemPositionFlexEnd:
|
| - m_value.valueID = CSSValueFlexEnd;
|
| + valueID = CSSValueFlexEnd;
|
| break;
|
| case ItemPositionLeft:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| case ItemPositionRight:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ItemPosition() const
|
| @@ -4477,42 +4465,42 @@ template<> inline CSSPrimitiveValue::operator ItemPosition() const
|
| return ItemPositionAuto;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ContentPosition contentPosition)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ContentPosition contentPosition)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (contentPosition) {
|
| case ContentPositionAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case ContentPositionBaseline:
|
| - m_value.valueID = CSSValueBaseline;
|
| + valueID = CSSValueBaseline;
|
| break;
|
| case ContentPositionLastBaseline:
|
| - m_value.valueID = CSSValueLastBaseline;
|
| + valueID = CSSValueLastBaseline;
|
| break;
|
| case ContentPositionCenter:
|
| - m_value.valueID = CSSValueCenter;
|
| + valueID = CSSValueCenter;
|
| break;
|
| case ContentPositionStart:
|
| - m_value.valueID = CSSValueStart;
|
| + valueID = CSSValueStart;
|
| break;
|
| case ContentPositionEnd:
|
| - m_value.valueID = CSSValueEnd;
|
| + valueID = CSSValueEnd;
|
| break;
|
| case ContentPositionFlexStart:
|
| - m_value.valueID = CSSValueFlexStart;
|
| + valueID = CSSValueFlexStart;
|
| break;
|
| case ContentPositionFlexEnd:
|
| - m_value.valueID = CSSValueFlexEnd;
|
| + valueID = CSSValueFlexEnd;
|
| break;
|
| case ContentPositionLeft:
|
| - m_value.valueID = CSSValueLeft;
|
| + valueID = CSSValueLeft;
|
| break;
|
| case ContentPositionRight:
|
| - m_value.valueID = CSSValueRight;
|
| + valueID = CSSValueRight;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ContentPosition() const
|
| @@ -4545,27 +4533,27 @@ template<> inline CSSPrimitiveValue::operator ContentPosition() const
|
| return ContentPositionAuto;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ContentDistributionType contentDistribution)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ContentDistributionType contentDistribution)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (contentDistribution) {
|
| case ContentDistributionDefault:
|
| - m_value.valueID = CSSValueDefault;
|
| + valueID = CSSValueDefault;
|
| break;
|
| case ContentDistributionSpaceBetween:
|
| - m_value.valueID = CSSValueSpaceBetween;
|
| + valueID = CSSValueSpaceBetween;
|
| break;
|
| case ContentDistributionSpaceAround:
|
| - m_value.valueID = CSSValueSpaceAround;
|
| + valueID = CSSValueSpaceAround;
|
| break;
|
| case ContentDistributionSpaceEvenly:
|
| - m_value.valueID = CSSValueSpaceEvenly;
|
| + valueID = CSSValueSpaceEvenly;
|
| break;
|
| case ContentDistributionStretch:
|
| - m_value.valueID = CSSValueStretch;
|
| + valueID = CSSValueStretch;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ContentDistributionType() const
|
| @@ -4586,21 +4574,21 @@ template<> inline CSSPrimitiveValue::operator ContentDistributionType() const
|
| return ContentDistributionStretch;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(OverflowAlignment overflowAlignment)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(OverflowAlignment overflowAlignment)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (overflowAlignment) {
|
| case OverflowAlignmentDefault:
|
| - m_value.valueID = CSSValueDefault;
|
| + valueID = CSSValueDefault;
|
| break;
|
| case OverflowAlignmentTrue:
|
| - m_value.valueID = CSSValueTrue;
|
| + valueID = CSSValueTrue;
|
| break;
|
| case OverflowAlignmentSafe:
|
| - m_value.valueID = CSSValueSafe;
|
| + valueID = CSSValueSafe;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator OverflowAlignment() const
|
| @@ -4617,22 +4605,22 @@ template<> inline CSSPrimitiveValue::operator OverflowAlignment() const
|
| return OverflowAlignmentTrue;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollBehavior behavior)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ScrollBehavior behavior)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (behavior) {
|
| case ScrollBehaviorAuto:
|
| - m_value.valueID = CSSValueAuto;
|
| + valueID = CSSValueAuto;
|
| break;
|
| case ScrollBehaviorSmooth:
|
| - m_value.valueID = CSSValueSmooth;
|
| + valueID = CSSValueSmooth;
|
| break;
|
| case ScrollBehaviorInstant:
|
| // Behavior 'instant' is only allowed in ScrollOptions arguments passed to
|
| // CSSOM scroll APIs.
|
| ASSERT_NOT_REACHED();
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ScrollBehavior() const
|
| @@ -4649,21 +4637,21 @@ template<> inline CSSPrimitiveValue::operator ScrollBehavior() const
|
| return ScrollBehaviorAuto;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollSnapType snapType)
|
| - : CSSValue(PrimitiveClass)
|
| +template<> inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::create(ScrollSnapType snapType)
|
| {
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| + CSSValueID valueID = CSSValueInvalid;
|
| switch (snapType) {
|
| case ScrollSnapTypeNone:
|
| - m_value.valueID = CSSValueNone;
|
| + valueID = CSSValueNone;
|
| break;
|
| case ScrollSnapTypeMandatory:
|
| - m_value.valueID = CSSValueMandatory;
|
| + valueID = CSSValueMandatory;
|
| break;
|
| case ScrollSnapTypeProximity:
|
| - m_value.valueID = CSSValueProximity;
|
| + valueID = CSSValueProximity;
|
| break;
|
| }
|
| + return create(valueID);
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::operator ScrollSnapType() const
|
|
|