Title: [93110] trunk/Source/WebCore
- Revision
- 93110
- Author
- [email protected]
- Date
- 2011-08-16 09:19:18 -0700 (Tue, 16 Aug 2011)
Log Message
Support cast between CSSPrimitiveValue and ETransformStyle3D and use in CSSStyleSelector.
https://bugs.webkit.org/show_bug.cgi?id=66273
Reviewed by Simon Fraser.
No new tests - no functionality changed - refactoring only.
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
Define cast from CSSPrimitiveValue to ETransformStyle3D.
(WebCore::CSSPrimitiveValue::operator ETransformStyle3D):
Define cast from ETransformStyle3D to CSSPrimitiveValue.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
Use appropriate macro to handle CSSPropertyWebkitTransformStyle.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93109 => 93110)
--- trunk/Source/WebCore/ChangeLog 2011-08-16 16:18:20 UTC (rev 93109)
+++ trunk/Source/WebCore/ChangeLog 2011-08-16 16:19:18 UTC (rev 93110)
@@ -1,5 +1,23 @@
2011-08-16 Luke Macpherson <[email protected]>
+ Support cast between CSSPrimitiveValue and ETransformStyle3D and use in CSSStyleSelector.
+ https://bugs.webkit.org/show_bug.cgi?id=66273
+
+ Reviewed by Simon Fraser.
+
+ No new tests - no functionality changed - refactoring only.
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ Define cast from CSSPrimitiveValue to ETransformStyle3D.
+ (WebCore::CSSPrimitiveValue::operator ETransformStyle3D):
+ Define cast from ETransformStyle3D to CSSPrimitiveValue.
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+ Use appropriate macro to handle CSSPropertyWebkitTransformStyle.
+
+2011-08-16 Luke Macpherson <[email protected]>
+
Use appropriate macro to handle CSSPropertyWebkitContentOrder in CSSStyleSelector::applyProperty()
https://bugs.webkit.org/show_bug.cgi?id=66279
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (93109 => 93110)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2011-08-16 16:18:20 UTC (rev 93109)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2011-08-16 16:19:18 UTC (rev 93110)
@@ -3099,7 +3099,34 @@
return ImageRenderingAuto;
}
}
-
+
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETransformStyle3D e)
+ : m_type(CSS_IDENT)
+ , m_hasCachedCSSText(false)
+{
+ switch (e) {
+ case TransformStyle3DFlat:
+ m_value.ident = CSSValueFlat;
+ break;
+ case TransformStyle3DPreserve3D:
+ m_value.ident = CSSValuePreserve3d;
+ break;
+ }
+}
+
+template<> inline CSSPrimitiveValue::operator ETransformStyle3D() const
+{
+ switch (m_value.ident) {
+ case CSSValueFlat:
+ return TransformStyle3DFlat;
+ case CSSValuePreserve3d:
+ return TransformStyle3DPreserve3D;
+ default:
+ ASSERT_NOT_REACHED();
+ return TransformStyle3DFlat;
+ }
+}
+
#if ENABLE(SVG)
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EColorInterpolation e)
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (93109 => 93110)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-08-16 16:18:20 UTC (rev 93109)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-08-16 16:19:18 UTC (rev 93110)
@@ -4848,9 +4848,7 @@
return;
}
case CSSPropertyWebkitTransformStyle:
- HANDLE_INHERIT_AND_INITIAL(transformStyle3D, TransformStyle3D)
- if (primitiveValue)
- m_style->setTransformStyle3D((primitiveValue->getIdent() == CSSValuePreserve3d) ? TransformStyle3DPreserve3D : TransformStyle3DFlat);
+ HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(transformStyle3D, TransformStyle3D)
return;
case CSSPropertyWebkitPerspective: {
HANDLE_INHERIT_AND_INITIAL(perspective, Perspective)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
