#ifndef CSSPrimitiveValueMappings_h
#define CSSPrimitiveValueMappings_h
-#include "CSSValueKeywords.h"
+#include "core/CSSValueKeywords.h"
#include "core/css/CSSCalculationValue.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSReflectionDirection.h"
#include "platform/text/WritingMode.h"
#include "wtf/MathExtras.h"
-namespace WebCore {
+namespace blink {
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(short i)
: CSSValue(PrimitiveClass)
case MediaToggleClosedCaptionsButtonPart:
m_value.valueID = CSSValueMediaToggleClosedCaptionsButton;
break;
+ case MediaCastOffButtonPart:
+ m_value.valueID = CSSValueInternalMediaCastOffButton;
+ break;
+ case MediaOverlayCastOffButtonPart:
+ m_value.valueID = CSSValueInternalMediaOverlayCastOffButton;
+ break;
case MediaSliderPart:
m_value.valueID = CSSValueMediaSlider;
break;
case CapsLockIndicatorPart:
m_value.valueID = CSSValueCapsLockIndicator;
break;
- case InputSpeechButtonPart:
-#if ENABLE(INPUT_SPEECH)
- m_value.valueID = CSSValueWebkitInputSpeechButton;
-#endif
- break;
}
}
case CURSOR_NOT_ALLOWED:
m_value.valueID = CSSValueNotAllowed;
break;
- case CURSOR_WEBKIT_ZOOM_IN:
- m_value.valueID = CSSValueWebkitZoomIn;
+ case CURSOR_ZOOM_IN:
+ m_value.valueID = CSSValueZoomIn;
break;
- case CURSOR_WEBKIT_ZOOM_OUT:
- m_value.valueID = CSSValueWebkitZoomOut;
+ case CURSOR_ZOOM_OUT:
+ m_value.valueID = CSSValueZoomOut;
break;
case CURSOR_E_RESIZE:
m_value.valueID = CSSValueEResize;
template<> inline CSSPrimitiveValue::operator ECursor() const
{
ASSERT(isValueID());
- if (m_value.valueID == CSSValueCopy)
+ switch (m_value.valueID) {
+ case CSSValueCopy:
return CURSOR_COPY;
- if (m_value.valueID == CSSValueNone)
+ case CSSValueWebkitZoomIn:
+ return CURSOR_ZOOM_IN;
+ case CSSValueWebkitZoomOut:
+ return CURSOR_ZOOM_OUT;
+ case CSSValueNone:
return CURSOR_NONE;
- return static_cast<ECursor>(m_value.valueID - CSSValueAuto);
+ default:
+ return static_cast<ECursor>(m_value.valueID - CSSValueAuto);
+ }
}
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e)
case FixedPosition:
m_value.valueID = CSSValueFixed;
break;
- case StickyPosition:
- m_value.valueID = CSSValueSticky;
- break;
}
}
return AbsolutePosition;
case CSSValueFixed:
return FixedPosition;
- case CSSValueSticky:
- return StickyPosition;
default:
break;
}
m_value.valueID = CSSValue800;
return;
case FontWeight700:
- m_value.valueID = CSSValue700;
+ m_value.valueID = CSSValueBold;
return;
case FontWeight600:
m_value.valueID = CSSValue600;
m_value.valueID = CSSValue500;
return;
case FontWeight400:
- m_value.valueID = CSSValue400;
+ m_value.valueID = CSSValueNormal;
return;
case FontWeight300:
m_value.valueID = CSSValue300;
return FontStyleNormal;
}
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontStretch stretch)
+ : CSSValue(PrimitiveClass)
+{
+ m_primitiveUnitType = CSS_VALUE_ID;
+ switch (stretch) {
+ case FontStretchUltraCondensed:
+ m_value.valueID = CSSValueUltraCondensed;
+ return;
+ case FontStretchExtraCondensed:
+ m_value.valueID = CSSValueExtraCondensed;
+ return;
+ case FontStretchCondensed:
+ m_value.valueID = CSSValueCondensed;
+ return;
+ case FontStretchSemiCondensed:
+ m_value.valueID = CSSValueSemiCondensed;
+ return;
+ case FontStretchNormal:
+ m_value.valueID = CSSValueNormal;
+ return;
+ case FontStretchSemiExpanded:
+ m_value.valueID = CSSValueSemiExpanded;
+ return;
+ case FontStretchExpanded:
+ m_value.valueID = CSSValueExpanded;
+ return;
+ case FontStretchExtraExpanded:
+ m_value.valueID = CSSValueExtraExpanded;
+ return;
+ case FontStretchUltraExpanded:
+ m_value.valueID = CSSValueUltraExpanded;
+ return;
+ }
+
+ ASSERT_NOT_REACHED();
+ m_value.valueID = CSSValueNormal;
+}
+
+template<> inline CSSPrimitiveValue::operator FontStretch() const
+{
+ ASSERT(isValueID());
+ switch (m_value.valueID) {
+ case CSSValueUltraCondensed:
+ return FontStretchUltraCondensed;
+ case CSSValueExtraCondensed:
+ return FontStretchExtraCondensed;
+ case CSSValueCondensed:
+ return FontStretchCondensed;
+ case CSSValueSemiCondensed:
+ return FontStretchSemiCondensed;
+ case CSSValueNormal:
+ return FontStretchNormal;
+ case CSSValueSemiExpanded:
+ return FontStretchSemiExpanded;
+ case CSSValueExpanded:
+ return FontStretchExpanded;
+ case CSSValueExtraExpanded:
+ return FontStretchExtraExpanded;
+ case CSSValueUltraExpanded:
+ return FontStretchUltraExpanded;
+ default:
+ break;
+ }
+
+ ASSERT_NOT_REACHED();
+ return FontStretchNormal;
+}
+
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontVariant smallCaps)
: CSSValue(PrimitiveClass)
{
case ImageRenderingOptimizeQuality:
m_value.valueID = CSSValueOptimizequality;
break;
+ case ImageRenderingPixelated:
+ m_value.valueID = CSSValuePixelated;
+ break;
case ImageRenderingOptimizeContrast:
m_value.valueID = CSSValueWebkitOptimizeContrast;
break;
return ImageRenderingOptimizeSpeed;
case CSSValueOptimizequality:
return ImageRenderingOptimizeQuality;
+ case CSSValuePixelated:
+ return ImageRenderingPixelated;
case CSSValueWebkitOptimizeContrast:
return ImageRenderingOptimizeContrast;
default:
return TransformStyle3DFlat;
}
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapFlow wrapFlow)
-: CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (wrapFlow) {
- case WrapFlowAuto:
- m_value.valueID = CSSValueAuto;
- break;
- case WrapFlowBoth:
- m_value.valueID = CSSValueBoth;
- break;
- case WrapFlowStart:
- m_value.valueID = CSSValueStart;
- break;
- case WrapFlowEnd:
- m_value.valueID = CSSValueEnd;
- break;
- case WrapFlowMaximum:
- m_value.valueID = CSSValueMaximum;
- break;
- case WrapFlowClear:
- m_value.valueID = CSSValueClear;
- break;
- }
-}
-
-template<> inline CSSPrimitiveValue::operator WrapFlow() const
-{
- ASSERT(isValueID());
- switch (m_value.valueID) {
- case CSSValueAuto:
- return WrapFlowAuto;
- case CSSValueBoth:
- return WrapFlowBoth;
- case CSSValueStart:
- return WrapFlowStart;
- case CSSValueEnd:
- return WrapFlowEnd;
- case CSSValueMaximum:
- return WrapFlowMaximum;
- case CSSValueClear:
- return WrapFlowClear;
- default:
- break;
- }
-
- ASSERT_NOT_REACHED();
- return WrapFlowAuto;
-}
-
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapThrough wrapThrough)
-: CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (wrapThrough) {
- case WrapThroughWrap:
- m_value.valueID = CSSValueWrap;
- break;
- case WrapThroughNone:
- m_value.valueID = CSSValueNone;
- break;
- }
-}
-
-template<> inline CSSPrimitiveValue::operator WrapThrough() const
-{
- ASSERT(isValueID());
- switch (m_value.valueID) {
- case CSSValueWrap:
- return WrapThroughWrap;
- case CSSValueNone:
- return WrapThroughNone;
- default:
- break;
- }
-
- ASSERT_NOT_REACHED();
- return WrapThroughWrap;
-}
-
-template<> inline CSSPrimitiveValue::operator GridAutoFlow() const
-{
- ASSERT(isValueID());
- switch (m_value.valueID) {
- case CSSValueNone:
- return AutoFlowNone;
- case CSSValueColumn:
- return AutoFlowColumn;
- case CSSValueRow:
- return AutoFlowRow;
- default:
- break;
- }
-
- ASSERT_NOT_REACHED();
- return AutoFlowNone;
-
-}
-
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(GridAutoFlow flow)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (flow) {
- case AutoFlowNone:
- m_value.valueID = CSSValueNone;
- break;
- case AutoFlowColumn:
- m_value.valueID = CSSValueColumn;
- break;
- case AutoFlowRow:
- m_value.valueID = CSSValueRow;
- break;
- }
-}
-
enum LengthConversion {
AnyConversion = ~0,
FixedConversion = 1 << 0,
return TouchActionDelayNone;
}
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LayoutBox layoutBox)
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSBoxType cssBox)
: CSSValue(PrimitiveClass)
{
m_primitiveUnitType = CSS_VALUE_ID;
- switch (layoutBox) {
+ switch (cssBox) {
case MarginBox:
m_value.valueID = CSSValueMarginBox;
break;
}
}
-template<> inline CSSPrimitiveValue::operator LayoutBox() const
+template<> inline CSSPrimitiveValue::operator CSSBoxType() const
{
switch (getValueID()) {
case CSSValueMarginBox:
case ItemPositionBaseline:
m_value.valueID = CSSValueBaseline;
break;
+ case ItemPositionLastBaseline:
+ m_value.valueID = CSSValueLastBaseline;
+ break;
case ItemPositionCenter:
m_value.valueID = CSSValueCenter;
break;
return ItemPositionStretch;
case CSSValueBaseline:
return ItemPositionBaseline;
+ case CSSValueLastBaseline:
+ return ItemPositionLastBaseline;
case CSSValueCenter:
return ItemPositionCenter;
case CSSValueStart: