Changeset 88264 in webkit

Timestamp:

Jun 7, 2011 2:06:26 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-06-07 Emil A Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

Switch ContainerNode to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=61893

Covered by existing tests.

• dom/ContainerNode.cpp: (WebCore::ContainerNode::getUpperLeftCorner): (WebCore::ContainerNode::getLowerRightCorner): (WebCore::ContainerNode::getRect): Change to use maxX/maxY instead of x+width/y+height

• platform/graphics/FloatPoint.h: (WebCore::FloatPoint::move): (WebCore::FloatPoint::moveBy): (WebCore::FloatPoint::expandedTo): Add move, moveBy and expandedTo mirroring the IntPoint implementation of the same.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (4 diffs)
• platform/graphics/FloatPoint.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-07  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch ContainerNode to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=61893
+
+        Covered by existing tests.
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::getUpperLeftCorner):
+        (WebCore::ContainerNode::getLowerRightCorner):
+        (WebCore::ContainerNode::getRect):
+        Change to use maxX/maxY instead of x+width/y+height
+        
+        * platform/graphics/FloatPoint.h:
+        (WebCore::FloatPoint::move):
+        (WebCore::FloatPoint::moveBy):
+        (WebCore::FloatPoint::expandedTo):
+        Add move, moveBy and expandedTo mirroring the IntPoint implementation of the same.
+
 2011-06-07  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -879 +879 @@
             } else if (o->isBox()) {
                 RenderBox* box = toRenderBox(o);
-                point.move(box->x(), box->y());
+                point.moveBy(box->location());
             }
             point = o->container()->localToAbsolute(point, false, true);
@@ -905 +905 @@
         RenderBox* box = toRenderBox(o);
         point = o->localToAbsolute(FloatPoint(), false, true);
-        point.move(box->width(), box->height());
+        point.move(box->size());
         return true;
     }
@@ -931 +931 @@
                 RenderText* text = toRenderText(o);
                 IntRect linesBox = text->linesBoundingBox();
-                if (!linesBox.x() && !linesBox.width() && !linesBox.y() && !linesBox.height())
+                if (!linesBox.maxX() && !linesBox.maxY())
                     continue;
-                point.move(linesBox.x() + linesBox.width(), linesBox.y() + linesBox.height());
+                point.moveBy(linesBox.maxXMaxYCorner());
             } else {
                 RenderBox* box = toRenderBox(o);
-                point.move(box->x() + box->width(), box->y() + box->height());
+                point.moveBy(box->frameRect().maxXMaxYCorner());
             }
             point = o->container()->localToAbsolute(point, false, true);
@@ -960 +960 @@
     } 
 
-    lowerRight.setX(max(upperLeft.x(), lowerRight.x()));
-    lowerRight.setY(max(upperLeft.y(), lowerRight.y()));
-    
-    return enclosingIntRect(FloatRect(upperLeft, lowerRight - upperLeft));
+    return enclosingIntRect(FloatRect(upperLeft, lowerRight.expandedTo(upperLeft) - upperLeft));
 }
 

trunk/Source/WebCore/platform/graphics/FloatPoint.h

@@ -92 +92 @@
         m_y += dy;
     }
+    void move(const IntSize& a)
+    {
+        m_x += a.width();
+        m_y += a.height();
+    }
+    void moveBy(const IntPoint& a)
+    {
+        m_x += a.x();
+        m_y += a.y();
+    }
     void scale(float sx, float sy)
     {
@@ -110 +120 @@
         return m_x * m_x + m_y * m_y;
     }
+
+    FloatPoint expandedTo(const FloatPoint& other) const
+    {
+        return FloatPoint(std::max(m_x, other.m_x), std::max(m_y, other.m_y));
+    }   
 
 #if USE(CG) || USE(SKIA_ON_MAC_CHROME)