Changeset 39650 in webkit
- Timestamp:
- Jan 6, 2009 6:38:55 AM (15 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r39648 r39650 1 2009-01-06 Zalan Bujtas <zbujtas@gmail.com> 2 3 Reviewed by David Kilzer. 4 5 https://bugs.webkit.org/show_bug.cgi?id=23133 6 Fix SVG disabled build. Move 'pointer-events' from SVGCSSPropertyNames.in to 7 CSSPropertyNames.in and move PointerEvents functions out of #if ENABLE(SVG) 8 9 NOTE: Property name fixes landed as part of r39648. 10 11 * css/CSSPrimitiveValueMappings.h: 12 (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): 13 (WebCore::CSSPrimitiveValue::operator EPointerEvents): 14 * css/CSSPropertyNames.in: 15 * css/SVGCSSPropertyNames.in: 16 1 17 2009-01-06 David Kilzer <ddkilzer@apple.com> 2 18 -
trunk/WebCore/css/CSSPrimitiveValueMappings.h
r39634 r39650 1663 1663 } 1664 1664 1665 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPointerEvents e) 1666 : m_type(CSS_IDENT) 1667 { 1668 switch (e) { 1669 case PE_NONE: 1670 m_value.ident = CSSValueNone; 1671 break; 1672 case PE_STROKE: 1673 m_value.ident = CSSValueStroke; 1674 break; 1675 case PE_FILL: 1676 m_value.ident = CSSValueFill; 1677 break; 1678 case PE_PAINTED: 1679 m_value.ident = CSSValuePainted; 1680 break; 1681 case PE_VISIBLE: 1682 m_value.ident = CSSValueVisible; 1683 break; 1684 case PE_VISIBLE_STROKE: 1685 m_value.ident = CSSValueVisiblestroke; 1686 break; 1687 case PE_VISIBLE_FILL: 1688 m_value.ident = CSSValueVisiblefill; 1689 break; 1690 case PE_VISIBLE_PAINTED: 1691 m_value.ident = CSSValueVisiblepainted; 1692 break; 1693 case PE_AUTO: 1694 m_value.ident = CSSValueAuto; 1695 break; 1696 case PE_ALL: 1697 m_value.ident = CSSValueAll; 1698 break; 1699 } 1700 } 1701 1702 template<> inline CSSPrimitiveValue::operator EPointerEvents() const 1703 { 1704 switch (m_value.ident) { 1705 case CSSValueAll: 1706 return PE_ALL; 1707 case CSSValueAuto: 1708 return PE_AUTO; 1709 case CSSValueNone: 1710 return PE_NONE; 1711 case CSSValueVisiblepainted: 1712 return PE_VISIBLE_PAINTED; 1713 case CSSValueVisiblefill: 1714 return PE_VISIBLE_FILL; 1715 case CSSValueVisiblestroke: 1716 return PE_VISIBLE_STROKE; 1717 case CSSValueVisible: 1718 return PE_VISIBLE; 1719 case CSSValuePainted: 1720 return PE_PAINTED; 1721 case CSSValueFill: 1722 return PE_FILL; 1723 case CSSValueStroke: 1724 return PE_STROKE; 1725 default: 1726 ASSERT_NOT_REACHED(); 1727 return PE_ALL; 1728 } 1729 } 1730 1665 1731 #if ENABLE(SVG) 1666 1732 … … 1999 2065 } 2000 2066 2001 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPointerEvents e)2002 : m_type(CSS_IDENT)2003 {2004 switch (e) {2005 case PE_NONE:2006 m_value.ident = CSSValueNone;2007 break;2008 case PE_STROKE:2009 m_value.ident = CSSValueStroke;2010 break;2011 case PE_FILL:2012 m_value.ident = CSSValueFill;2013 break;2014 case PE_PAINTED:2015 m_value.ident = CSSValuePainted;2016 break;2017 case PE_VISIBLE:2018 m_value.ident = CSSValueVisible;2019 break;2020 case PE_VISIBLE_STROKE:2021 m_value.ident = CSSValueVisiblestroke;2022 break;2023 case PE_VISIBLE_FILL:2024 m_value.ident = CSSValueVisiblefill;2025 break;2026 case PE_VISIBLE_PAINTED:2027 m_value.ident = CSSValueVisiblepainted;2028 break;2029 case PE_AUTO:2030 m_value.ident = CSSValueAuto;2031 break;2032 case PE_ALL:2033 m_value.ident = CSSValueAll;2034 break;2035 }2036 }2037 2038 template<> inline CSSPrimitiveValue::operator EPointerEvents() const2039 {2040 switch (m_value.ident) {2041 case CSSValueAll:2042 return PE_ALL;2043 case CSSValueAuto:2044 return PE_AUTO;2045 case CSSValueNone:2046 return PE_NONE;2047 case CSSValueVisiblepainted:2048 return PE_VISIBLE_PAINTED;2049 case CSSValueVisiblefill:2050 return PE_VISIBLE_FILL;2051 case CSSValueVisiblestroke:2052 return PE_VISIBLE_STROKE;2053 case CSSValueVisible:2054 return PE_VISIBLE;2055 case CSSValuePainted:2056 return PE_PAINTED;2057 case CSSValueFill:2058 return PE_FILL;2059 case CSSValueStroke:2060 return PE_STROKE;2061 default:2062 ASSERT_NOT_REACHED();2063 return PE_ALL;2064 }2065 }2066 2067 2067 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EShapeRendering e) 2068 2068 : m_type(CSS_IDENT)
Note: See TracChangeset
for help on using the changeset viewer.