<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23916] trunk</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23916">23916</a></dd>
<dt>Author</dt> <dd>weinig</dd>
<dt>Date</dt> <dd>2007-07-01 10:38:29 -0700 (Sun, 01 Jul 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>LayoutTests:

        Reviewed by Oliver.

        Third round of implicit 64-32 bit conversion errors fixes.
        &lt;rdar://problem/5292262&gt;

        getFloatValue() used to return a double and now returns a float for a small
        loss of precision.

        * fast/css/getFloatValueForUnit-expected.checksum:
        * fast/css/getFloatValueForUnit-expected.png:
        * fast/css/getFloatValueForUnit-expected.txt:
        * fast/css/getFloatValueForUnit.html:

WebCore:

        Reviewed by Oliver.

        Third round of implicit 64-32 bit conversion errors fixes.
        &lt;rdar://problem/5292262&gt;

        - Use new CSSPrimitiveValue::getDoubleValue() and CSSPrimitiveValue::getIntValue()
          methods instead of CSSPrimitiveValue::getFloatValue() where appropriate.

        * css/CSSPrimitiveValue.cpp:
        (WebCore::CSSPrimitiveValue::computeLengthInt):
        (WebCore::CSSPrimitiveValue::computeLengthIntForLength):
        (WebCore::CSSPrimitiveValue::computeLengthShort):
        (WebCore::CSSPrimitiveValue::computeLengthFloat):
        (WebCore::CSSPrimitiveValue::computeLengthDouble):
        (WebCore::CSSPrimitiveValue::getDoubleValue):
        * css/CSSPrimitiveValue.h:
        (WebCore::CSSPrimitiveValue::getDoubleValue):
        (WebCore::CSSPrimitiveValue::getFloatValue):
        (WebCore::CSSPrimitiveValue::getIntValue):
        * css/Counter.h:
        (WebCore::Counter::listStyleNumber):
        * css/MediaQueryEvaluator.cpp:
        (WebCore::parseAspectRatio):
        * css/cssparser.cpp:
        (WebCore::BorderImageParseContext::commitBorderImage):
        * css/cssstyleselector.cpp:
        (WebCore::convertToLength):
        (WebCore::applyCounterList):
        (WebCore::CSSStyleSelector::applyProperty):
        (WebCore::CSSStyleSelector::mapBackgroundSize):
        (WebCore::CSSStyleSelector::mapBackgroundXPosition):
        (WebCore::CSSStyleSelector::mapBackgroundYPosition):
        * html/HTMLTableElement.cpp:
        (WebCore::HTMLTableElement::parseMappedAttribute):
        * ksvg2/css/SVGCSSStyleSelector.cpp:
        (WebCore::CSSStyleSelector::applySVGProperty):
        * ksvg2/misc/KCanvasRenderingStyle.cpp:
        (WebCore::KSVGPainterFactory::cssPrimitiveToLength):
        (WebCore::KSVGPainterFactory::dashArrayFromRenderingStyle):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgetFloatValueForUnitexpectedchecksum">trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.checksum</a></li>
<li><a href="#trunkLayoutTestsfastcssgetFloatValueForUnitexpectedpng">trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.png</a></li>
<li><a href="#trunkLayoutTestsfastcssgetFloatValueForUnitexpectedtxt">trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetFloatValueForUnithtml">trunk/LayoutTests/fast/css/getFloatValueForUnit.html</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorecssCSSPrimitiveValuecpp">trunk/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkWebCorecssCSSPrimitiveValueh">trunk/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkWebCorecssCounterh">trunk/WebCore/css/Counter.h</a></li>
<li><a href="#trunkWebCorecssMediaQueryEvaluatorcpp">trunk/WebCore/css/MediaQueryEvaluator.cpp</a></li>
<li><a href="#trunkWebCorecsscssparsercpp">trunk/WebCore/css/cssparser.cpp</a></li>
<li><a href="#trunkWebCorecsscssstyleselectorcpp">trunk/WebCore/css/cssstyleselector.cpp</a></li>
<li><a href="#trunkWebCorehtmlHTMLTableElementcpp">trunk/WebCore/html/HTMLTableElement.cpp</a></li>
<li><a href="#trunkWebCoreksvg2cssSVGCSSStyleSelectorcpp">trunk/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp</a></li>
<li><a href="#trunkWebCoreksvg2miscKCanvasRenderingStylecpp">trunk/WebCore/ksvg2/misc/KCanvasRenderingStyle.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/LayoutTests/ChangeLog        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2007-07-01  Sam Weinig  &lt;sam@webkit.org&gt;
+
+        Reviewed by Oliver.
+
+        Third round of implicit 64-32 bit conversion errors fixes.
+        &lt;rdar://problem/5292262&gt;
+
+        getFloatValue() used to return a double and now returns a float for a small
+        loss of precision.
+
+        * fast/css/getFloatValueForUnit-expected.checksum:
+        * fast/css/getFloatValueForUnit-expected.png:
+        * fast/css/getFloatValueForUnit-expected.txt:
+        * fast/css/getFloatValueForUnit.html:
+
</ins><span class="cx"> 2007-07-01  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fixed a no-SVG test failure by moving a test that requires SVG into the svg directory.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetFloatValueForUnitexpectedchecksum"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.checksum (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.checksum        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.checksum        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -1 +1 @@
</span><del>-aac74cf551377e05faf81bcc7dab978f
</del><span class="cx">\ No newline at end of file
</span><ins>+f6e55658bfaf1ba0196a3a8c48c01020
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetFloatValueForUnitexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetFloatValueForUnitexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.txt (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.txt        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/LayoutTests/fast/css/getFloatValueForUnit-expected.txt        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -8,4 +8,5 @@
</span><span class="cx">         RenderText {#text} at (0,0) size 45x18
</span><span class="cx">           text run at (0,0) width 45: &quot;10pt = &quot;
</span><span class="cx">         RenderText {#text} at (45,0) size 383x18
</span><del>-          text run at (45,0) width 383: &quot;3.4395833333333328mm (should be 3.4395833333333328)&quot;
</del><ins>+          text run at (45,0) width 383: &quot;3.4395833015441895mm (should be 3.4395833015441895)&quot;
+        RenderText {#text} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgetFloatValueForUnithtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getFloatValueForUnit.html (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getFloatValueForUnit.html        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/LayoutTests/fast/css/getFloatValueForUnit.html        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -4,6 +4,6 @@
</span><span class="cx"> &lt;script&gt;
</span><span class="cx"> //CSSPrimitiveValue.CSS_MM
</span><span class="cx"> document.write(document.defaultView.getComputedStyle(document.getElementById('d'), '').getPropertyCSSValue('font-size').getFloatValue(7));
</span><del>-document.write(&quot;mm (should be 3.4395833333333328)&quot;);
</del><ins>+document.write(&quot;mm (should be 3.4395833015441895)&quot;);
</ins><span class="cx"> &lt;/script&gt;
</span><del>-&lt;/body&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/ChangeLog        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2007-07-01  Sam Weinig  &lt;sam@webkit.org&gt;
+
+        Reviewed by Oliver.
+
+        Third round of implicit 64-32 bit conversion errors fixes.
+        &lt;rdar://problem/5292262&gt;
+
+        - Use new CSSPrimitiveValue::getDoubleValue() and CSSPrimitiveValue::getIntValue()
+          methods instead of CSSPrimitiveValue::getFloatValue() where appropriate.
+
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::computeLengthInt):
+        (WebCore::CSSPrimitiveValue::computeLengthIntForLength):
+        (WebCore::CSSPrimitiveValue::computeLengthShort):
+        (WebCore::CSSPrimitiveValue::computeLengthFloat):
+        (WebCore::CSSPrimitiveValue::computeLengthDouble):
+        (WebCore::CSSPrimitiveValue::getDoubleValue):
+        * css/CSSPrimitiveValue.h:
+        (WebCore::CSSPrimitiveValue::getDoubleValue):
+        (WebCore::CSSPrimitiveValue::getFloatValue):
+        (WebCore::CSSPrimitiveValue::getIntValue):
+        * css/Counter.h:
+        (WebCore::Counter::listStyleNumber):
+        * css/MediaQueryEvaluator.cpp:
+        (WebCore::parseAspectRatio):
+        * css/cssparser.cpp:
+        (WebCore::BorderImageParseContext::commitBorderImage):
+        * css/cssstyleselector.cpp:
+        (WebCore::convertToLength):
+        (WebCore::applyCounterList):
+        (WebCore::CSSStyleSelector::applyProperty):
+        (WebCore::CSSStyleSelector::mapBackgroundSize):
+        (WebCore::CSSStyleSelector::mapBackgroundXPosition):
+        (WebCore::CSSStyleSelector::mapBackgroundYPosition):
+        * html/HTMLTableElement.cpp:
+        (WebCore::HTMLTableElement::parseMappedAttribute):
+        * ksvg2/css/SVGCSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applySVGProperty):
+        * ksvg2/misc/KCanvasRenderingStyle.cpp:
+        (WebCore::KSVGPainterFactory::cssPrimitiveToLength):
+        (WebCore::KSVGPainterFactory::dashArrayFromRenderingStyle):
+
</ins><span class="cx"> 2007-07-01  Pamela Greene  &lt;pamg.bugs@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSPrimitiveValue.cpp (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSPrimitiveValue.cpp        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/css/CSSPrimitiveValue.cpp        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> 
</span><span class="cx"> int CSSPrimitiveValue::computeLengthInt(RenderStyle* style)
</span><span class="cx"> {
</span><del>-    double result = computeLengthFloat(style);
</del><ins>+    double result = computeLengthDouble(style);
</ins><span class="cx"> 
</span><span class="cx">     // This conversion is imprecise, often resulting in values of, e.g., 44.99998.  We
</span><span class="cx">     // need to go ahead and round if we're really close to the next integer value.
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> 
</span><span class="cx"> int CSSPrimitiveValue::computeLengthInt(RenderStyle* style, double multiplier)
</span><span class="cx"> {
</span><del>-    double result = multiplier * computeLengthFloat(style);
</del><ins>+    double result = multiplier * computeLengthDouble(style);
</ins><span class="cx"> 
</span><span class="cx">     // This conversion is imprecise, often resulting in values of, e.g., 44.99998.  We
</span><span class="cx">     // need to go ahead and round if we're really close to the next integer value.
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> // Lengths expect an int that is only 28-bits, so we have to check for a different overflow.
</span><span class="cx"> int CSSPrimitiveValue::computeLengthIntForLength(RenderStyle* style)
</span><span class="cx"> {
</span><del>-    double result = computeLengthFloat(style);
</del><ins>+    double result = computeLengthDouble(style);
</ins><span class="cx"> 
</span><span class="cx">     // This conversion is imprecise, often resulting in values of, e.g., 44.99998.  We
</span><span class="cx">     // need to go ahead and round if we're really close to the next integer value.
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> // Lengths expect an int that is only 28-bits, so we have to check for a different overflow.
</span><span class="cx"> int CSSPrimitiveValue::computeLengthIntForLength(RenderStyle* style, double multiplier)
</span><span class="cx"> {
</span><del>-    double result = multiplier * computeLengthFloat(style);
</del><ins>+    double result = multiplier * computeLengthDouble(style);
</ins><span class="cx"> 
</span><span class="cx">     // This conversion is imprecise, often resulting in values of, e.g., 44.99998.  We
</span><span class="cx">     // need to go ahead and round if we're really close to the next integer value.
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> 
</span><span class="cx"> short CSSPrimitiveValue::computeLengthShort(RenderStyle* style)
</span><span class="cx"> {
</span><del>-    double result = computeLengthFloat(style);
</del><ins>+    double result = computeLengthDouble(style);
</ins><span class="cx"> 
</span><span class="cx">     // This conversion is imprecise, often resulting in values of, e.g., 44.99998.  We
</span><span class="cx">     // need to go ahead and round if we're really close to the next integer value.
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> 
</span><span class="cx"> short CSSPrimitiveValue::computeLengthShort(RenderStyle* style, double multiplier)
</span><span class="cx"> {
</span><del>-    double result = multiplier * computeLengthFloat(style);
</del><ins>+    double result = multiplier * computeLengthDouble(style);
</ins><span class="cx"> 
</span><span class="cx">     // This conversion is imprecise, often resulting in values of, e.g., 44.99998.  We
</span><span class="cx">     // need to go ahead and round if we're really close to the next integer value.
</span><span class="lines">@@ -278,8 +278,13 @@
</span><span class="cx">     return static_cast&lt;short&gt;(result);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-double CSSPrimitiveValue::computeLengthFloat(RenderStyle* style, bool applyZoomFactor)
</del><ins>+float CSSPrimitiveValue::computeLengthFloat(RenderStyle* style, bool applyZoomFactor)
</ins><span class="cx"> {
</span><ins>+    return static_cast&lt;float&gt;(computeLengthDouble(style, applyZoomFactor));
+}
+
+double CSSPrimitiveValue::computeLengthDouble(RenderStyle* style, bool applyZoomFactor)
+{
</ins><span class="cx">     unsigned short type = primitiveType();
</span><span class="cx"> 
</span><span class="cx">     double factor = 1.0;
</span><span class="lines">@@ -315,7 +320,7 @@
</span><span class="cx">             return -1.0;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return getFloatValue() * factor;
</del><ins>+    return getDoubleValue() * factor;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CSSPrimitiveValue::setFloatValue(unsigned short unitType, double floatValue, ExceptionCode&amp; ec)
</span><span class="lines">@@ -363,7 +368,7 @@
</span><span class="cx">     return factor;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-double CSSPrimitiveValue::getFloatValue(unsigned short unitType)
</del><ins>+double CSSPrimitiveValue::getDoubleValue(unsigned short unitType)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_type &lt;= CSS_DIMENSION);
</span><span class="cx">     ASSERT(unitType &lt;= CSS_DIMENSION);
</span></span></pre></div>
<a id="trunkWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSPrimitiveValue.h (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSPrimitiveValue.h        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/css/CSSPrimitiveValue.h        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -103,13 +103,20 @@
</span><span class="cx">     int computeLengthIntForLength(RenderStyle*, double multiplier);
</span><span class="cx">     short computeLengthShort(RenderStyle*);
</span><span class="cx">     short computeLengthShort(RenderStyle*, double multiplier);
</span><del>-    double computeLengthFloat(RenderStyle*, bool applyZoomFactor = true);
</del><ins>+    float computeLengthFloat(RenderStyle*, bool applyZoomFactor = true);
+    double computeLengthDouble(RenderStyle*, bool applyZoomFactor = true);
</ins><span class="cx"> 
</span><span class="cx">     // use with care!!!
</span><span class="cx">     void setPrimitiveType(unsigned short type) { m_type = type; }
</span><ins>+
+    double getDoubleValue(unsigned short unitType);
+    double getDoubleValue() const { return m_value.num; }
+
</ins><span class="cx">     void setFloatValue(unsigned short unitType, double floatValue, ExceptionCode&amp;);
</span><del>-    double getFloatValue(unsigned short unitType);
-    double getFloatValue() { return m_value.num; }
</del><ins>+    float getFloatValue(unsigned short unitType) { return static_cast&lt;float&gt;(getDoubleValue(unitType)); }
+    float getFloatValue() const { return static_cast&lt;float&gt;(m_value.num); }
+    int getIntValue(unsigned short unitType) { return static_cast&lt;int&gt;(getDoubleValue(unitType)); }
+    int getIntValue() const { return static_cast&lt;int&gt;(m_value.num); }
</ins><span class="cx"> 
</span><span class="cx">     void setStringValue(unsigned short stringType, const String&amp; stringValue, ExceptionCode&amp;);
</span><span class="cx">     String getStringValue() const;
</span></span></pre></div>
<a id="trunkWebCorecssCounterh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/Counter.h (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/Counter.h        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/css/Counter.h        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">     String listStyle() const { return m_listStyle ? m_listStyle-&gt;getStringValue() : String(); }
</span><span class="cx">     String separator() const { return m_separator ? m_separator-&gt;getStringValue() : String(); }
</span><span class="cx"> 
</span><del>-    int listStyleNumber() const { return m_listStyle ? static_cast&lt;int&gt;(m_listStyle-&gt;getFloatValue()) : 0; }
</del><ins>+    int listStyleNumber() const { return m_listStyle ? m_listStyle-&gt;getIntValue() : 0; }
</ins><span class="cx"> 
</span><span class="cx">     void setIdentifier(PassRefPtr&lt;CSSPrimitiveValue&gt; identifier) { m_identifier = identifier; }
</span><span class="cx">     void setListStyle(PassRefPtr&lt;CSSPrimitiveValue&gt; listStyle) { m_listStyle = listStyle; }
</span></span></pre></div>
<a id="trunkWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/MediaQueryEvaluator.cpp (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/MediaQueryEvaluator.cpp        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/css/MediaQueryEvaluator.cpp        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx">                 &amp;&amp; i2-&gt;isPrimitiveValue() &amp;&amp; static_cast&lt;CSSPrimitiveValue*&gt;(i2)-&gt;primitiveType() == CSSPrimitiveValue::CSS_NUMBER) {
</span><span class="cx">                 String str = static_cast&lt;CSSPrimitiveValue*&gt;(i1)-&gt;getStringValue();
</span><span class="cx">                 if (!str.isNull() &amp;&amp; str.length() == 1 &amp;&amp; str[0] == DeprecatedChar('/')) {
</span><del>-                    a = (int) static_cast&lt;CSSPrimitiveValue*&gt;(i0)-&gt;getFloatValue(CSSPrimitiveValue::CSS_NUMBER);
-                    b = (int) static_cast&lt;CSSPrimitiveValue*&gt;(i2)-&gt;getFloatValue(CSSPrimitiveValue::CSS_NUMBER);
</del><ins>+                    a = static_cast&lt;CSSPrimitiveValue*&gt;(i0)-&gt;getIntValue(CSSPrimitiveValue::CSS_NUMBER);
+                    b = static_cast&lt;CSSPrimitiveValue*&gt;(i2)-&gt;getIntValue(CSSPrimitiveValue::CSS_NUMBER);
</ins><span class="cx">                     return true;
</span><span class="cx">                 }
</span><span class="cx">             }
</span></span></pre></div>
<a id="trunkWebCorecsscssparsercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/cssparser.cpp (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/cssparser.cpp        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/css/cssparser.cpp        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -2806,16 +2806,16 @@
</span><span class="cx">     void commitBorderImage(CSSParser* p, int propId, bool important) {
</span><span class="cx">         // We need to clone and repeat values for any omissions.
</span><span class="cx">         if (!m_right) {
</span><del>-            m_right = new CSSPrimitiveValue(m_top-&gt;getFloatValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
-            m_bottom = new CSSPrimitiveValue(m_top-&gt;getFloatValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
-            m_left = new CSSPrimitiveValue(m_top-&gt;getFloatValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
</del><ins>+            m_right = new CSSPrimitiveValue(m_top-&gt;getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
+            m_bottom = new CSSPrimitiveValue(m_top-&gt;getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
+            m_left = new CSSPrimitiveValue(m_top-&gt;getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
</ins><span class="cx">         }
</span><span class="cx">         if (!m_bottom) {
</span><del>-            m_bottom = new CSSPrimitiveValue(m_top-&gt;getFloatValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
-            m_left = new CSSPrimitiveValue(m_right-&gt;getFloatValue(), (CSSPrimitiveValue::UnitTypes)m_right-&gt;primitiveType());
</del><ins>+            m_bottom = new CSSPrimitiveValue(m_top-&gt;getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
+            m_left = new CSSPrimitiveValue(m_right-&gt;getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_right-&gt;primitiveType());
</ins><span class="cx">         }
</span><span class="cx">         if (!m_left)
</span><del>-             m_left = new CSSPrimitiveValue(m_top-&gt;getFloatValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
</del><ins>+             m_left = new CSSPrimitiveValue(m_top-&gt;getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_top-&gt;primitiveType());
</ins><span class="cx">              
</span><span class="cx">         // Now build a rect value to hold all four of our primitive values.
</span><span class="cx">         Rect* rect = new Rect;
</span></span></pre></div>
<a id="trunkWebCorecsscssstyleselectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/cssstyleselector.cpp (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/cssstyleselector.cpp        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/css/cssstyleselector.cpp        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -1742,9 +1742,9 @@
</span><span class="cx">         if(type &gt; CSSPrimitiveValue::CSS_PERCENTAGE &amp;&amp; type &lt; CSSPrimitiveValue::CSS_DEG)
</span><span class="cx">             l = Length(primitiveValue-&gt;computeLengthIntForLength(style), Fixed);
</span><span class="cx">         else if(type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-            l = Length(primitiveValue-&gt;getFloatValue(), Percent);
</del><ins>+            l = Length(primitiveValue-&gt;getDoubleValue(), Percent);
</ins><span class="cx">         else if(type == CSSPrimitiveValue::CSS_NUMBER)
</span><del>-            l = Length(primitiveValue-&gt;getFloatValue() * 100.0, Percent);
</del><ins>+            l = Length(primitiveValue-&gt;getDoubleValue() * 100.0, Percent);
</ins><span class="cx">         else if (ok)
</span><span class="cx">             *ok = false;
</span><span class="cx">     }
</span><span class="lines">@@ -1810,7 +1810,7 @@
</span><span class="cx">         Pair* pair = static_cast&lt;CSSPrimitiveValue*&gt;(list-&gt;item(i))-&gt;getPairValue();
</span><span class="cx">         AtomicString identifier = static_cast&lt;CSSPrimitiveValue*&gt;(pair-&gt;first())-&gt;getStringValue();
</span><span class="cx">         // FIXME: What about overflow?
</span><del>-        int value = static_cast&lt;int&gt;(static_cast&lt;CSSPrimitiveValue*&gt;(pair-&gt;second())-&gt;getFloatValue());
</del><ins>+        int value = static_cast&lt;CSSPrimitiveValue*&gt;(pair-&gt;second())-&gt;getIntValue();
</ins><span class="cx">         CounterDirectives&amp; directives = map.add(identifier.impl(), CounterDirectives()).first-&gt;second;
</span><span class="cx">         if (isReset) {
</span><span class="cx">             directives.m_reset = true;
</span><span class="lines">@@ -2881,7 +2881,7 @@
</span><span class="cx">                 l = Length(primitiveValue-&gt;computeLengthIntForLength(style), Fixed, 
</span><span class="cx">                            primitiveValue-&gt;isQuirkValue());
</span><span class="cx">             else if(type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                l = Length(primitiveValue-&gt;getFloatValue(), Percent);
</del><ins>+                l = Length(primitiveValue-&gt;getDoubleValue(), Percent);
</ins><span class="cx">             else
</span><span class="cx">                 return;
</span><span class="cx">             if (id == CSS_PROP_PADDING_LEFT || id == CSS_PROP_PADDING_RIGHT ||
</span><span class="lines">@@ -2964,7 +2964,7 @@
</span><span class="cx">             if (type &gt; CSSPrimitiveValue::CSS_PERCENTAGE &amp;&amp; type &lt; CSSPrimitiveValue::CSS_DEG)
</span><span class="cx">                 l = Length(primitiveValue-&gt;computeLengthIntForLength(style), Fixed);
</span><span class="cx">             else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                l = Length(primitiveValue-&gt;getFloatValue(), Percent);
</del><ins>+                l = Length(primitiveValue-&gt;getDoubleValue(), Percent);
</ins><span class="cx">             else
</span><span class="cx">                 return;
</span><span class="cx">             apply = true;
</span><span class="lines">@@ -3020,7 +3020,7 @@
</span><span class="cx">           if(type &gt; CSSPrimitiveValue::CSS_PERCENTAGE &amp;&amp; type &lt; CSSPrimitiveValue::CSS_DEG)
</span><span class="cx">             l = Length(primitiveValue-&gt;computeLengthIntForLength(style), Fixed);
</span><span class="cx">           else if(type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-            l = Length(primitiveValue-&gt;getFloatValue(), Percent);
</del><ins>+            l = Length(primitiveValue-&gt;getDoubleValue(), Percent);
</ins><span class="cx"> 
</span><span class="cx">           style-&gt;setVerticalAlign(LENGTH);
</span><span class="cx">           style-&gt;setVerticalAlignLength(l);
</span><span class="lines">@@ -3084,7 +3084,7 @@
</span><span class="cx">             if (type &gt; CSSPrimitiveValue::CSS_PERCENTAGE &amp;&amp; type &lt; CSSPrimitiveValue::CSS_DEG)
</span><span class="cx">                 size = primitiveValue-&gt;computeLengthFloat(parentStyle, false);
</span><span class="cx">             else if(type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                size = (primitiveValue-&gt;getFloatValue() * oldSize) / 100;
</del><ins>+                size = (primitiveValue-&gt;getFloatValue() * oldSize) / 100.0f;
</ins><span class="cx">             else
</span><span class="cx">                 return;
</span><span class="cx">         }
</span><span class="lines">@@ -3113,7 +3113,7 @@
</span><span class="cx">         // FIXME: Should clamp all sorts of other integer properties too.
</span><span class="cx">         const double minIntAsDouble = INT_MIN;
</span><span class="cx">         const double maxIntAsDouble = INT_MAX;
</span><del>-        style-&gt;setZIndex(static_cast&lt;int&gt;(max(minIntAsDouble, min(primitiveValue-&gt;getFloatValue(), maxIntAsDouble))));
</del><ins>+        style-&gt;setZIndex(static_cast&lt;int&gt;(max(minIntAsDouble, min(primitiveValue-&gt;getDoubleValue(), maxIntAsDouble))));
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     case CSS_PROP_WIDOWS:
</span><span class="lines">@@ -3121,7 +3121,7 @@
</span><span class="cx">         HANDLE_INHERIT_AND_INITIAL(widows, Widows)
</span><span class="cx">         if (!primitiveValue || primitiveValue-&gt;primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">             return;
</span><del>-        style-&gt;setWidows((int)primitiveValue-&gt;getFloatValue());
</del><ins>+        style-&gt;setWidows(primitiveValue-&gt;getIntValue());
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">         
</span><span class="lines">@@ -3130,7 +3130,7 @@
</span><span class="cx">         HANDLE_INHERIT_AND_INITIAL(orphans, Orphans)
</span><span class="cx">         if (!primitiveValue || primitiveValue-&gt;primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">             return;
</span><del>-        style-&gt;setOrphans((int)primitiveValue-&gt;getFloatValue());
</del><ins>+        style-&gt;setOrphans(primitiveValue-&gt;getIntValue());
</ins><span class="cx">         return;
</span><span class="cx">     }        
</span><span class="cx"> 
</span><span class="lines">@@ -3152,9 +3152,9 @@
</span><span class="cx">             }
</span><span class="cx">             lineHeight = Length(primitiveValue-&gt;computeLengthIntForLength(style, multiplier), Fixed);
</span><span class="cx">         } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-            lineHeight = Length((style-&gt;fontSize() * int(primitiveValue-&gt;getFloatValue())) / 100, Fixed);
</del><ins>+            lineHeight = Length((style-&gt;fontSize() * primitiveValue-&gt;getIntValue()) / 100, Fixed);
</ins><span class="cx">         else if (type == CSSPrimitiveValue::CSS_NUMBER)
</span><del>-            lineHeight = Length(primitiveValue-&gt;getFloatValue() * 100.0, Percent);
</del><ins>+            lineHeight = Length(primitiveValue-&gt;getDoubleValue() * 100.0, Percent);
</ins><span class="cx">         else
</span><span class="cx">             return;
</span><span class="cx">         style-&gt;setLineHeight(lineHeight);
</span><span class="lines">@@ -3658,21 +3658,21 @@
</span><span class="cx">             LengthBox&amp; l = image.m_slices;
</span><span class="cx">             Rect* r = borderImage-&gt;m_imageSliceRect.get();
</span><span class="cx">             if (r-&gt;top()-&gt;primitiveType() == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                l.top = Length(r-&gt;top()-&gt;getFloatValue(), Percent);
</del><ins>+                l.top = Length(r-&gt;top()-&gt;getDoubleValue(), Percent);
</ins><span class="cx">             else
</span><del>-                l.top = Length((int)r-&gt;top()-&gt;getFloatValue(CSSPrimitiveValue::CSS_NUMBER), Fixed);
</del><ins>+                l.top = Length(r-&gt;top()-&gt;getIntValue(CSSPrimitiveValue::CSS_NUMBER), Fixed);
</ins><span class="cx">             if (r-&gt;bottom()-&gt;primitiveType() == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                l.bottom = Length(r-&gt;bottom()-&gt;getFloatValue(), Percent);
</del><ins>+                l.bottom = Length(r-&gt;bottom()-&gt;getDoubleValue(), Percent);
</ins><span class="cx">             else
</span><span class="cx">                 l.bottom = Length((int)r-&gt;bottom()-&gt;getFloatValue(CSSPrimitiveValue::CSS_NUMBER), Fixed);
</span><span class="cx">             if (r-&gt;left()-&gt;primitiveType() == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                l.left = Length(r-&gt;left()-&gt;getFloatValue(), Percent);
</del><ins>+                l.left = Length(r-&gt;left()-&gt;getDoubleValue(), Percent);
</ins><span class="cx">             else
</span><del>-                l.left = Length((int)r-&gt;left()-&gt;getFloatValue(CSSPrimitiveValue::CSS_NUMBER), Fixed);
</del><ins>+                l.left = Length(r-&gt;left()-&gt;getIntValue(CSSPrimitiveValue::CSS_NUMBER), Fixed);
</ins><span class="cx">             if (r-&gt;right()-&gt;primitiveType() == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                l.right = Length(r-&gt;right()-&gt;getFloatValue(), Percent);
</del><ins>+                l.right = Length(r-&gt;right()-&gt;getDoubleValue(), Percent);
</ins><span class="cx">             else
</span><del>-                l.right = Length((int)r-&gt;right()-&gt;getFloatValue(CSSPrimitiveValue::CSS_NUMBER), Fixed);
</del><ins>+                l.right = Length(r-&gt;right()-&gt;getIntValue(CSSPrimitiveValue::CSS_NUMBER), Fixed);
</ins><span class="cx">             
</span><span class="cx">             // Set the appropriate rules for stretch/round/repeat of the slices
</span><span class="cx">             switch (borderImage-&gt;m_horizontalSizeRule) {
</span><span class="lines">@@ -3816,7 +3816,7 @@
</span><span class="cx">         if (!primitiveValue || primitiveValue-&gt;primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">             return; // Error case.
</span><span class="cx">         // Clamp opacity to the range 0-1
</span><del>-        style-&gt;setOpacity(min(1.0, max(0.0, primitiveValue-&gt;getFloatValue())));
</del><ins>+        style-&gt;setOpacity(min(1.0f, max(0.0f, primitiveValue-&gt;getFloatValue())));
</ins><span class="cx">         return;
</span><span class="cx">     case CSS_PROP__WEBKIT_BOX_ALIGN:
</span><span class="cx">         HANDLE_INHERIT_AND_INITIAL(boxAlign, BoxAlign)
</span><span class="lines">@@ -3896,13 +3896,13 @@
</span><span class="cx">         HANDLE_INHERIT_AND_INITIAL(boxFlexGroup, BoxFlexGroup)
</span><span class="cx">         if (!primitiveValue || primitiveValue-&gt;primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">             return; // Error case.
</span><del>-        style-&gt;setBoxFlexGroup((unsigned int)(primitiveValue-&gt;getFloatValue()));
</del><ins>+        style-&gt;setBoxFlexGroup((unsigned int)(primitiveValue-&gt;getDoubleValue()));
</ins><span class="cx">         return;        
</span><span class="cx">     case CSS_PROP__WEBKIT_BOX_ORDINAL_GROUP:
</span><span class="cx">         HANDLE_INHERIT_AND_INITIAL(boxOrdinalGroup, BoxOrdinalGroup)
</span><span class="cx">         if (!primitiveValue || primitiveValue-&gt;primitiveType() != CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">             return; // Error case.
</span><del>-        style-&gt;setBoxOrdinalGroup((unsigned int)(primitiveValue-&gt;getFloatValue()));
</del><ins>+        style-&gt;setBoxOrdinalGroup((unsigned int)(primitiveValue-&gt;getDoubleValue()));
</ins><span class="cx">         return;
</span><span class="cx">     case CSS_PROP__WEBKIT_BOX_SIZING:
</span><span class="cx">         HANDLE_INHERIT_AND_INITIAL(boxSizing, BoxSizing)
</span><span class="lines">@@ -3923,7 +3923,7 @@
</span><span class="cx">             style-&gt;setHasAutoColumnCount();
</span><span class="cx">             return;
</span><span class="cx">         }
</span><del>-        style-&gt;setColumnCount(static_cast&lt;unsigned short&gt;(primitiveValue-&gt;getFloatValue()));
</del><ins>+        style-&gt;setColumnCount(static_cast&lt;unsigned short&gt;(primitiveValue-&gt;getDoubleValue()));
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     case CSS_PROP__WEBKIT_COLUMN_GAP: {
</span><span class="lines">@@ -4035,7 +4035,7 @@
</span><span class="cx">         if (primitiveValue-&gt;getIdent() == CSS_VAL_INFINITE)
</span><span class="cx">             style-&gt;setMarqueeLoopCount(-1); // -1 means repeat forever.
</span><span class="cx">         else if (primitiveValue-&gt;primitiveType() == CSSPrimitiveValue::CSS_NUMBER)
</span><del>-            style-&gt;setMarqueeLoopCount((int)primitiveValue-&gt;getFloatValue());
</del><ins>+            style-&gt;setMarqueeLoopCount(primitiveValue-&gt;getIntValue());
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     case CSS_PROP__WEBKIT_MARQUEE_SPEED: {
</span><span class="lines">@@ -4056,11 +4056,11 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">         else if (primitiveValue-&gt;primitiveType() == CSSPrimitiveValue::CSS_S)
</span><del>-            style-&gt;setMarqueeSpeed(int(1000*primitiveValue-&gt;getFloatValue()));
</del><ins>+            style-&gt;setMarqueeSpeed(1000 * primitiveValue-&gt;getIntValue());
</ins><span class="cx">         else if (primitiveValue-&gt;primitiveType() == CSSPrimitiveValue::CSS_MS)
</span><del>-            style-&gt;setMarqueeSpeed(int(primitiveValue-&gt;getFloatValue()));
</del><ins>+            style-&gt;setMarqueeSpeed(primitiveValue-&gt;getIntValue());
</ins><span class="cx">         else if (primitiveValue-&gt;primitiveType() == CSSPrimitiveValue::CSS_NUMBER) // For scrollamount support.
</span><del>-            style-&gt;setMarqueeSpeed(int(primitiveValue-&gt;getFloatValue()));
</del><ins>+            style-&gt;setMarqueeSpeed(primitiveValue-&gt;getIntValue());
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     case CSS_PROP__WEBKIT_MARQUEE_INCREMENT: {
</span><span class="lines">@@ -4245,7 +4245,7 @@
</span><span class="cx">     case CSS_PROP__WEBKIT_LINE_CLAMP: {
</span><span class="cx">         HANDLE_INHERIT_AND_INITIAL(lineClamp, LineClamp)
</span><span class="cx">         if (!primitiveValue) return;
</span><del>-        style-&gt;setLineClamp((int)primitiveValue-&gt;getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE));
</del><ins>+        style-&gt;setLineClamp(primitiveValue-&gt;getIntValue(CSSPrimitiveValue::CSS_PERCENTAGE));
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     case CSS_PROP__WEBKIT_HIGHLIGHT: {
</span><span class="lines">@@ -4586,7 +4586,7 @@
</span><span class="cx">     else if (firstType &gt; CSSPrimitiveValue::CSS_PERCENTAGE &amp;&amp; firstType &lt; CSSPrimitiveValue::CSS_DEG)
</span><span class="cx">         firstLength = Length(first-&gt;computeLengthIntForLength(style), Fixed);
</span><span class="cx">     else if (firstType == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-        firstLength = Length(first-&gt;getFloatValue(), Percent);
</del><ins>+        firstLength = Length(first-&gt;getDoubleValue(), Percent);
</ins><span class="cx">     else
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -4595,7 +4595,7 @@
</span><span class="cx">     else if (secondType &gt; CSSPrimitiveValue::CSS_PERCENTAGE &amp;&amp; secondType &lt; CSSPrimitiveValue::CSS_DEG)
</span><span class="cx">         secondLength = Length(second-&gt;computeLengthIntForLength(style), Fixed);
</span><span class="cx">     else if (secondType == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-        secondLength = Length(second-&gt;getFloatValue(), Percent);
</del><ins>+        secondLength = Length(second-&gt;getDoubleValue(), Percent);
</ins><span class="cx">     else
</span><span class="cx">         return;
</span><span class="cx">     
</span><span class="lines">@@ -4619,7 +4619,7 @@
</span><span class="cx">     if(type &gt; CSSPrimitiveValue::CSS_PERCENTAGE &amp;&amp; type &lt; CSSPrimitiveValue::CSS_DEG)
</span><span class="cx">         l = Length(primitiveValue-&gt;computeLengthIntForLength(style), Fixed);
</span><span class="cx">     else if(type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-        l = Length(primitiveValue-&gt;getFloatValue(), Percent);
</del><ins>+        l = Length(primitiveValue-&gt;getDoubleValue(), Percent);
</ins><span class="cx">     else
</span><span class="cx">         return;
</span><span class="cx">     layer-&gt;setBackgroundXPosition(l);
</span><span class="lines">@@ -4640,7 +4640,7 @@
</span><span class="cx">     if(type &gt; CSSPrimitiveValue::CSS_PERCENTAGE &amp;&amp; type &lt; CSSPrimitiveValue::CSS_DEG)
</span><span class="cx">         l = Length(primitiveValue-&gt;computeLengthIntForLength(style), Fixed);
</span><span class="cx">     else if(type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-        l = Length(primitiveValue-&gt;getFloatValue(), Percent);
</del><ins>+        l = Length(primitiveValue-&gt;getDoubleValue(), Percent);
</ins><span class="cx">     else
</span><span class="cx">         return;
</span><span class="cx">     layer-&gt;setBackgroundYPosition(l);
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLTableElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLTableElement.cpp (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLTableElement.cpp        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/html/HTMLTableElement.cpp        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx">             RefPtr&lt;CSSValue&gt; val = attr-&gt;decl()-&gt;getPropertyCSSValue(CSS_PROP_BORDER_LEFT_WIDTH);
</span><span class="cx">             if (val &amp;&amp; val-&gt;isPrimitiveValue()) {
</span><span class="cx">                 CSSPrimitiveValue* primVal = static_cast&lt;CSSPrimitiveValue*&gt;(val.get());
</span><del>-                m_borderAttr = primVal-&gt;getFloatValue(CSSPrimitiveValue::CSS_NUMBER);
</del><ins>+                m_borderAttr = primVal-&gt;getDoubleValue(CSSPrimitiveValue::CSS_NUMBER);
</ins><span class="cx">             }
</span><span class="cx">         } else if (!attr-&gt;isNull()) {
</span><span class="cx">             int border = 0;
</span></span></pre></div>
<a id="trunkWebCoreksvg2cssSVGCSSStyleSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx">             float f = 0.0f;    
</span><span class="cx">             int type = primitiveValue-&gt;primitiveType();
</span><span class="cx">             if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                f = primitiveValue-&gt;getFloatValue() / 100.;
</del><ins>+                f = primitiveValue-&gt;getFloatValue() / 100.0f;
</ins><span class="cx">             else if (type == CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">                 f = primitiveValue-&gt;getFloatValue();
</span><span class="cx">             else
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx">             float f = 0.0f;    
</span><span class="cx">             int type = primitiveValue-&gt;primitiveType();
</span><span class="cx">             if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                f = primitiveValue-&gt;getFloatValue() / 100.;
</del><ins>+                f = primitiveValue-&gt;getFloatValue() / 100.0f;
</ins><span class="cx">             else if (type == CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">                 f = primitiveValue-&gt;getFloatValue();
</span><span class="cx">             else
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx">             float f = 0.0f;    
</span><span class="cx">             int type = primitiveValue-&gt;primitiveType();
</span><span class="cx">             if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                f = primitiveValue-&gt;getFloatValue() / 100.;
</del><ins>+                f = primitiveValue-&gt;getFloatValue() / 100.0f;
</ins><span class="cx">             else if (type == CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">                 f = primitiveValue-&gt;getFloatValue();
</span><span class="cx">             else
</span><span class="lines">@@ -715,7 +715,7 @@
</span><span class="cx">             float f = 0.0f;
</span><span class="cx">             int type = primitiveValue-&gt;primitiveType();
</span><span class="cx">             if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
</span><del>-                f = primitiveValue-&gt;getFloatValue() / 100.;
</del><ins>+                f = primitiveValue-&gt;getFloatValue() / 100.0f;
</ins><span class="cx">             else if (type == CSSPrimitiveValue::CSS_NUMBER)
</span><span class="cx">                 f = primitiveValue-&gt;getFloatValue();
</span><span class="cx">             else
</span></span></pre></div>
<a id="trunkWebCoreksvg2miscKCanvasRenderingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ksvg2/misc/KCanvasRenderingStyle.cpp (23915 => 23916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ksvg2/misc/KCanvasRenderingStyle.cpp        2007-07-01 17:23:29 UTC (rev 23915)
+++ trunk/WebCore/ksvg2/misc/KCanvasRenderingStyle.cpp        2007-07-01 17:38:29 UTC (rev 23916)
</span><span class="lines">@@ -133,12 +133,12 @@
</span><span class="cx">         SVGStyledElement* element = static_cast&lt;SVGStyledElement*&gt;(item-&gt;element());
</span><span class="cx">         SVGElement* viewportElement = (element ? element-&gt;viewportElement() : 0);
</span><span class="cx">         if (viewportElement) {
</span><del>-            double result = primitive-&gt;getFloatValue() / 100.0;
</del><ins>+            float result = primitive-&gt;getFloatValue() / 100.0f;
</ins><span class="cx">             return SVGLength::PercentageOfViewport(result, element, LengthModeOther);
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return primitive-&gt;computeLengthFloat(const_cast&lt;RenderStyle*&gt;(item-&gt;style()));
</del><ins>+    return primitive-&gt;computeLengthDouble(const_cast&lt;RenderStyle*&gt;(item-&gt;style()));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> KCDashArray KSVGPainterFactory::dashArrayFromRenderingStyle(const RenderStyle* style)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">             if (!dash)
</span><span class="cx">                 continue;
</span><span class="cx"> 
</span><del>-            array.append((float) dash-&gt;computeLengthFloat(const_cast&lt;RenderStyle*&gt;(style)));
</del><ins>+            array.append(dash-&gt;computeLengthFloat(const_cast&lt;RenderStyle*&gt;(style)));
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>