Changeset 112170 in webkit

Timestamp:

Mar 26, 2012 4:35:04 PM (12 years ago)

Author:

leviw@chromium.org

Message:

Update LayoutUnit usage in ContainerNode, Element, and ElementRareData
​https://bugs.webkit.org/show_bug.cgi?id=82219

Reviewed by Eric Seidel.

No new tests. No change in behavior.

• dom/ContainerNode.cpp:

(WebCore::ContainerNode::getLowerRightCorner): linesBoundingBox returns the enclosing IntRect
of the contained lines. Inline's aren't bounded in LayoutUnits nor pixel snapped.

• dom/Element.cpp:

(WebCore::Element::boundsInRootViewSpace): Coordinates in root view space are akin to absolute
coordinates, which are always expressed in integers.

• dom/Element.h:

(Element):

• dom/ElementRareData.h:

(WebCore::defaultMinimumSizeForResizing): Using numeric_limits<LayoutUnit>::max instead of
INT_MAX to avoid overflowing when LayoutUnits are sub-pixel.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (1 diff)
• dom/Element.cpp (modified) (3 diffs)
• dom/Element.h (modified) (1 diff)
• dom/ElementRareData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-26  Levi Weintraub  <leviw@chromium.org>
+
+        Update LayoutUnit usage in ContainerNode, Element, and ElementRareData
+        https://bugs.webkit.org/show_bug.cgi?id=82219
+
+        Reviewed by Eric Seidel.
+
+        No new tests. No change in behavior.
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::getLowerRightCorner): linesBoundingBox returns the enclosing IntRect
+        of the contained lines. Inline's aren't bounded in LayoutUnits nor pixel snapped.
+        * dom/Element.cpp:
+        (WebCore::Element::boundsInRootViewSpace): Coordinates in root view space are akin to absolute
+        coordinates, which are always expressed in integers.
+        * dom/Element.h:
+        (Element):
+        * dom/ElementRareData.h:
+        (WebCore::defaultMinimumSizeForResizing): Using numeric_limits<LayoutUnit>::max instead of
+        INT_MAX to avoid overflowing when LayoutUnits are sub-pixel.
+
 2012-03-26  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -933 +933 @@
             if (o->isText()) {
                 RenderText* text = toRenderText(o);
-                LayoutRect linesBox = text->linesBoundingBox();
+                IntRect linesBox = text->linesBoundingBox();
                 if (!linesBox.maxX() && !linesBox.maxY())
                     continue;

trunk/Source/WebCore/dom/Element.cpp

@@ -476 +476 @@
 }
 
-LayoutRect Element::boundsInRootViewSpace()
+IntRect Element::boundsInRootViewSpace()
 {
     document()->updateLayoutIgnorePendingStylesheets();
@@ -482 +482 @@
     FrameView* view = document()->view();
     if (!view)
-        return LayoutRect();
+        return IntRect();
 
     Vector<FloatQuad> quads;
@@ -501 +501 @@
 
     if (quads.isEmpty())
-        return LayoutRect();
-
-    LayoutRect result = quads[0].enclosingBoundingBox();
+        return IntRect();
+
+    IntRect result = quads[0].enclosingBoundingBox();
     for (size_t i = 1; i < quads.size(); ++i)
         result.unite(quads[i].enclosingBoundingBox());

trunk/Source/WebCore/dom/Element.h

@@ -187 +187 @@
     virtual int scrollHeight();
 
-    LayoutRect boundsInRootViewSpace();
+    IntRect boundsInRootViewSpace();
 
     PassRefPtr<ClientRectList> getClientRects();

trunk/Source/WebCore/dom/ElementRareData.h

@@ -82 +82 @@
 inline IntSize defaultMinimumSizeForResizing()
 {
-    return IntSize(INT_MAX, INT_MAX);
+    return IntSize(std::numeric_limits<LayoutUnit>::max(), std::numeric_limits<LayoutUnit>::max());
 }