Commit 42c64121 authored by ddkilzer@apple.com's avatar ddkilzer@apple.com

2009-01-06 Zalan Bujtas <zbujtas@gmail.com>

        Reviewed by David Kilzer.

        https://bugs.webkit.org/show_bug.cgi?id=23133
        Fix SVG disabled build. Move 'pointer-events' from SVGCSSPropertyNames.in to
        CSSPropertyNames.in and move PointerEvents functions out of #if ENABLE(SVG)

        NOTE: Property name fixes landed as part of r39648.

        * css/CSSPrimitiveValueMappings.h:
        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
        (WebCore::CSSPrimitiveValue::operator EPointerEvents):
        * css/CSSPropertyNames.in:
        * css/SVGCSSPropertyNames.in:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@39650 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6fa72fef
2009-01-06 Zalan Bujtas <zbujtas@gmail.com>
Reviewed by David Kilzer.
https://bugs.webkit.org/show_bug.cgi?id=23133
Fix SVG disabled build. Move 'pointer-events' from SVGCSSPropertyNames.in to
CSSPropertyNames.in and move PointerEvents functions out of #if ENABLE(SVG)
NOTE: Property name fixes landed as part of r39648.
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator EPointerEvents):
* css/CSSPropertyNames.in:
* css/SVGCSSPropertyNames.in:
2009-01-06 David Kilzer <ddkilzer@apple.com>
BUILD FIX (r39634): Fix build for non-SVG builds (Wx)
......@@ -1662,6 +1662,72 @@ template<> inline CSSPrimitiveValue::operator TextDirection() const
}
}
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPointerEvents e)
: m_type(CSS_IDENT)
{
switch (e) {
case PE_NONE:
m_value.ident = CSSValueNone;
break;
case PE_STROKE:
m_value.ident = CSSValueStroke;
break;
case PE_FILL:
m_value.ident = CSSValueFill;
break;
case PE_PAINTED:
m_value.ident = CSSValuePainted;
break;
case PE_VISIBLE:
m_value.ident = CSSValueVisible;
break;
case PE_VISIBLE_STROKE:
m_value.ident = CSSValueVisiblestroke;
break;
case PE_VISIBLE_FILL:
m_value.ident = CSSValueVisiblefill;
break;
case PE_VISIBLE_PAINTED:
m_value.ident = CSSValueVisiblepainted;
break;
case PE_AUTO:
m_value.ident = CSSValueAuto;
break;
case PE_ALL:
m_value.ident = CSSValueAll;
break;
}
}
template<> inline CSSPrimitiveValue::operator EPointerEvents() const
{
switch (m_value.ident) {
case CSSValueAll:
return PE_ALL;
case CSSValueAuto:
return PE_AUTO;
case CSSValueNone:
return PE_NONE;
case CSSValueVisiblepainted:
return PE_VISIBLE_PAINTED;
case CSSValueVisiblefill:
return PE_VISIBLE_FILL;
case CSSValueVisiblestroke:
return PE_VISIBLE_STROKE;
case CSSValueVisible:
return PE_VISIBLE;
case CSSValuePainted:
return PE_PAINTED;
case CSSValueFill:
return PE_FILL;
case CSSValueStroke:
return PE_STROKE;
default:
ASSERT_NOT_REACHED();
return PE_ALL;
}
}
#if ENABLE(SVG)
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineCap e)
......@@ -1998,72 +2064,6 @@ template<> inline CSSPrimitiveValue::operator EImageRendering() const
}
}
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPointerEvents e)
: m_type(CSS_IDENT)
{
switch (e) {
case PE_NONE:
m_value.ident = CSSValueNone;
break;
case PE_STROKE:
m_value.ident = CSSValueStroke;
break;
case PE_FILL:
m_value.ident = CSSValueFill;
break;
case PE_PAINTED:
m_value.ident = CSSValuePainted;
break;
case PE_VISIBLE:
m_value.ident = CSSValueVisible;
break;
case PE_VISIBLE_STROKE:
m_value.ident = CSSValueVisiblestroke;
break;
case PE_VISIBLE_FILL:
m_value.ident = CSSValueVisiblefill;
break;
case PE_VISIBLE_PAINTED:
m_value.ident = CSSValueVisiblepainted;
break;
case PE_AUTO:
m_value.ident = CSSValueAuto;
break;
case PE_ALL:
m_value.ident = CSSValueAll;
break;
}
}
template<> inline CSSPrimitiveValue::operator EPointerEvents() const
{
switch (m_value.ident) {
case CSSValueAll:
return PE_ALL;
case CSSValueAuto:
return PE_AUTO;
case CSSValueNone:
return PE_NONE;
case CSSValueVisiblepainted:
return PE_VISIBLE_PAINTED;
case CSSValueVisiblefill:
return PE_VISIBLE_FILL;
case CSSValueVisiblestroke:
return PE_VISIBLE_STROKE;
case CSSValueVisible:
return PE_VISIBLE;
case CSSValuePainted:
return PE_PAINTED;
case CSSValueFill:
return PE_FILL;
case CSSValueStroke:
return PE_STROKE;
default:
ASSERT_NOT_REACHED();
return PE_ALL;
}
}
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EShapeRendering e)
: m_type(CSS_IDENT)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment