Changeset 86222 in webkit

Timestamp:

May 11, 2011 12:11:18 AM (13 years ago)

Author:

eae@chromium.org

Message:

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

Reviewed by Eric Seidel.

Convert RenderFlexibleBox to use IntPoint/IntSize instead of x,y/w,h pairs
​https://bugs.webkit.org/show_bug.cgi?id=60592

Refactoring, covered by existing tests.

• rendering/RenderFlexibleBox.cpp: (WebCore::RenderFlexibleBox::layoutBlock): (WebCore::RenderFlexibleBox::layoutHorizontalBox): (WebCore::RenderFlexibleBox::layoutVerticalBox): (WebCore::RenderFlexibleBox::placeChild):
• rendering/RenderFlexibleBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (10 diffs)
• rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Convert RenderFlexibleBox to use IntPoint/IntSize instead of x,y/w,h pairs
+        https://bugs.webkit.org/show_bug.cgi?id=60592
+
+        Refactoring, covered by existing tests.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock):
+        (WebCore::RenderFlexibleBox::layoutHorizontalBox):
+        (WebCore::RenderFlexibleBox::layoutVerticalBox):
+        (WebCore::RenderFlexibleBox::placeChild):
+        * rendering/RenderFlexibleBox.h:
+
 2011-05-10  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -210 +210 @@
     LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
 
-    int previousWidth = width();
-    int previousHeight = height();
+    IntSize previousSize = size();
 
     computeLogicalWidth();
@@ -218 +217 @@
     m_overflow.clear();
 
-    if (previousWidth != width() || previousHeight != height() ||
-        (parent()->isFlexibleBox() && parent()->style()->boxOrient() == HORIZONTAL &&
-         parent()->style()->boxAlign() == BSTRETCH))
+    if (previousSize != size()
+        || (parent()->isFlexibleBox() && parent()->style()->boxOrient() == HORIZONTAL
+        && parent()->style()->boxAlign() == BSTRETCH))
         relayoutChildren = true;
 
@@ -245 +244 @@
     computeLogicalHeight();
 
-    if (previousHeight != height())
+    if (previousSize.height() != height())
         relayoutChildren = true;
 
@@ -443 +442 @@
             }
 
-            placeChild(child, xPos, childY);
+            placeChild(child, IntPoint(xPos, childY));
 
             xPos += child->width() + child->marginRight();
@@ -568 +567 @@
                     --totalChildren;
 
-                    placeChild(child, child->x() + offset, child->y());
+                    placeChild(child, child->location() + IntSize(offset, 0));
                 }
             }
@@ -580 +579 @@
                     continue;
 
-                placeChild(child, child->x() + offset, child->y());
+                placeChild(child, child->location() + IntSize(offset, 0));
             }
         }
@@ -673 +672 @@
 
             // Place the child.
-            placeChild(child, childX, height());
+            placeChild(child, IntPoint(childX, height()));
             setHeight(height() + child->height() + child->marginBottom());
         }
@@ -811 +810 @@
                     remainingSpace -= (remainingSpace/totalChildren);
                     --totalChildren;
-                    placeChild(child, child->x(), child->y() + offset);
+                    placeChild(child, child->location() + IntSize(0, offset));
                 }
             }
@@ -822 +821 @@
                 if (child->isPositioned())
                     continue;
-                placeChild(child, child->x(), child->y() + offset);
+                placeChild(child, child->location() + IntSize(0, offset));
             }
         }
@@ -935 +934 @@
 }
 
-void RenderFlexibleBox::placeChild(RenderBox* child, int x, int y)
-{
-    IntRect oldRect(child->x(), child->y() , child->width(), child->height());
+void RenderFlexibleBox::placeChild(RenderBox* child, IntPoint location)
+{
+    IntRect oldRect = child->frameRect();
 
     // Place the child.
-    child->setLocation(x, y);
+    child->setLocation(location);
 
     // If the child moved, we have to repaint it as well as any floating/positioned

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -51 +51 @@
     virtual bool isStretchingChildren() const { return m_stretchingChildren; }
 
-    void placeChild(RenderBox* child, int x, int y);
+    void placeChild(RenderBox* child, IntPoint location);
 
 protected: