[webkit-changes] [100201] branches/subpixellayout/Source/WebCore

[eae]

Title: [100201] branches/subpixellayout/Source/WebCore

Revision

100201

Author

e...@chromium.org

Date

2011-11-14 15:33:30 -0800 (Mon, 14 Nov 2011)

Log Message

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

Modified Paths

branches/subpixellayout/Source/WebCore/html/TextFieldInputType.cpp
branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp
branches/subpixellayout/Source/WebCore/rendering/RenderLayer.h
branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.cpp

Diff

Modified: branches/subpixellayout/Source/WebCore/html/TextFieldInputType.cpp (100200 => 100201)

--- branches/subpixellayout/Source/WebCore/html/TextFieldInputType.cpp	2011-11-14 23:16:27 UTC (rev 100200)
+++ branches/subpixellayout/Source/WebCore/html/TextFieldInputType.cpp	2011-11-14 23:33:30 UTC (rev 100201)
@@ -147,7 +147,7 @@
         if (event->type() == eventNames().blurEvent) {
             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);
             }
 
             renderTextControl->capsLockStateMayHaveChanged();

Modified: branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp (100200 => 100201)

--- branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp	2011-11-14 23:16:27 UTC (rev 100200)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp	2011-11-14 23:33:30 UTC (rev 100201)
@@ -2163,14 +2163,14 @@
         m_resizer->setFrameRect(resizerCornerRect(this, borderBox));
 }
 
-LayoutUnit RenderLayer::scrollWidth()
+int RenderLayer::scrollWidth()
 {
     if (m_scrollDimensionsDirty)
         computeScrollDimensions();
     return m_scrollSize.width();
 }
 
-LayoutUnit RenderLayer::scrollHeight()
+int RenderLayer::scrollHeight()
 {
     if (m_scrollDimensionsDirty)
         computeScrollDimensions();
@@ -2215,13 +2215,12 @@
     ASSERT(box);
     
     m_scrollDimensionsDirty = false;
+    m_scrollOverflow.setWidth((overflowLeft() - box->borderLeft()).round());
+    m_scrollOverflow.setHeight((overflowTop() - box->borderTop()).round());
 
-    m_scrollOverflow.setWidth(overflowLeft() - box->borderLeft());
-    m_scrollOverflow.setHeight(overflowTop() - box->borderTop());
+    m_scrollSize.setWidth((overflowRight() - overflowLeft()).round());
+    m_scrollSize.setHeight((overflowBottom() - overflowTop()).round());
 
-    m_scrollSize.setWidth(overflowRight() - overflowLeft());
-    m_scrollSize.setHeight(overflowBottom() - overflowTop());
-    
     setScrollOrigin(IntPoint(-m_scrollOverflow.width(), -m_scrollOverflow.height()));
 
     if (needHBar)

Modified: branches/subpixellayout/Source/WebCore/rendering/RenderLayer.h (100200 => 100201)

--- branches/subpixellayout/Source/WebCore/rendering/RenderLayer.h	2011-11-14 23:16:27 UTC (rev 100200)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderLayer.h	2011-11-14 23:33:30 UTC (rev 100201)
@@ -267,8 +267,8 @@
 
     LayoutRect rect() const { return LayoutRect(location(), size()); }
 
-    LayoutUnit scrollWidth();
-    LayoutUnit scrollHeight();
+    int scrollWidth();
+    int scrollHeight();
 
     void panScrollFromPoint(const LayoutPoint&);
 
@@ -280,7 +280,7 @@
     // Scrolling methods for layers that can scroll their overflow.
     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(); }
     int scrollYOffset() const { return m_scrollOffset.height() + scrollOrigin().y(); }
@@ -788,7 +788,7 @@
     // Our scroll offsets if the view is scrolled.
     IntSize m_scrollOffset;
 
-    LayoutSize m_scrollOverflow;
+    IntSize m_scrollOverflow;
     
     // The width/height of our scrolled area.
     IntSize m_scrollSize;

Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.cpp (100200 => 100201)

--- branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.cpp	2011-11-14 23:16:27 UTC (rev 100200)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.cpp	2011-11-14 23:33:30 UTC (rev 100201)
@@ -666,9 +666,9 @@
         if (l.scrollYOffset())
             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();
     }
 
     if (paintPhase == LayerPaintPhaseBackground)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes