Changeset 100042 in webkit

Timestamp:

Nov 11, 2011, 3:54:58 PM (15 years ago)

Author:

eae@chromium.org

Message:

Round offsetWidth/Height/Top/Left and client* before returning instead of flooring the values in the binding code

Location:

branches/subpixellayout/Source/WebCore

Files:

• dom/Element.cpp (modified) (9 diffs)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (3 diffs)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderInline.h (modified) (1 diff)
• rendering/RenderListBox.cpp (modified) (1 diff)
• rendering/RenderVideo.cpp (modified) (4 diffs)
• rendering/RenderVideo.h (modified) (1 diff)

branches/subpixellayout/Source/WebCore/dom/Element.cpp

@@ -345 +345 @@
 {
     document()->updateLayoutIgnorePendingStylesheets();
-    if (RenderBoxModelObject* rend = renderBoxModelObject()) {
-        LayoutUnit adjustForIntRounding = rend->offsetLeft() - rend->offsetLeft().floor();
-        return roundf(adjustForAbsoluteZoom(rend->offsetWidth() + adjustForIntRounding, rend));
-    }
+    if (RenderBoxModelObject* rend = renderBoxModelObject())
+        return adjustForAbsoluteZoom(rend->offsetWidth(), rend);
     return 0;
 }
@@ -355 +353 @@
 {
     document()->updateLayoutIgnorePendingStylesheets();
-    if (RenderBoxModelObject* rend = renderBoxModelObject()) {
-        LayoutUnit adjustForIntRounding = rend->offsetTop() - rend->offsetTop().floor();
-        return roundf(adjustForAbsoluteZoom(rend->offsetHeight() + adjustForIntRounding, rend));
-    }
+    if (RenderBoxModelObject* rend = renderBoxModelObject())
+        return adjustForAbsoluteZoom(rend->offsetHeight(), rend);
     return 0;
 }
@@ -376 +372 @@
 
     if (RenderBox* rend = renderBox())
-        return roundf(adjustForAbsoluteZoom(rend->clientLeft(), rend));
+        return adjustForAbsoluteZoom(rend->clientLeft(), rend);
     return 0;
 }
@@ -385 +381 @@
 
     if (RenderBox* rend = renderBox())
-        return roundf(adjustForAbsoluteZoom(rend->clientTop(), rend));
+        return adjustForAbsoluteZoom(rend->clientTop(), rend);
     return 0;
 }
@@ -400 +396 @@
         if (FrameView* view = document()->view()) {
             if (RenderView* renderView = document()->renderView())
-                return roundf(adjustForAbsoluteZoom(view->layoutWidth(), renderView));
+                return adjustForAbsoluteZoom(view->layoutWidth(), renderView);
         }
     }
     
-    if (RenderBox* rend = renderBox()) {
-        LayoutUnit adjustForIntRounding = rend->clientLeft() - rend->clientLeft().floor();
-        return roundf(adjustForAbsoluteZoom(rend->clientWidth() + adjustForIntRounding, rend));
-    }
+    if (RenderBox* rend = renderBox())
+        return adjustForAbsoluteZoom(rend->clientWidth(), rend);
     return 0;
 }
@@ -423 +417 @@
         if (FrameView* view = document()->view()) {
             if (RenderView* renderView = document()->renderView())
-                return roundf(adjustForAbsoluteZoom(view->layoutHeight(), renderView));
+                return adjustForAbsoluteZoom(view->layoutHeight(), renderView);
         }
     }
     
-    if (RenderBox* rend = renderBox()) {
-        LayoutUnit adjustForIntRounding = rend->clientTop() - rend->clientTop().floor();
-        return roundf(adjustForAbsoluteZoom(rend->clientHeight() + adjustForIntRounding, rend));
-    }
+    if (RenderBox* rend = renderBox())
+        return adjustForAbsoluteZoom(rend->clientHeight(), rend);
     return 0;
 }
@@ -446 +438 @@
     document()->updateLayoutIgnorePendingStylesheets();
     if (RenderBox* rend = renderBox())
-        return roundf(adjustForAbsoluteZoom(rend->scrollTop(), rend));
+        return adjustForAbsoluteZoom(rend->scrollTop(), rend);
     return 0;
 }
@@ -468 +460 @@
     document()->updateLayoutIgnorePendingStylesheets();
     if (RenderBox* rend = renderBox()) {
-        return roundf(adjustForAbsoluteZoom(rend->scrollWidth(), rend));
+        return adjustForAbsoluteZoom(rend->scrollWidth(), rend);
     }
     return 0;
@@ -477 +469 @@
     document()->updateLayoutIgnorePendingStylesheets();
     if (RenderBox* rend = renderBox()) {
-        return roundf(adjustForAbsoluteZoom(rend->scrollHeight(), rend));
+        return adjustForAbsoluteZoom(rend->scrollHeight(), rend);
     }
     return 0;

branches/subpixellayout/Source/WebCore/rendering/RenderBox.cpp

@@ -466 +466 @@
 // More IE extensions.  clientWidth and clientHeight represent the interior of an object
 // excluding border and scrollbar.
-LayoutUnit RenderBox::clientWidth() const
-{
-    return width() - borderLeft() - borderRight() - verticalScrollbarWidth();
-}
-
-LayoutUnit RenderBox::clientHeight() const
-{
-    return height() - borderTop() - borderBottom() - horizontalScrollbarHeight();
+int RenderBox::clientWidth() const
+{
+    return (width() - borderLeft() - borderRight() - verticalScrollbarWidth()).round();
+}
+
+int RenderBox::clientHeight() const
+{
+    return (height() - borderTop() - borderBottom() - horizontalScrollbarHeight()).round();
 }
 
@@ -483 +483 @@
     // FIXME: Need to work right with writing modes.
     if (style()->isLeftToRightDirection())
-        return max(clientWidth(), maxXLayoutOverflow() - borderLeft());
-    return clientWidth() - min<int>(0, minXLayoutOverflow() - borderLeft());
+        return max(clientWidth(), (maxXLayoutOverflow() - borderLeft()).round());
+    return clientWidth() - min(0, (minXLayoutOverflow() - borderLeft()).round());
 }
 

branches/subpixellayout/Source/WebCore/rendering/RenderBox.h

@@ -181 +181 @@
     // IE extensions. Used to calculate offsetWidth/Height.  Overridden by inlines (RenderFlow)
     // to return the remaining width on a given line (and the height of a single line).
-    virtual LayoutUnit offsetWidth() const { return width(); }
-    virtual LayoutUnit offsetHeight() const { return height(); }
+    virtual int offsetWidth() const { return width(); }
+    virtual int offsetHeight() const { return height(); }
 
     // More IE extensions.  clientWidth and clientHeight represent the interior of an object
     // excluding border and scrollbar.  clientLeft/Top are just the borderLeftWidth and borderTopWidth.
-    LayoutUnit clientLeft() const { return borderLeft(); }
-    LayoutUnit clientTop() const { return borderTop(); }
-    LayoutUnit clientWidth() const;
-    LayoutUnit clientHeight() const;
-    LayoutUnit clientLogicalWidth() const { return style()->isHorizontalWritingMode() ? clientWidth() : clientHeight(); }
-    LayoutUnit clientLogicalHeight() const { return style()->isHorizontalWritingMode() ? clientHeight() : clientWidth(); }
-    LayoutUnit clientLogicalBottom() const { return borderBefore() + clientLogicalHeight(); }
-    LayoutRect clientBoxRect() const { return LayoutRect(clientLeft(), clientTop(), clientWidth(), clientHeight()); }
+    int clientLeft() const { return borderLeft().round(); }
+    int clientTop() const { return borderTop().round(); }
+    int clientWidth() const;
+    int clientHeight() const;
+    int clientLogicalWidth() const { return style()->isHorizontalWritingMode() ? clientWidth() : clientHeight(); }
+    int clientLogicalHeight() const { return style()->isHorizontalWritingMode() ? clientHeight() : clientWidth(); }
+    int clientLogicalBottom() const { return borderBefore() + clientLogicalHeight(); }
+    IntRect clientBoxRect() const { return IntRect(clientLeft(), clientTop(), clientWidth(), clientHeight()); }
 
     // scrollWidth/scrollHeight will be the same as clientWidth/clientHeight unless the

branches/subpixellayout/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -432 +432 @@
 }
 
-LayoutUnit RenderBoxModelObject::offsetLeft() const
+int RenderBoxModelObject::offsetLeft() const
 {
     // If the element is the HTML body element or does not have an associated box
@@ -463 +463 @@
     }
 
-    return xPos;
-}
-
-LayoutUnit RenderBoxModelObject::offsetTop() const
+    return xPos.round();
+}
+
+int RenderBoxModelObject::offsetTop() const
 {
     // If the element is the HTML body element or does not have an associated box
@@ -496 +496 @@
         }
     }
-    return yPos;
+    return yPos.round();
 }
 

branches/subpixellayout/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -56 +56 @@
     // IE extensions. Used to calculate offsetWidth/Height.  Overridden by inlines (RenderFlow)
     // to return the remaining width on a given line (and the height of a single line).
-    virtual LayoutUnit offsetLeft() const;
-    virtual LayoutUnit offsetTop() const;
-    virtual LayoutUnit offsetWidth() const = 0;
-    virtual LayoutUnit offsetHeight() const = 0;
+    virtual int offsetLeft() const;
+    virtual int offsetTop() const;
+    virtual int offsetWidth() const = 0;
+    virtual int offsetHeight() const = 0;
 
     virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);

branches/subpixellayout/Source/WebCore/rendering/RenderInline.cpp

@@ -638 +638 @@
 }
 
-LayoutUnit RenderInline::offsetLeft() const
-{
-    LayoutUnit x = RenderBoxModelObject::offsetLeft();
+int RenderInline::offsetLeft() const
+{
+    int x = RenderBoxModelObject::offsetLeft();
     if (InlineBox* firstBox = firstLineBoxIncludingCulling())
         x += firstBox->x();
@@ -646 +646 @@
 }
 
-LayoutUnit RenderInline::offsetTop() const
-{
-    LayoutUnit y = RenderBoxModelObject::offsetTop();
+int RenderInline::offsetTop() const
+{
+    int y = RenderBoxModelObject::offsetTop();
     if (InlineBox* firstBox = firstLineBoxIncludingCulling())
         y += firstBox->y();

branches/subpixellayout/Source/WebCore/rendering/RenderInline.h

@@ -122 +122 @@
     virtual bool requiresLayer() const { return isRelPositioned() || isTransparent() || hasMask(); }
 
-    virtual LayoutUnit offsetLeft() const;
-    virtual LayoutUnit offsetTop() const;
-    virtual LayoutUnit offsetWidth() const { return linesBoundingBox().width(); }
-    virtual LayoutUnit offsetHeight() const { return linesBoundingBox().height(); }
+    virtual int offsetLeft() const;
+    virtual int offsetTop() const;
+    virtual int offsetWidth() const { return linesBoundingBox().width(); }
+    virtual int offsetHeight() const { return linesBoundingBox().height(); }
 
     virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;

branches/subpixellayout/Source/WebCore/rendering/RenderListBox.cpp

@@ -651 +651 @@
 int RenderListBox::scrollHeight() const
 {
-    return max(clientHeight(), listHeight());
+    return max(clientHeight(), listHeight().round());
 }
 

branches/subpixellayout/Source/WebCore/rendering/RenderVideo.cpp

@@ -301 +301 @@
 }
 
-LayoutUnit RenderVideo::offsetLeft() const
+int RenderVideo::offsetLeft() const
 {
     if (const RenderBlock* block = rendererPlaceholder(this))
@@ -308 +308 @@
 }
 
-LayoutUnit RenderVideo::offsetTop() const
+int RenderVideo::offsetTop() const
 {
     if (const RenderBlock* block = rendererPlaceholder(this))
@@ -315 +315 @@
 }
 
-LayoutUnit RenderVideo::offsetWidth() const
+int RenderVideo::offsetWidth() const
 {
     if (const RenderBlock* block = rendererPlaceholder(this))
@@ -322 +322 @@
 }
 
-LayoutUnit RenderVideo::offsetHeight() const
+int RenderVideo::offsetHeight() const
 {
     if (const RenderBlock* block = rendererPlaceholder(this))

branches/subpixellayout/Source/WebCore/rendering/RenderVideo.h

@@ -76 +76 @@
 
 #if ENABLE(FULLSCREEN_API)
-    virtual LayoutUnit offsetLeft() const;
-    virtual LayoutUnit offsetTop() const;
-    virtual LayoutUnit offsetWidth() const;
-    virtual LayoutUnit offsetHeight() const;
+    virtual int offsetLeft() const;
+    virtual int offsetTop() const;
+    virtual int offsetWidth() const;
+    virtual int offsetHeight() const;
 #endif