Title: [99921] branches/subpixellayout/Source/WebCore/platform
- Revision
- 99921
- Author
- [email protected]
- Date
- 2011-11-10 17:56:57 -0800 (Thu, 10 Nov 2011)
Log Message
Revert Scrollbar::convertFromContainingView to int to avoid unnecessary type conversion
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/platform/Scrollbar.cpp (99920 => 99921)
--- branches/subpixellayout/Source/WebCore/platform/Scrollbar.cpp 2011-11-11 01:45:57 UTC (rev 99920)
+++ branches/subpixellayout/Source/WebCore/platform/Scrollbar.cpp 2011-11-11 01:56:57 UTC (rev 99921)
@@ -511,36 +511,36 @@
m_scrollableArea->invalidateScrollbar(this, rect);
}
-LayoutRect Scrollbar::convertToContainingView(const LayoutRect& localRect) const
+IntRect Scrollbar::convertToContainingView(const IntRect& localRect) const
{
if (m_scrollableArea)
- return m_scrollableArea->convertFromScrollbarToContainingView(this, enclosingIntRect(localRect));
+ return m_scrollableArea->convertFromScrollbarToContainingView(this, localRect);
- return Widget::convertToContainingView(enclosingIntRect(localRect));
+ return Widget::convertToContainingView(localRect);
}
-LayoutRect Scrollbar::convertFromContainingView(const LayoutRect& parentRect) const
+IntRect Scrollbar::convertFromContainingView(const IntRect& parentRect) const
{
if (m_scrollableArea)
- return m_scrollableArea->convertFromContainingViewToScrollbar(this, enclosingIntRect(parentRect));
+ return m_scrollableArea->convertFromContainingViewToScrollbar(this, parentRect);
- return Widget::convertFromContainingView(enclosingIntRect(parentRect));
+ return Widget::convertFromContainingView(parentRect);
}
-LayoutPoint Scrollbar::convertToContainingView(const LayoutPoint& localPoint) const
+IntPoint Scrollbar::convertToContainingView(const IntPoint& localPoint) const
{
if (m_scrollableArea)
- return m_scrollableArea->convertFromScrollbarToContainingView(this, roundedIntPoint(localPoint));
+ return m_scrollableArea->convertFromScrollbarToContainingView(this, localPoint);
- return Widget::convertToContainingView(roundedIntPoint(localPoint));
+ return Widget::convertToContainingView(localPoint);
}
-LayoutPoint Scrollbar::convertFromContainingView(const LayoutPoint& parentPoint) const
+IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const
{
if (m_scrollableArea)
- return m_scrollableArea->convertFromContainingViewToScrollbar(this, roundedIntPoint(parentPoint));
+ return m_scrollableArea->convertFromContainingViewToScrollbar(this, parentPoint);
- return Widget::convertFromContainingView(roundedIntPoint(parentPoint));
+ return Widget::convertFromContainingView(parentPoint);
}
} // namespace WebCore
Modified: branches/subpixellayout/Source/WebCore/platform/Scrollbar.h (99920 => 99921)
--- branches/subpixellayout/Source/WebCore/platform/Scrollbar.h 2011-11-11 01:45:57 UTC (rev 99920)
+++ branches/subpixellayout/Source/WebCore/platform/Scrollbar.h 2011-11-11 01:56:57 UTC (rev 99921)
@@ -120,11 +120,11 @@
virtual void styleChanged() { }
- virtual LayoutRect convertToContainingView(const LayoutRect&) const;
- virtual LayoutRect convertFromContainingView(const LayoutRect&) const;
+ virtual IntRect convertToContainingView(const IntRect&) const;
+ virtual IntRect convertFromContainingView(const IntRect&) const;
- virtual LayoutPoint convertToContainingView(const LayoutPoint&) const;
- virtual LayoutPoint convertFromContainingView(const LayoutPoint&) const;
+ virtual IntPoint convertToContainingView(const IntPoint&) const;
+ virtual IntPoint convertFromContainingView(const IntPoint&) const;
protected:
Scrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = 0);
Modified: branches/subpixellayout/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm (99920 => 99921)
--- branches/subpixellayout/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm 2011-11-11 01:45:57 UTC (rev 99920)
+++ branches/subpixellayout/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm 2011-11-11 01:56:57 UTC (rev 99921)
@@ -1338,7 +1338,7 @@
{
IntRect rectInViewCoordinates = scrollerThumb;
if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar())
- rectInViewCoordinates = enclosingIntRect(verticalScrollbar->convertToContainingView(scrollerThumb));
+ rectInViewCoordinates = verticalScrollbar->convertToContainingView(scrollerThumb);
if (rectInViewCoordinates == m_visibleScrollerThumbRect)
return;
Modified: branches/subpixellayout/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (99920 => 99921)
--- branches/subpixellayout/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-11-11 01:45:57 UTC (rev 99920)
+++ branches/subpixellayout/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-11-11 01:56:57 UTC (rev 99921)
@@ -1496,7 +1496,7 @@
{
IntRect rectInViewCoordinates = scrollerThumb;
if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar())
- rectInViewCoordinates = pixelSnappedIntRect(verticalScrollbar->convertToContainingView(scrollerThumb));
+ rectInViewCoordinates = verticalScrollbar->convertToContainingView(scrollerThumb);
if (rectInViewCoordinates == m_visibleScrollerThumbRect)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
