Changeset 106868 in webkit

Timestamp:

Feb 6, 2012, 4:09:22 PM (15 years ago)

Author:

leviw@chromium.org

Message:

Call intValue on grid lengths instead of explicitly operating on floats when we only use integer precision for FrameSets.

File:

• branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (3 diffs)

branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -218 +218 @@
         // Count the number of columns/rows which are fixed -> countFixed
         if (grid[i].isFixed()) {
-            gridLayout[i] = max<float>(grid[i].value(), 0);
+            gridLayout[i] = max(grid[i].intValue(), 0);
             totalFixed += gridLayout[i];
             countFixed++;
@@ -234 +234 @@
         // Count the number of columns/rows which are relative -> countRelative
         if (grid[i].isRelative()) {
-            totalRelative += max<float>(grid[i].value(), 1);
+            totalRelative += max(grid[i].intValue(), 1);
             countRelative++;
         }            
@@ -279 +279 @@
         for (int i = 0; i < gridLen; ++i) {
             if (grid[i].isRelative()) {
-                gridLayout[i] = (max<float>(grid[i].value(), 1) * remainingRelative) / totalRelative;
+                gridLayout[i] = (max(grid[i].intValue(), 1) * remainingRelative) / totalRelative;
                 remainingLen -= gridLayout[i];
                 lastRelative = i;