Changeset 92253 in webkit

Timestamp:

Aug 2, 2011 7:11:09 PM (13 years ago)

Author:

macpherson@chromium.org

Message:

Clean up value clampling in CSSStyleSelector and CSSPrimitiveValue.
​https://bugs.webkit.org/show_bug.cgi?id=65441

Reviewed by Simon Fraser.

No new tests / refactoring only.

• css/CSSPrimitiveValue.h:

(WebCore::CSSPrimitiveValue::getFloatValue):
Implement in terms of the new templated getValue().
(WebCore::CSSPrimitiveValue::getIntValue):
Implement in terms of the new templated getValue().
(WebCore::CSSPrimitiveValue::getValue):
Templated getValue that works for all numeric types.

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):
Use getValue<short> instead of rolling-your-own clamp to short.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPrimitiveValue.h (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-02  Luke Macpherson   <macpherson@chromium.org>
+
+        Clean up value clampling in CSSStyleSelector and CSSPrimitiveValue.
+        https://bugs.webkit.org/show_bug.cgi?id=65441
+
+        Reviewed by Simon Fraser.
+
+        No new tests / refactoring only.
+
+        * css/CSSPrimitiveValue.h:
+        (WebCore::CSSPrimitiveValue::getFloatValue):
+        Implement in terms of the new templated getValue().
+        (WebCore::CSSPrimitiveValue::getIntValue):
+        Implement in terms of the new templated getValue().
+        (WebCore::CSSPrimitiveValue::getValue):
+        Templated getValue that works for all numeric types.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Use getValue<short> instead of rolling-your-own clamp to short.
+
 2011-08-02  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/css/CSSPrimitiveValue.h

@@ -158 +158 @@
 
     void setFloatValue(unsigned short unitType, double floatValue, ExceptionCode&);
-    float getFloatValue(unsigned short unitType, ExceptionCode& ec) const { return clampToFloat(getDoubleValue(unitType, ec)); }
-    float getFloatValue(unsigned short unitType) const { return clampToFloat(getDoubleValue(unitType)); }
-    float getFloatValue() const { return clampToFloat(m_value.num); }
-
-    int getIntValue(unsigned short unitType, ExceptionCode& ec) const { return clampToInteger(getDoubleValue(unitType, ec)); }
-    int getIntValue(unsigned short unitType) const { return clampToInteger(getDoubleValue(unitType)); }
-    int getIntValue() const { return clampToInteger(m_value.num); }
+    float getFloatValue(unsigned short unitType, ExceptionCode& ec) const { return getValue<float>(unitType, ec); }
+    float getFloatValue(unsigned short unitType) const { return getValue<float>(unitType); }
+    float getFloatValue() const { return getValue<float>(); }
+
+    int getIntValue(unsigned short unitType, ExceptionCode& ec) const { return getValue<int>(unitType, ec); }
+    int getIntValue(unsigned short unitType) const { return getValue<int>(unitType); }
+    int getIntValue() const { return getValue<int>(); }
+
+    template<typename T> inline T getValue(unsigned short unitType, ExceptionCode& ec) const { return clampTo<T>(getDoubleValue(unitType, ec)); }
+    template<typename T> inline T getValue(unsigned short unitType) const { return clampTo<T>(getDoubleValue(unitType)); }
+    template<typename T> inline T getValue() const { return clampTo<T>(m_value.num); }
 
     void setStringValue(unsigned short stringType, const String& stringValue, ExceptionCode&);

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4497 +4497 @@
             return; // Error case.
         // Clamp opacity to the range 0-1
-        m_style->setOpacity(min(1.0f, max(0.0f, primitiveValue->getFloatValue())));
+        m_style->setOpacity(clampTo<float>(primitiveValue->getDoubleValue(), 0, 1));
         return;
     case CSSPropertyWebkitBoxAlign:
@@ -4771 +4771 @@
             m_style->setHyphenationLimitAfter(-1);
         else
-            m_style->setHyphenationLimitAfter(min(primitiveValue->getIntValue(CSSPrimitiveValue::CSS_NUMBER), static_cast<int>(numeric_limits<short>::max())));
+            m_style->setHyphenationLimitAfter(primitiveValue->getValue<short>(CSSPrimitiveValue::CSS_NUMBER));
         return;
     }
@@ -4779 +4779 @@
             m_style->setHyphenationLimitBefore(-1);
         else
-            m_style->setHyphenationLimitBefore(min(primitiveValue->getIntValue(CSSPrimitiveValue::CSS_NUMBER), static_cast<int>(numeric_limits<short>::max())));
+            m_style->setHyphenationLimitBefore(primitiveValue->getValue<short>(CSSPrimitiveValue::CSS_NUMBER));
         return;
     }