Changeset 86395 in webkit

Timestamp:

May 12, 2011 4:30:09 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-05-12 Emil A Eklund <​eae@chromium.org>

Reviewed by Darin Adler.

Convert RenderBox::setLocation, setLogicalLocation and setLogicalSize to IntPoint/IntSize
​https://bugs.webkit.org/show_bug.cgi?id=60585

Refactoring, covered by existing tests.

• rendering/RenderBox.cpp: (WebCore::RenderBox::positionLineBox):
• rendering/RenderBox.h: (WebCore::RenderBox::setLogicalLocation): (WebCore::RenderBox::setLogicalSize): (WebCore::RenderBox::setLocation):
• rendering/RenderFrameSet.cpp: (WebCore::RenderFrameSet::positionFrames): (WebCore::RenderFrameSet::positionFramesWithFlattening):
• rendering/RenderMedia.cpp: (WebCore::RenderMedia::layout):
• rendering/RenderScrollbarPart.cpp: (WebCore::RenderScrollbarPart::paintIntoRect):
• rendering/RenderTable.cpp: (WebCore::RenderTable::adjustLogicalHeightForCaption): (WebCore::RenderTable::layout):
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::layoutRows):
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::layout):
• rendering/svg/SVGRootInlineBox.cpp: (WebCore::SVGRootInlineBox::layoutRootBox):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderBox.h (modified) (3 diffs)
• rendering/RenderFrameSet.cpp (modified) (2 diffs)
• rendering/RenderMedia.cpp (modified) (1 diff)
• rendering/RenderScrollbarPart.cpp (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (2 diffs)
• rendering/RenderTableSection.cpp (modified) (2 diffs)
• rendering/RenderTextControlSingleLine.cpp (modified) (4 diffs)
• rendering/svg/SVGRootInlineBox.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-12  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Convert RenderBox::setLocation, setLogicalLocation and setLogicalSize to IntPoint/IntSize
+        https://bugs.webkit.org/show_bug.cgi?id=60585
+
+        Refactoring, covered by existing tests.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::positionLineBox):
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::setLogicalLocation):
+        (WebCore::RenderBox::setLogicalSize):
+        (WebCore::RenderBox::setLocation):
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::positionFrames):
+        (WebCore::RenderFrameSet::positionFramesWithFlattening):
+        * rendering/RenderMedia.cpp:
+        (WebCore::RenderMedia::layout):
+        * rendering/RenderScrollbarPart.cpp:
+        (WebCore::RenderScrollbarPart::paintIntoRect):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::adjustLogicalHeightForCaption):
+        (WebCore::RenderTable::layout):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layoutRows):
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::layout):
+        * rendering/svg/SVGRootInlineBox.cpp:
+        (WebCore::SVGRootInlineBox::layoutRootBox):
+
 2011-05-12  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1370 +1370 @@
         box->destroy(renderArena());
     } else if (isReplaced()) {
-        setLocation(lroundf(box->x()), lroundf(box->y()));
+        setLocation(roundedIntPoint(FloatPoint(box->x(), box->y())));
         m_inlineBoxWrapper = box;
     }

trunk/Source/WebCore/rendering/RenderBox.h

@@ -76 +76 @@
             setX(top);
     }
+    void setLogicalLocation(const IntPoint& location)
+    {
+        if (style()->isHorizontalWritingMode())
+            setLocation(location);
+        else
+            setLocation(location.transposedPoint());
+    }
     void setLogicalWidth(int size)
     {
@@ -90 +97 @@
             setWidth(size);
     }
-    void setLogicalLocation(int left, int top)
+    void setLogicalSize(const IntSize& size)
     {
         if (style()->isHorizontalWritingMode())
-            setLocation(left, top);
+            setSize(size);
         else
-            setLocation(top, left);
+            setSize(size.transposedSize());
     }
 
@@ -103 +110 @@
 
     void setLocation(const IntPoint& location) { m_frameRect.setLocation(location); }
