Changeset 25174 in webkit

Timestamp:

Aug 21, 2007, 12:12:11 PM (18 years ago)

Author:

adele

Message:

Build fix for release build.

• rendering/AutoTableLayout.cpp: (WebCore::AutoTableLayout::calcEffectiveWidth): (WebCore::AutoTableLayout::layout):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/AutoTableLayout.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-21  Adele Peterson  <adele@apple.com>
+
+        Build fix for release build.
+
+        * rendering/AutoTableLayout.cpp:
+        (WebCore::AutoTableLayout::calcEffectiveWidth):
+        (WebCore::AutoTableLayout::layout):
+
 2007-08-21  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/rendering/AutoTableLayout.cpp

@@ -401 +401 @@
                 for (unsigned int pos = col; pos < lastCol && totalWidth > 0; pos++) {
                     if (!(m_layoutStruct[pos].effWidth.isPercent())) {
-                        int percent = percentMissing * static_cast<float>(m_layoutStruct[pos].effMaxWidth) / totalWidth;
+                        int percent = static_cast<int>(percentMissing * static_cast<float>(m_layoutStruct[pos].effMaxWidth) / totalWidth);
                         totalWidth -= m_layoutStruct[pos].effMaxWidth;
                         percentMissing -= percent;
@@ -658 +658 @@
             Length &width = m_layoutStruct[i].effWidth;
             if (width.isFixed()) {
-                int w = available * static_cast<float>(m_layoutStruct[i].effMaxWidth) / totalFixed;
+                int w = static_cast<int>(available * static_cast<float>(m_layoutStruct[i].effMaxWidth) / totalFixed);
                 available -= w;
                 totalFixed -= m_layoutStruct[i].effMaxWidth;