Changeset 90302 in webkit

Timestamp:

Jul 1, 2011 5:16:52 PM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-07-01 Levi Weintraub <​leviw@chromium.org>

Switch primary virtual layout functions to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=63852

Reviewed by Eric Seidel.

Switching the primary overloaded layout functions over to the new layout unit abstraction.

No new tests, no functionality changes.

• html/shadow/MediaControlElements.cpp: (WebCore::RenderMediaVolumeSliderContainer::layout):
• page/FrameView.cpp: (WebCore::FrameView::layout):
• rendering/AutoTableLayout.cpp: (WebCore::AutoTableLayout::layout):
• rendering/FixedTableLayout.cpp: (WebCore::FixedTableLayout::layout):
• rendering/RenderBox.cpp: (WebCore::RenderBox::layout):
• rendering/RenderFrameSet.cpp: (WebCore::RenderFrameSet::layout):
• rendering/RenderMedia.cpp: (WebCore::RenderMedia::layout):
• rendering/RenderRubyRun.cpp: (WebCore::RenderRubyRun::layout):
• rendering/RenderScrollbarPart.cpp: (WebCore::RenderScrollbarPart::layout):
• rendering/RenderSlider.cpp: (WebCore::RenderSlider::layout):
• rendering/RenderTable.cpp: (WebCore::RenderTable::layout):
• rendering/RenderTableRow.cpp: (WebCore::RenderTableRow::layout):
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::layout):
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::layout):
• rendering/RenderView.cpp: (WebCore::RenderView::layout):
• rendering/RenderView.h: (WebCore::RenderView::layoutDelta): (WebCore::RenderView::addLayoutDelta):
• rendering/mathml/RenderMathMLRoot.cpp: (WebCore::RenderMathMLRoot::layout):
• rendering/mathml/RenderMathMLRow.cpp: (WebCore::RenderMathMLRow::layout):
• rendering/mathml/RenderMathMLSquareRoot.cpp: (WebCore::RenderMathMLSquareRoot::layout):
• rendering/mathml/RenderMathMLSubSup.cpp: (WebCore::RenderMathMLSubSup::layout):
• rendering/mathml/RenderMathMLUnderOver.cpp: (WebCore::RenderMathMLUnderOver::layout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/MediaControlElements.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (3 diffs)
• rendering/AutoTableLayout.cpp (modified) (18 diffs)
• rendering/FixedTableLayout.cpp (modified) (5 diffs)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderFrameSet.cpp (modified) (3 diffs)
• rendering/RenderMedia.cpp (modified) (3 diffs)
• rendering/RenderRubyRun.cpp (modified) (3 diffs)
• rendering/RenderScrollbarPart.cpp (modified) (1 diff)
• rendering/RenderSlider.cpp (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (9 diffs)
• rendering/RenderTableRow.cpp (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (1 diff)
• rendering/RenderTextControlSingleLine.cpp (modified) (5 diffs)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)
• rendering/mathml/RenderMathMLRoot.cpp (modified) (4 diffs)
• rendering/mathml/RenderMathMLRow.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLSquareRoot.cpp (modified) (2 diffs)
• rendering/mathml/RenderMathMLSubSup.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLUnderOver.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-01  Levi Weintraub  <leviw@chromium.org>
+
+        Switch primary virtual layout functions to new layout types
+        https://bugs.webkit.org/show_bug.cgi?id=63852
+
+        Reviewed by Eric Seidel.
+
+        Switching the primary overloaded layout functions over to the new layout unit abstraction.
+
+        No new tests, no functionality changes.
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::RenderMediaVolumeSliderContainer::layout):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+        * rendering/AutoTableLayout.cpp:
+        (WebCore::AutoTableLayout::layout):
+        * rendering/FixedTableLayout.cpp:
+        (WebCore::FixedTableLayout::layout):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::layout):
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::layout):
+        * rendering/RenderMedia.cpp:
+        (WebCore::RenderMedia::layout):
+        * rendering/RenderRubyRun.cpp:
+        (WebCore::RenderRubyRun::layout):
+        * rendering/RenderScrollbarPart.cpp:
+        (WebCore::RenderScrollbarPart::layout):
+        * rendering/RenderSlider.cpp:
+        (WebCore::RenderSlider::layout):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::layout):
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::layout):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layout):
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::layout):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::layout):
+        * rendering/RenderView.h:
+        (WebCore::RenderView::layoutDelta):
+        (WebCore::RenderView::addLayoutDelta):
+        * rendering/mathml/RenderMathMLRoot.cpp:
+        (WebCore::RenderMathMLRoot::layout):
+        * rendering/mathml/RenderMathMLRow.cpp:
+        (WebCore::RenderMathMLRow::layout):
+        * rendering/mathml/RenderMathMLSquareRoot.cpp:
+        (WebCore::RenderMathMLSquareRoot::layout):
+        * rendering/mathml/RenderMathMLSubSup.cpp:
+        (WebCore::RenderMathMLSubSup::layout):
+        * rendering/mathml/RenderMathMLUnderOver.cpp:
+        (WebCore::RenderMathMLUnderOver::layout):
+
 2011-07-01  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

