Changeset 100201 in webkit

Timestamp:

Nov 14, 2011, 3:33:30 PM (15 years ago)

Author:

eae@chromium.org

Message:

Round width and height when computing the scroll size (as opposed to flooring).

Location:

branches/subpixellayout/Source/WebCore

Files:

• html/TextFieldInputType.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (3 diffs)
• rendering/RenderLayer.h (modified) (3 diffs)
• rendering/RenderTreeAsText.cpp (modified) (1 diff)

branches/subpixellayout/Source/WebCore/html/TextFieldInputType.cpp

@@ -148 +148 @@
             if (RenderBox* innerTextRenderer = innerTextElement()->renderBox()) {
                 if (RenderLayer* innerLayer = innerTextRenderer->layer())
-                    innerLayer->scrollToOffset(!renderTextControl->style()->isLeftToRightDirection() ? innerLayer->scrollWidth() : LayoutUnit(0), 0, RenderLayer::ScrollOffsetClamped);
+                    innerLayer->scrollToOffset(!renderTextControl->style()->isLeftToRightDirection() ? innerLayer->scrollWidth() : 0, 0, RenderLayer::ScrollOffsetClamped);
             }
 

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

@@ -2164 +2164 @@
 }
 
-LayoutUnit RenderLayer::scrollWidth()
+int RenderLayer::scrollWidth()
 {
     if (m_scrollDimensionsDirty)
@@ -2171 +2171 @@
 }
 
-LayoutUnit RenderLayer::scrollHeight()
+int RenderLayer::scrollHeight()
 {
     if (m_scrollDimensionsDirty)
@@ -2216 +2216 @@
     
     m_scrollDimensionsDirty = false;
-
-    m_scrollOverflow.setWidth(overflowLeft() - box->borderLeft());
-    m_scrollOverflow.setHeight(overflowTop() - box->borderTop());
-
-    m_scrollSize.setWidth(overflowRight() - overflowLeft());
-    m_scrollSize.setHeight(overflowBottom() - overflowTop());
-    
+    m_scrollOverflow.setWidth((overflowLeft() - box->borderLeft()).round());
+    m_scrollOverflow.setHeight((overflowTop() - box->borderTop()).round());
+
+    m_scrollSize.setWidth((overflowRight() - overflowLeft()).round());
+    m_scrollSize.setHeight((overflowBottom() - overflowTop()).round());
+
     setScrollOrigin(IntPoint(-m_scrollOverflow.width(), -m_scrollOverflow.height()));
 

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

@@ -268 +268 @@
     LayoutRect rect() const { return LayoutRect(location(), size()); }
 
-    LayoutUnit scrollWidth();
-    LayoutUnit scrollHeight();
+    int scrollWidth();
+    int scrollHeight();
 
     void panScrollFromPoint(const LayoutPoint&);
@@ -281 +281 @@
     void scrollByRecursively(LayoutUnit xDelta, LayoutUnit yDelta, ScrollOffsetClamping = ScrollOffsetUnclamped);
 
-    LayoutSize scrolledContentOffset() const { return scrollOffset() + m_scrollOverflow; }
+    IntSize scrolledContentOffset() const { return scrollOffset() + m_scrollOverflow; }
 
     int scrollXOffset() const { return m_scrollOffset.width() + scrollOrigin().x(); }
@@ -789 +789 @@
     IntSize m_scrollOffset;
 
-    LayoutSize m_scrollOverflow;
+    IntSize m_scrollOverflow;
     
     // The width/height of our scrolled area.

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

@@ -667 +667 @@
             ts << " scrollY " << l.scrollYOffset();
         if (l.renderBox() && l.renderBox()->clientWidth() != l.scrollWidth())
-            ts << " scrollWidth " << l.scrollWidth().toInt();
+            ts << " scrollWidth " << l.scrollWidth();
         if (l.renderBox() && l.renderBox()->clientHeight() != l.scrollHeight())
-            ts << " scrollHeight " << l.scrollHeight().toInt();
+            ts << " scrollHeight " << l.scrollHeight();
     }