Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1052)

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollableArea.h

Issue 1486743002: Clean up some remaining obsolete coordinate-space naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Mac compile Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
index bc261b77f4d9b0381eccf2bf36d5478dd6b6bae6..390fea453cb3eb9ca9677c7a121cd409e538d551 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
@@ -153,24 +153,24 @@ public:
void setScrollCornerNeedsPaintInvalidation();
virtual void getTickmarks(Vector<IntRect>&) const { }
- // Convert points and rects between the scrollbar and its containing view.
+ // Convert points and rects between the scrollbar and its containing Widget.
// The client needs to implement these in order to be aware of layout effects
// like CSS transforms.
- virtual IntRect convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntRect& scrollbarRect) const
+ virtual IntRect convertFromScrollbarToContainingWidget(const Scrollbar* scrollbar, const IntRect& scrollbarRect) const
{
- return scrollbar->Widget::convertToContainingView(scrollbarRect);
+ return scrollbar->Widget::convertToContainingWidget(scrollbarRect);
}
- virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
+ virtual IntRect convertFromContainingWidgetToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
{
- return scrollbar->Widget::convertFromContainingView(parentRect);
+ return scrollbar->Widget::convertFromContainingWidget(parentRect);
}
- virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntPoint& scrollbarPoint) const
+ virtual IntPoint convertFromScrollbarToContainingWidget(const Scrollbar* scrollbar, const IntPoint& scrollbarPoint) const
{
- return scrollbar->Widget::convertToContainingView(scrollbarPoint);
+ return scrollbar->Widget::convertToContainingWidget(scrollbarPoint);
}
- virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
+ virtual IntPoint convertFromContainingWidgetToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
{
- return scrollbar->Widget::convertFromContainingView(parentPoint);
+ return scrollbar->Widget::convertFromContainingWidget(parentPoint);
}
virtual Scrollbar* horizontalScrollbar() const { return 0; }
« no previous file with comments | « third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm ('k') | third_party/WebKit/Source/platform/scroll/Scrollbar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698