-    void setLocation(int x, int y) { setLocation(IntPoint(x, y)); }
     
     void setSize(const IntSize& size) { m_frameRect.setSize(size); }

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -519 +519 @@
         int height = m_rows.m_sizes[r];
         for (int c = 0; c < cols; c++) {
-            child->setLocation(xPos, yPos);
+            child->setLocation(IntPoint(xPos, yPos));
             int width = m_cols.m_sizes[c];
 
@@ -616 +616 @@
             IntRect oldRect = child->frameRect();
 
-            child->setLocation(xPos, yPos);
+            child->setLocation(IntPoint(xPos, yPos));
             child->setHeight(m_rows.m_sizes[r]);
             child->setWidth(m_cols.m_sizes[c]);

trunk/Source/WebCore/rendering/RenderMedia.cpp

@@ -75 +75 @@
     LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
 
-    controlsRenderer->setLocation(borderLeft() + paddingLeft(), borderTop() + paddingTop());
+    controlsRenderer->setLocation(IntPoint(borderLeft(), borderTop()) + IntSize(paddingLeft(), paddingTop()));
     controlsRenderer->style()->setHeight(Length(newSize.height(), Fixed));
     controlsRenderer->style()->setWidth(Length(newSize.width(), Fixed));

trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp

@@ -163 +163 @@
 {
     // Make sure our dimensions match the rect.
-    setLocation(rect.x() - tx, rect.y() - ty);
+    setLocation(rect.location() - IntSize(tx, ty));
     setWidth(rect.width());
     setHeight(rect.height());

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -258 +258 @@
     IntRect captionRect(m_caption->x(), m_caption->y(), m_caption->width(), m_caption->height());
 
-    m_caption->setLogicalLocation(m_caption->marginStart(), logicalHeight());
+    m_caption->setLogicalLocation(IntPoint(m_caption->marginStart(), logicalHeight()));
     if (!selfNeedsLayout() && m_caption->checkForRepaintDuringLayout())
         m_caption->repaintDuringLayoutIfMoved(captionRect);
@@ -375 +375 @@
             movedSectionLogicalTop = min(logicalHeight(), section->logicalTop()) + (style()->isHorizontalWritingMode() ? section->minYVisualOverflow() : section->minXVisualOverflow());
         }
-        section->setLogicalLocation(sectionLogicalLeft, logicalHeight());
+        section->setLogicalLocation(IntPoint(sectionLogicalLeft, logicalHeight()));
 
         setLogicalHeight(logicalHeight() + section->logicalHeight());

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -494 +494 @@
         // Set the row's x/y position and width/height.
         if (RenderTableRow* rowRenderer = m_grid[r].rowRenderer) {
-            rowRenderer->setLocation(0, m_rowPos[r]);
+            rowRenderer->setLocation(IntPoint(0, m_rowPos[r]));
             rowRenderer->setLogicalWidth(logicalWidth());
             rowRenderer->setLogicalHeight(m_rowPos[r + 1] - m_rowPos[r] - vspacing);
@@ -608 +608 @@
             IntRect oldCellRect(cell->x(), cell->y() , cell->width(), cell->height());
 
+            IntPoint cellLocation(0, m_rowPos[rindx]);
             if (!style()->isLeftToRightDirection())
-                cell->setLogicalLocation(table()->columnPositions()[nEffCols] - table()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + hspacing, m_rowPos[rindx]);
+                cellLocation.setX(table()->columnPositions()[nEffCols] - table()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + hspacing);
             else
-                cell->setLogicalLocation(table()->columnPositions()[c] + hspacing, m_rowPos[rindx]);
+                cellLocation.setX(table()->columnPositions()[c] + hspacing);
+            cell->setLogicalLocation(cellLocation);
             view()->addLayoutDelta(IntSize(oldCellRect.x() - cell->x(), oldCellRect.y() - cell->y()));
 

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -292 +292 @@
     // Ignores the paddings for the inner spin button.
     if (RenderBox* spinBox = m_innerSpinButton ? m_innerSpinButton->renderBox() : 0) {
-        spinBox->setLocation(spinBox->x() + paddingRight(), borderTop());
+        spinBox->setLocation(IntPoint(spinBox->x() + paddingRight(), borderTop()));
         spinBox->setHeight(height() - borderTop() - borderBottom());
     }
@@ -303 +303 @@
             int x = width() - borderAndPaddingWidth() - button->width() - button->borderAndPaddingWidth();
             int y = (height() - button->height()) / 2;
-            button->setLocation(x, y);
+            button->setLocation(IntPoint(x, y));
         } else {
             int x = width() - borderRight() - paddingRight() - button->width();
@@ -315 +315 @@
                 innerTextRenderer->setX(paddingLeft() + borderLeft() + (spinBox ? spinBox->width() : 0));
             int y = (height() - button->height()) / 2;
-            button->setLocation(x, y);
+            button->setLocation(IntPoint(x, y));
         }
     }
@@ -329 +329 @@
         int y = (diff / 2) + (diff % 2);
         int x = width() - borderRight() - paddingRight() - spinBox->width();
-        spinBox->setLocation(x, y);
+        spinBox->setLocation(IntPoint(x, y));
     }
 }

trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp

@@ -177 +177 @@
     }
 
-    int xBlock = childRect.x();
-    int yBlock = childRect.y();
     int widthBlock = childRect.width();
     int heightBlock = childRect.height();
 
     // Finally, assign the root block position, now that all content is laid out.
-    parentBlock->setLocation(xBlock, yBlock);
-    parentBlock->setWidth(widthBlock);
-    parentBlock->setHeight(heightBlock);
+    parentBlock->setLocation(childRect.location());
+    parentBlock->setSize(childRect.size());
 
     // Position all children relative to the parent block.
@@ -192 +189 @@
         if (!child->renderer()->node())
             continue;
-        child->adjustPosition(-xBlock, -yBlock);
+        child->adjustPosition(-childRect.x(), -childRect.y());
     }