@@ -275 +275 @@
     LayoutStateDisabler layoutStateDisabler(view());
 
-    IntPoint offset = theme()->volumeSliderOffsetFromMuteButton(buttonBox, IntSize(width(), height()));
+    LayoutPoint offset = theme()->volumeSliderOffsetFromMuteButton(buttonBox, size());
     setX(offset.x() + buttonBox->offsetLeft());
     setY(offset.y() + buttonBox->offsetTop());

trunk/Source/WebCore/page/FrameView.cpp

@@ -969 +969 @@
                 m_firstLayout = false;
                 m_firstLayoutCallbackPending = true;
-                m_lastLayoutSize = IntSize(width(), height());
+                m_lastLayoutSize = LayoutSize(width(), height());
                 m_lastZoomFactor = root->style()->zoom();
 
@@ -985 +985 @@
         }
 
-        IntSize oldSize = m_size;
-
-        m_size = IntSize(layoutWidth(), layoutHeight());
+        LayoutSize oldSize = m_size;
+
+        m_size = LayoutSize(layoutWidth(), layoutHeight());
 
         if (oldSize != m_size) {
@@ -1033 +1033 @@
     // Now update the positions of all layers.
     beginDeferredRepaints();
-    IntPoint cachedOffset;
+    LayoutPoint cachedOffset;
     if (m_doFullRepaint)
         root->view()->repaint(); // FIXME: This isn't really right, since the RenderView doesn't fully encompass the visibleContentRect(). It just happens

trunk/Source/WebCore/rendering/AutoTableLayout.cpp

@@ -478 +478 @@
 {
     // table layout based on the values collected in the layout structure.
-    int tableLogicalWidth = m_table->logicalWidth() - m_table->bordersPaddingAndSpacingInRowDirection();
-    int available = tableLogicalWidth;
+    LayoutUnit tableLogicalWidth = m_table->logicalWidth() - m_table->bordersPaddingAndSpacingInRowDirection();
+    LayoutUnit available = tableLogicalWidth;
     size_t nEffCols = m_table->numEffCols();
 
@@ -502 +502 @@
     // fill up every cell with its minWidth
     for (size_t i = 0; i < nEffCols; ++i) {
-        int cellLogicalWidth = m_layoutStruct[i].effectiveMinLogicalWidth;
+        LayoutUnit cellLogicalWidth = m_layoutStruct[i].effectiveMinLogicalWidth;
         m_layoutStruct[i].computedLogicalWidth = cellLogicalWidth;
         available -= cellLogicalWidth;
@@ -538 +538 @@
             Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
             if (logicalWidth.isPercent()) {
-                int cellLogicalWidth = max(m_layoutStruct[i].effectiveMinLogicalWidth, logicalWidth.calcMinValue(tableLogicalWidth));
+                LayoutUnit cellLogicalWidth = max(m_layoutStruct[i].effectiveMinLogicalWidth, logicalWidth.calcMinValue(tableLogicalWidth));
                 available += m_layoutStruct[i].computedLogicalWidth - cellLogicalWidth;
                 m_layoutStruct[i].computedLogicalWidth = cellLogicalWidth;
@@ -545 +545 @@
         if (totalPercent > 100) {
             // remove overallocated space from the last columns
-            int excess = tableLogicalWidth * (totalPercent - 100) / 100;
+            LayoutUnit excess = tableLogicalWidth * (totalPercent - 100) / 100;
             for (int i = nEffCols - 1; i >= 0; --i) {
                 if (m_layoutStruct[i].effectiveLogicalWidth.isPercent()) {
-                    int cellLogicalWidth = m_layoutStruct[i].computedLogicalWidth;
-                    int reduction = min(cellLogicalWidth,  excess);
+                    LayoutUnit cellLogicalWidth = m_layoutStruct[i].computedLogicalWidth;
+                    LayoutUnit reduction = min(cellLogicalWidth,  excess);
                     // the lines below might look inconsistent, but that's the way it's handled in mozilla
                     excess -= reduction;
-                    int newLogicalWidth = max(m_layoutStruct[i].effectiveMinLogicalWidth, cellLogicalWidth - reduction);
+                    LayoutUnit newLogicalWidth = max(m_layoutStruct[i].effectiveMinLogicalWidth, cellLogicalWidth - reduction);
                     available += cellLogicalWidth - newLogicalWidth;
                     m_layoutStruct[i].computedLogicalWidth = newLogicalWidth;
@@ -577 +577 @@
             if (logicalWidth.isRelative() && logicalWidth.value() != 0) {
                 // width=0* gets effMinWidth.
-                int cellLogicalWidth = logicalWidth.value() * tableLogicalWidth / totalRelative;
+                LayoutUnit cellLogicalWidth = logicalWidth.value() * tableLogicalWidth / totalRelative;
                 available += m_layoutStruct[i].computedLogicalWidth - cellLogicalWidth;
                 m_layoutStruct[i].computedLogicalWidth = cellLogicalWidth;
@@ -590 +590 @@
             Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
             if (logicalWidth.isAuto() && totalAuto && !m_layoutStruct[i].emptyCellsOnly) {
-                int cellLogicalWidth = max(m_layoutStruct[i].computedLogicalWidth, static_cast<int>(available * static_cast<float>(m_layoutStruct[i].effectiveMaxLogicalWidth) / totalAuto));
+                LayoutUnit cellLogicalWidth = max(m_layoutStruct[i].computedLogicalWidth, static_cast<LayoutUnit>(available * static_cast<float>(m_layoutStruct[i].effectiveMaxLogicalWidth) / totalAuto));
                 available -= cellLogicalWidth;
                 totalAuto -= m_layoutStruct[i].effectiveMaxLogicalWidth;
@@ -603 +603 @@
             Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
             if (logicalWidth.isFixed()) {
-                int cellLogicalWidth = static_cast<int>(available * static_cast<float>(m_layoutStruct[i].effectiveMaxLogicalWidth) / totalFixed);
+                LayoutUnit cellLogicalWidth = static_cast<LayoutUnit>(available * static_cast<float>(m_layoutStruct[i].effectiveMaxLogicalWidth) / totalFixed);
                 available -= cellLogicalWidth;
                 totalFixed -= m_layoutStruct[i].effectiveMaxLogicalWidth;
@@ -616 +616 @@
             Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
             if (logicalWidth.isPercent()) {
-                int cellLogicalWidth = available * logicalWidth.percent() / totalPercent;
+                LayoutUnit cellLogicalWidth = available * logicalWidth.percent() / totalPercent;
                 available -= cellLogicalWidth;
                 totalPercent -= logicalWidth.percent();
@@ -634 +634 @@
             if (m_layoutStruct[i].effectiveLogicalWidth.isAuto() && m_layoutStruct[i].emptyCellsOnly)
                 continue;
-            int cellLogicalWidth = available / total;
+            LayoutUnit cellLogicalWidth = available / total;
             available -= cellLogicalWidth;
             total--;
@@ -651 +651 @@
         // This is basically the reverse of how we grew the cells.
         if (available < 0) {
-            int logicalWidthBeyondMin = 0;
+            LayoutUnit logicalWidthBeyondMin = 0;
             for (int i = nEffCols - 1; i >= 0; --i) {
                 Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
@@ -661 +661 @@
                 Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
                 if (logicalWidth.isAuto()) {
-                    int minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
-                    int reduce = available * minMaxDiff / logicalWidthBeyondMin;
+                    LayoutUnit minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
+                    LayoutUnit reduce = available * minMaxDiff / logicalWidthBeyondMin;
                     m_layoutStruct[i].computedLogicalWidth += reduce;
                     available -= reduce;
@@ -673 +673 @@
 
         if (available < 0) {
-            int logicalWidthBeyondMin = 0;
+            LayoutUnit logicalWidthBeyondMin = 0;
             for (int i = nEffCols - 1; i >= 0; --i) {
                 Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
@@ -683 +683 @@
                 Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
                 if (logicalWidth.isRelative()) {
-                    int minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
-                    int reduce = available * minMaxDiff / logicalWidthBeyondMin;
+                    LayoutUnit minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
+                    LayoutUnit reduce = available * minMaxDiff / logicalWidthBeyondMin;
                     m_layoutStruct[i].computedLogicalWidth += reduce;
                     available -= reduce;
@@ -695 +695 @@
 
         if (available < 0) {
-            int logicalWidthBeyondMin = 0;
+            LayoutUnit logicalWidthBeyondMin = 0;
             for (int i = nEffCols - 1; i >= 0; --i) {
                 Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
@@ -705 +705 @@
                 Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
                 if (logicalWidth.isFixed()) {
-                    int minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
-                    int reduce = available * minMaxDiff / logicalWidthBeyondMin;
+                    LayoutUnit minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
+                    LayoutUnit reduce = available * minMaxDiff / logicalWidthBeyondMin;
                     m_layoutStruct[i].computedLogicalWidth += reduce;
                     available -= reduce;
@@ -717 +717 @@
 
         if (available < 0) {
-            int logicalWidthBeyondMin = 0;
+            LayoutUnit logicalWidthBeyondMin = 0;
             for (int i = nEffCols - 1; i >= 0; --i) {
                 Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
@@ -727 +727 @@
                 Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
                 if (logicalWidth.isPercent()) {
-                    int minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
-                    int reduce = available * minMaxDiff / logicalWidthBeyondMin;
+                    LayoutUnit minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
+                    LayoutUnit reduce = available * minMaxDiff / logicalWidthBeyondMin;
                     m_layoutStruct[i].computedLogicalWidth += reduce;
                     available -= reduce;
@@ -739 +739 @@
     }
 
-    int pos = 0;
+    LayoutUnit pos = 0;
     for (size_t i = 0; i < nEffCols; ++i) {
         m_table->columnPositions()[i] = pos;

trunk/Source/WebCore/rendering/FixedTableLayout.cpp

@@ -229 +229 @@
 void FixedTableLayout::layout()
 {
-    int tableLogicalWidth = m_table->logicalWidth() - m_table->bordersPaddingAndSpacingInRowDirection();
+    LayoutUnit tableLogicalWidth = m_table->logicalWidth() - m_table->bordersPaddingAndSpacingInRowDirection();
     int nEffCols = m_table->numEffCols();
     Vector<int> calcWidth(nEffCols, 0);
 
     int numAuto = 0;
-    int autoSpan = 0;
-    int totalFixedWidth = 0;
-    int totalPercentWidth = 0;
+    LayoutUnit autoSpan = 0;
+    LayoutUnit totalFixedWidth = 0;
+    LayoutUnit totalPercentWidth = 0;
     float totalPercent = 0;
 
@@ -257 +257 @@
     }
 
-    int hspacing = m_table->hBorderSpacing();
-    int totalWidth = totalFixedWidth + totalPercentWidth;
+    LayoutUnit hspacing = m_table->hBorderSpacing();
+    LayoutUnit totalWidth = totalFixedWidth + totalPercentWidth;
     if (!numAuto || totalWidth > tableLogicalWidth) {
         // If there are no auto columns, or if the total is too wide, take
@@ -286 +286 @@
     } else {
         // Divide the remaining width among the auto columns.
-        int remainingWidth = tableLogicalWidth - totalFixedWidth - totalPercentWidth - hspacing * (autoSpan - numAuto);
+        LayoutUnit remainingWidth = tableLogicalWidth - totalFixedWidth - totalPercentWidth - hspacing * (autoSpan - numAuto);
         int lastAuto = 0;
         for (int i = 0; i < nEffCols; i++) {
             if (m_width[i].isAuto()) {
-                int span = m_table->spanOfEffCol(i);
-                int w = remainingWidth * span / autoSpan;
+                LayoutUnit span = m_table->spanOfEffCol(i);
+                LayoutUnit w = remainingWidth * span / autoSpan;
                 calcWidth[i] = w + hspacing * (span - 1);
                 remainingWidth -= w;
@@ -309 +309 @@
     if (totalWidth < tableLogicalWidth) {
         // Spread extra space over columns.
-        int remainingWidth = tableLogicalWidth - totalWidth;
+        LayoutUnit remainingWidth = tableLogicalWidth - totalWidth;
         int total = nEffCols;
         while (total) {
-            int w = remainingWidth / total;
+            LayoutUnit w = remainingWidth / total;
             remainingWidth -= w;
             calcWidth[--total] += w;
@@ -320 +320 @@
     }
     
-    int pos = 0;
+    LayoutUnit pos = 0;
     for (int i = 0; i < nEffCols; i++) {
         m_table->columnPositions()[i] = pos;
         pos += calcWidth[i] + hspacing;
     }
-    int colPositionsSize = m_table->columnPositions().size();
+    LayoutUnit colPositionsSize = m_table->columnPositions().size();
     if (colPositionsSize > 0)
         m_table->columnPositions()[colPositionsSize - 1] = pos;

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -392 +392 @@
     }
 
-    LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), style()->isFlippedBlocksWritingMode());
+    LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->isFlippedBlocksWritingMode());
     while (child) {
         child->layoutIfNeeded();

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -462 +462 @@
 
     bool doFullRepaint = selfNeedsLayout() && checkForRepaintDuringLayout();
-    IntRect oldBounds;
+    LayoutRect oldBounds;
     if (doFullRepaint)
         oldBounds = absoluteClippedOverflowRect();
@@ -479 +479 @@
     }
 
-    int borderThickness = frameSet()->border();
+    LayoutUnit borderThickness = frameSet()->border();
     layOutAxis(m_rows, frameSet()->rowLengths(), height() - (rows - 1) * borderThickness);
     layOutAxis(m_cols, frameSet()->colLengths(), width() - (cols - 1) * borderThickness);
@@ -494 +494 @@
     if (doFullRepaint) {
         view()->repaintViewRectangle(oldBounds);
-        IntRect newBounds = absoluteClippedOverflowRect();
+        LayoutRect newBounds = absoluteClippedOverflowRect();
         if (newBounds != oldBounds)
             view()->repaintViewRectangle(newBounds);

trunk/Source/WebCore/rendering/RenderMedia.cpp

@@ -58 +58 @@
 void RenderMedia::layout()
 {
-    IntSize oldSize = contentBoxRect().size();
+    LayoutSize oldSize = contentBoxRect().size();
 
     RenderImage::layout();
@@ -66 +66 @@
         return;
 
-    IntSize newSize = contentBoxRect().size();
+    LayoutSize newSize = contentBoxRect().size();
     if (newSize == oldSize && !controlsRenderer->needsLayout())
         return;
@@ -73 +73 @@
     // instantiate LayoutStateDisabler. Since using a LayoutStateMaintainer is slightly more efficient,
     // and this method will be called many times per second during playback, use a LayoutStateMaintainer:
-    LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
+    LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
 
-    controlsRenderer->setLocation(IntPoint(borderLeft(), borderTop()) + IntSize(paddingLeft(), paddingTop()));
+    controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(paddingLeft(), paddingTop()));
     controlsRenderer->style()->setHeight(Length(newSize.height(), Fixed));
     controlsRenderer->style()->setWidth(Length(newSize.width(), Fixed));

trunk/Source/WebCore/rendering/RenderRubyRun.cpp

@@ -233 +233 @@
         return;
     
-    int lastLineRubyTextBottom = rt->logicalHeight();
-    int firstLineRubyTextTop = 0;
+    LayoutUnit lastLineRubyTextBottom = rt->logicalHeight();
+    LayoutUnit firstLineRubyTextTop = 0;
     RootInlineBox* rootBox = rt->lastRootBox();
     if (rootBox) {
@@ -243 +243 @@
 
     if (!style()->isFlippedLinesWritingMode()) {
-        int firstLineTop = 0;
+        LayoutUnit firstLineTop = 0;
         if (RenderRubyBase* rb = rubyBase()) {
             RootInlineBox* rootBox = rb->firstRootBox();
@@ -253 +253 @@
         rt->setLogicalTop(-lastLineRubyTextBottom + firstLineTop);
     } else {
-        int lastLineBottom = logicalHeight();
+        LayoutUnit lastLineBottom = logicalHeight();
         if (RenderRubyBase* rb = rubyBase()) {
             RootInlineBox* rootBox = rb->lastRootBox();

trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp

@@ -49 +49 @@
 void RenderScrollbarPart::layout()
 {
-    setLocation(IntPoint()); // We don't worry about positioning ourselves.  We're just determining our minimum width/height.
+    setLocation(LayoutPoint()); // We don't worry about positioning ourselves. We're just determining our minimum width/height.
     if (m_scrollbar->orientation() == HorizontalScrollbar)
         layoutHorizontalPart();

trunk/Source/WebCore/rendering/RenderSlider.cpp

@@ -102 +102 @@
     if (!thumbBox)
         return;
-    int heightDiff = thumbBox->height() - contentHeight();
+    LayoutUnit heightDiff = thumbBox->height() - contentHeight();
     if (heightDiff > 0)
         thumbBox->setY(thumbBox->y() - (heightDiff / 2));

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -275 +275 @@
         
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
-    LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), style()->isFlippedBlocksWritingMode());
+    LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->isFlippedBlocksWritingMode());
 
     setLogicalHeight(0);
@@ -282 +282 @@
     initMaxMarginValues();
     
-    int oldLogicalWidth = logicalWidth();
+    LayoutUnit oldLogicalWidth = logicalWidth();
     computeLogicalWidth();
 
@@ -297 +297 @@
     setCellLogicalWidths();
 
-    int totalSectionLogicalHeight = 0;
-    int oldTableLogicalTop = m_caption ? m_caption->logicalHeight() + m_caption->marginBefore() + m_caption->marginAfter() : 0;
+    LayoutUnit totalSectionLogicalHeight = 0;
+    LayoutUnit oldTableLogicalTop = m_caption ? m_caption->logicalHeight() + m_caption->marginBefore() + m_caption->marginAfter() : 0;
 
     bool collapsing = collapseBorders();
@@ -324 +324 @@
     // did not shift).
     bool sectionMoved = false;
-    int movedSectionLogicalTop = 0;
+    LayoutUnit movedSectionLogicalTop = 0;
 
     // FIXME: Collapse caption margin.
@@ -335 +335 @@
     }
 
-    int borderAndPaddingBefore = borderBefore() + (collapsing ? 0 : paddingBefore());
-    int borderAndPaddingAfter = borderAfter() + (collapsing ? 0 : paddingAfter());
+    LayoutUnit borderAndPaddingBefore = borderBefore() + (collapsing ? 0 : paddingBefore());
+    LayoutUnit borderAndPaddingAfter = borderAfter() + (collapsing ? 0 : paddingAfter());
 
     setLogicalHeight(logicalHeight() + borderAndPaddingBefore);
@@ -344 +344 @@
 
     Length logicalHeightLength = style()->logicalHeight();
-    int computedLogicalHeight = 0;
+    LayoutUnit computedLogicalHeight = 0;
     if (logicalHeightLength.isFixed()) {
         // Tables size as though CSS height includes border/padding.
@@ -364 +364 @@
     }
 
-    int sectionLogicalLeft = style()->isLeftToRightDirection() ? borderStart() : borderEnd();
+    LayoutUnit sectionLogicalLeft = style()->isLeftToRightDirection() ? borderStart() : borderEnd();
     if (!collapsing)
         sectionLogicalLeft += style()->isLeftToRightDirection() ? paddingStart() : paddingEnd();
@@ -375 +375 @@
             movedSectionLogicalTop = min(logicalHeight(), section->logicalTop()) + (style()->isHorizontalWritingMode() ? section->minYVisualOverflow() : section->minXVisualOverflow());
         }
-        section->setLogicalLocation(IntPoint(sectionLogicalLeft, logicalHeight()));
+        section->setLogicalLocation(LayoutPoint(sectionLogicalLeft, logicalHeight()));
 
         setLogicalHeight(logicalHeight() + section->logicalHeight());
@@ -406 +406 @@
     if (!didFullRepaint && sectionMoved) {
         if (style()->isHorizontalWritingMode())
-            repaintRectangle(IntRect(minXVisualOverflow(), movedSectionLogicalTop, maxXVisualOverflow() - minXVisualOverflow(), maxYVisualOverflow() - movedSectionLogicalTop));
+            repaintRectangle(LayoutRect(minXVisualOverflow(), movedSectionLogicalTop, maxXVisualOverflow() - minXVisualOverflow(), maxYVisualOverflow() - movedSectionLogicalTop));
         else
-            repaintRectangle(IntRect(movedSectionLogicalTop, minYVisualOverflow(), maxXVisualOverflow() - movedSectionLogicalTop, maxYVisualOverflow() - minYVisualOverflow()));
+            repaintRectangle(LayoutRect(movedSectionLogicalTop, minYVisualOverflow(), maxXVisualOverflow() - movedSectionLogicalTop, maxYVisualOverflow() - minYVisualOverflow()));
     }
 

trunk/Source/WebCore/rendering/RenderTableRow.cpp

@@ -136 +136 @@
 
     // Table rows do not add translation.
-    LayoutStateMaintainer statePusher(view(), this, IntSize(), style()->isFlippedBlocksWritingMode());
+    LayoutStateMaintainer statePusher(view(), this, LayoutSize(), style()->isFlippedBlocksWritingMode());
 
     bool paginated = view()->layoutState()->isPaginated();

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -398 +398 @@
     ASSERT(needsLayout());
 
-    LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), style()->isFlippedBlocksWritingMode());
+    LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->isFlippedBlocksWritingMode());
     for (RenderObject* child = children()->firstChild(); child; child = child->nextSibling()) {
         if (child->isTableRow()) {

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -270 +270 @@
     // because of compability.
 
-    int oldHeight = height();
+    LayoutUnit oldHeight = height();
     computeLogicalHeight();
 
-    int oldWidth = width();
+    LayoutUnit oldWidth = width();
     computeLogicalWidth();
 
@@ -285 +285 @@
 
     // Set the text block height
-    int desiredHeight = textBlockHeight();
-    int currentHeight = innerTextRenderer->height();
-
-    int heightLimit = (inputElement()->isSearchField() || !container) ? height() : contentHeight();
+    LayoutUnit desiredHeight = textBlockHeight();
+    LayoutUnit currentHeight = innerTextRenderer->height();
+
+    LayoutUnit heightLimit = (inputElement()->isSearchField() || !container) ? height() : contentHeight();
     if (currentHeight > heightLimit) {
         if (desiredHeight != currentHeight)
@@ -299 +299 @@
     if (containerRenderer) {
         containerRenderer->layoutIfNeeded();
-        int containerHeight = containerRenderer->height();
+        LayoutUnit containerHeight = containerRenderer->height();
         if (containerHeight > heightLimit) {
             containerRenderer->style()->setHeight(Length(heightLimit, Fixed));
@@ -314 +314 @@
     currentHeight = innerTextRenderer->height();
     if (!container && currentHeight != contentHeight()) {
-        int heightDiff = currentHeight - contentHeight();
+        LayoutUnit heightDiff = currentHeight - contentHeight();
         innerTextRenderer->setY(innerTextRenderer->y() - (heightDiff / 2 + heightDiff % 2));
     } else if (inputElement()->isSearchField() && containerRenderer && containerRenderer->height() > contentHeight()) {
         // A quirk for find-in-page box on Safari Windows.
         // http://webkit.org/b/63157
-        int heightDiff = containerRenderer->height() - contentHeight();
+        LayoutUnit heightDiff = containerRenderer->height() - contentHeight();
         containerRenderer->setY(containerRenderer->y() - (heightDiff / 2 + heightDiff % 2));
     }
@@ -326 +326 @@
     if (RenderBox* innerSpinBox = innerSpinButtonElement() ? innerSpinButtonElement()->renderBox() : 0) {
         RenderBox* parentBox = innerSpinBox->parentBox();
-        innerSpinBox->setLocation(IntPoint(parentBox->width() - innerSpinBox->width() + paddingRight(), -paddingTop()));
+        innerSpinBox->setLocation(LayoutPoint(parentBox->width() - innerSpinBox->width() + paddingRight(), -paddingTop()));
         innerSpinBox->setHeight(height() - borderTop() - borderBottom());
     }

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -130 +130 @@
         RenderBlock::layout();
 
-    ASSERT(layoutDelta() == IntSize());
+    ASSERT(layoutDelta() == LayoutSize());
     ASSERT(m_layoutStateDisableCount == 0);
     ASSERT(m_layoutState == &state);

trunk/Source/WebCore/rendering/RenderView.h

@@ -104 +104 @@
     // last layout location, in order to repaint correctly.
     // If we're doing a full repaint m_layoutState will be 0, but in that case layoutDelta doesn't matter.
-    IntSize layoutDelta() const
-    {
-        return m_layoutState ? m_layoutState->m_layoutDelta : IntSize();
-    }
-    void addLayoutDelta(const IntSize& delta) 
+    LayoutSize layoutDelta() const
+    {
+        return m_layoutState ? m_layoutState->m_layoutDelta : LayoutSize();
+    }
+    void addLayoutDelta(const LayoutSize& delta) 
     {
         if (m_layoutState)

trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp

@@ -200 +200 @@
         return;
 
-    int maxHeight = toRenderBoxModelObject(lastChild())->offsetHeight();
+    LayoutUnit maxHeight = toRenderBoxModelObject(lastChild())->offsetHeight();
     
     RenderObject* current = lastChild()->firstChild();
@@ -210 +210 @@
     
     // Base height above which the shape of the root changes
-    int thresholdHeight = static_cast<int>(gThresholdBaseHeight * style()->fontSize());
-    int topStartShift = 0;
+    LayoutUnit thresholdHeight = static_cast<LayoutUnit>(gThresholdBaseHeight * style()->fontSize());
+    LayoutUnit topStartShift = 0;
     
     if (maxHeight > thresholdHeight && thresholdHeight) {
@@ -217 +217 @@
         if (shift > 1.)
             shift = 1.0f;
-        int frontWidth = static_cast<int>(style()->fontSize() * gRadicalWidth);
-        topStartShift = static_cast<int>(gRadicalBottomPointXPos * frontWidth * shift);
+        LayoutUnit frontWidth = static_cast<LayoutUnit>(style()->fontSize() * gRadicalWidth);
+        topStartShift = static_cast<LayoutUnit>(gRadicalBottomPointXPos * frontWidth * shift);
         
-        style()->setPaddingBottom(Length(static_cast<int>(gRootBottomPadding * style()->fontSize()), Fixed));
+        style()->setPaddingBottom(Length(static_cast<LayoutUnit>(gRootBottomPadding * style()->fontSize()), Fixed));
     }
     
@@ -231 +231 @@
         return;
     
-    int indexShift = indexBox->offsetWidth() + topStartShift;
-    int radicalHeight = static_cast<int>((1 - gRadicalTopLeftPointYPos) * maxHeight);
-    int rootMarginTop = radicalHeight + style()->paddingBottom().value() + indexBox->offsetHeight() - (maxHeight + static_cast<int>(gRootPadding * style()->fontSize()));
+    LayoutUnit indexShift = indexBox->offsetWidth() + topStartShift;
+    LayoutUnit radicalHeight = static_cast<LayoutUnit>((1 - gRadicalTopLeftPointYPos) * maxHeight);
+    LayoutUnit rootMarginTop = radicalHeight + style()->paddingBottom().value() + indexBox->offsetHeight() - (maxHeight + static_cast<LayoutUnit>(gRootPadding * style()->fontSize()));
     
     style()->setPaddingLeft(Length(indexShift, Fixed));
     if (rootMarginTop > 0)
-        style()->setPaddingTop(Length(rootMarginTop + static_cast<int>(gRootPadding * style()->fontSize()), Fixed));
+        style()->setPaddingTop(Length(rootMarginTop + static_cast<LayoutUnit>(gRootPadding * style()->fontSize()), Fixed));
     
     setNeedsLayout(true);

trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp

@@ -67 +67 @@
     RenderBlock::layout();
     
-    int maxHeight = 0;
+    LayoutUnit maxHeight = 0;
     int childCount = 0;
     int operatorCount = 0;
 
     // Calculate the non-operator max height of the row.
-    int operatorHeight = 0;
+    LayoutUnit operatorHeight = 0;
     for (RenderObject* current = firstChild(); current; current = current->nextSibling()) {
         childCount++;

trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp

@@ -161 +161 @@
 void RenderMathMLSquareRoot::layout()
 {
-    int maxHeight = 0;
+    LayoutUnit maxHeight = 0;
     
     RenderObject* current = firstChild();
@@ -180 +180 @@
 
     
-    if (maxHeight > static_cast<int>(gThresholdBaseHeight * style()->fontSize()))
-        style()->setPaddingBottom(Length(static_cast<int>(gRootBottomPadding * style()->fontSize()), Fixed));
+    if (maxHeight > static_cast<LayoutUnit>(gThresholdBaseHeight * style()->fontSize()))
+        style()->setPaddingBottom(Length(static_cast<LayoutUnit>(gRootBottomPadding * style()->fontSize()), Fixed));
 
     

trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.cpp

@@ -163 +163 @@
     if (m_kind == SubSup) {
         if (RenderObject* base = firstChild()) {
-            int maxHeight = 0;
+            LayoutUnit maxHeight = 0;
             RenderObject* current = base->firstChild();
             while (current) {
-                int height = getBoxModelObjectHeight(current);
+                LayoutUnit height = getBoxModelObjectHeight(current);
                 if (height > maxHeight)
                     maxHeight = height;
                 current = current->nextSibling();
             }
-            int heightDiff = m_scripts ? (m_scripts->offsetHeight() - maxHeight) / 2 : 0;
+            LayoutUnit heightDiff = m_scripts ? (m_scripts->offsetHeight() - maxHeight) / 2 : 0;
             if (heightDiff < 0) 
                 heightDiff = 0;

trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp

@@ -160 +160 @@
                 break;
             
-            int overSpacing = static_cast<int>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine)));
+            LayoutUnit overSpacing = static_cast<LayoutUnit>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine)));
             
             // base row wrapper
@@ -182 +182 @@
         base = firstChild();
         if (base) {
-            int baseHeight = getOffsetHeight(base);
+            LayoutUnit baseHeight = getOffsetHeight(base);
             // actual base
             base = base->firstChild();
@@ -190 +190 @@
             // FIXME: We need to look at the space between a single maximum height of
             //        the line boxes and the baseline and squeeze them together
-            int underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine);
+            LayoutUnit underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine);
             
             // adjust the base's intrusion into the under
@@ -211 +211 @@
             if (!over->firstChild() || !over->firstChild()->isBoxModelObject())
                 break;
-            int overSpacing = static_cast<int>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine)));
+            LayoutUnit overSpacing = static_cast<LayoutUnit>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine)));
             
             // base row wrapper
@@ -223 +223 @@
                 // adjust the placement of the under block.
                 
-                int baseHeight = getOffsetHeight(base);
+                LayoutUnit baseHeight = getOffsetHeight(base);
                 // actual base
                 base = base->firstChild();
@@ -231 +231 @@
                 // FIXME: We need to look at the space between a single maximum height of
                 //        the line boxes and the baseline and squeeze them together
-                int underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine);
+                LayoutUnit underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine);
                 
                 RenderObject* under = lastChild();