Changeset 90045 in webkit

Timestamp:

Jun 29, 2011 2:25:59 PM (13 years ago)

Author:

macpherson@chromium.org

Message:

2011-06-29 Luke Macpherson <​macpherson@chromium.org>

Reviewed by Darin Adler.

Convert uses of computeLengthIntForLength() to computeLength<Length>()
​https://bugs.webkit.org/show_bug.cgi?id=63641

No new tests / refactoring only.

• css/CSSStyleSelector.cpp: (WebCore::convertToLength): (WebCore::CSSStyleSelector::applyProperty): (WebCore::CSSStyleSelector::applyPageSizeProperty): (WebCore::CSSStyleSelector::mmLength): (WebCore::CSSStyleSelector::inchLength): (WebCore::CSSStyleSelector::mapFillSize): (WebCore::CSSStyleSelector::mapFillXPosition): (WebCore::CSSStyleSelector::mapFillYPosition):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (11 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-29  Luke Macpherson   <macpherson@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Convert uses of computeLengthIntForLength() to computeLength<Length>()
+        https://bugs.webkit.org/show_bug.cgi?id=63641
+
+        No new tests / refactoring only.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::convertToLength):
+        (WebCore::CSSStyleSelector::applyProperty):
+        (WebCore::CSSStyleSelector::applyPageSizeProperty):
+        (WebCore::CSSStyleSelector::mmLength):
+        (WebCore::CSSStyleSelector::inchLength):
+        (WebCore::CSSStyleSelector::mapFillSize):
+        (WebCore::CSSStyleSelector::mapFillXPosition):
+        (WebCore::CSSStyleSelector::mapFillYPosition):
+
 2011-06-29  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3402 +3402 @@
                 l = Length(primitiveValue->computeLength<double>(style, rootStyle, multiplier), Fixed);
             else
-                l = Length(primitiveValue->computeLengthIntForLength(style, rootStyle, multiplier), Fixed);
+                l = primitiveValue->computeLength<Length>(style, rootStyle, multiplier);
         }
         else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
@@ -3935 +3935 @@
         Length length;
         if (CSSPrimitiveValue::isUnitTypeLength(type))
-            length = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed);
+            length = primitiveValue->computeLength<Length>(style(), m_rootElementStyle, zoomFactor);
         else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
             length = Length(primitiveValue->getDoubleValue(), Percent);
@@ -4052 +4052 @@
                     multiplier *= frame->textZoomFactor();
             }
-            lineHeight = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle,  multiplier), Fixed);
+            lineHeight = primitiveValue->computeLength<Length>(style(), m_rootElementStyle, multiplier);
         } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
             lineHeight = Length((m_style->fontSize() * primitiveValue->getIntValue()) / 100, Fixed);
@@ -4618 +4618 @@
                 reflection->setOffset(Length(reflectValue->offset()->getDoubleValue(), Percent));
             else
-                reflection->setOffset(Length(reflectValue->offset()->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed));
+                reflection->setOffset(reflectValue->offset()->computeLength<Length>(style(), m_rootElementStyle, zoomFactor));
         }
         NinePieceImage mask;
@@ -5443 +5443 @@
             if (!CSSPrimitiveValue::isUnitTypeLength(type1))
                 return;
-            width = Length(primitiveValue0->computeLengthIntForLength(style(), m_rootElementStyle), Fixed);
-            height = Length(primitiveValue1->computeLengthIntForLength(style(), m_rootElementStyle), Fixed);
+            width = primitiveValue0->computeLength<Length>(style(), m_rootElementStyle);
+            height = primitiveValue1->computeLength<Length>(style(), m_rootElementStyle);
         } else {
             // <page-size> <orientation>
@@ -5462 +5462 @@
             // <length>
             pageSizeType = PAGE_SIZE_RESOLVED;
-            width = height = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle), Fixed);
+            width = height = primitiveValue->computeLength<Length>(style(), m_rootElementStyle);
         } else {
             if (type != CSSPrimitiveValue::CSS_IDENT)
@@ -5563 +5563 @@
 Length CSSStyleSelector::mmLength(double mm) const
 {
-    return Length(CSSPrimitiveValue::create(mm, CSSPrimitiveValue::CSS_MM)->computeLengthIntForLength(style(), m_rootElementStyle), Fixed);
+    return CSSPrimitiveValue::create(mm, CSSPrimitiveValue::CSS_MM)->computeLength<Length>(style(), m_rootElementStyle);
 }
 
 Length CSSStyleSelector::inchLength(double inch) const
 {
-    return Length(CSSPrimitiveValue::create(inch, CSSPrimitiveValue::CSS_IN)->computeLengthIntForLength(style(), m_rootElementStyle), Fixed);
+    return CSSPrimitiveValue::create(inch, CSSPrimitiveValue::CSS_IN)->computeLength<Length>(style(), m_rootElementStyle);
 }
 
@@ -5735 +5735 @@
         firstLength = Length(Auto);
     else if (CSSPrimitiveValue::isUnitTypeLength(firstType))
-        firstLength = Length(first->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed);
+        firstLength = first->computeLength<Length>(style(), m_rootElementStyle, zoomFactor);
     else if (firstType == CSSPrimitiveValue::CSS_PERCENTAGE)
         firstLength = Length(first->getDoubleValue(), Percent);
@@ -5744 +5744 @@
         secondLength = Length(Auto);
     else if (CSSPrimitiveValue::isUnitTypeLength(secondType))
-        secondLength = Length(second->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed);
+        secondLength = second->computeLength<Length>(style(), m_rootElementStyle, zoomFactor);
     else if (secondType == CSSPrimitiveValue::CSS_PERCENTAGE)
         secondLength = Length(second->getDoubleValue(), Percent);
@@ -5771 +5771 @@
     int type = primitiveValue->primitiveType();
     if (CSSPrimitiveValue::isUnitTypeLength(type))
-        l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed);
+        l = primitiveValue->computeLength<Length>(style(), m_rootElementStyle, zoomFactor);
     else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
         l = Length(primitiveValue->getDoubleValue(), Percent);
@@ -5795 +5795 @@
     int type = primitiveValue->primitiveType();
     if (CSSPrimitiveValue::isUnitTypeLength(type))
-        l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed);
+        l = primitiveValue->computeLength<Length>(style(), m_rootElementStyle, zoomFactor);
     else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
         l = Length(primitiveValue->getDoubleValue(), Percent);