Index: third_party/WebKit/Source/core/frame/FrameView.h |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h |
index febffe1f46970a60cefc6842a93ad26fea17afb6..ebfc224ae38a9c19793658a19a97a4c50725b3b3 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.h |
+++ b/third_party/WebKit/Source/core/frame/FrameView.h |
@@ -524,10 +524,10 @@ public: |
bool scrollbarCornerPresent() const; |
IntRect scrollCornerRect() const override; |
- IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override; |
- IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override; |
- IntPoint convertFromScrollbarToContainingView(const Scrollbar*, const IntPoint&) const override; |
- IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const override; |
+ IntRect convertFromScrollbarToContainingWidget(const Scrollbar*, const IntRect&) const override; |
+ IntRect convertFromContainingWidgetToScrollbar(const Scrollbar*, const IntRect&) const override; |
+ IntPoint convertFromScrollbarToContainingWidget(const Scrollbar*, const IntPoint&) const override; |
+ IntPoint convertFromContainingWidgetToScrollbar(const Scrollbar*, const IntPoint&) const override; |
bool isFrameView() const override { return true; } |
@@ -665,10 +665,10 @@ private: |
// Override Widget methods to do point conversion via layoutObjects, in order to |
// take transforms into account. |
- IntRect convertToContainingView(const IntRect&) const override; |
- IntRect convertFromContainingView(const IntRect&) const override; |
- IntPoint convertToContainingView(const IntPoint&) const override; |
- IntPoint convertFromContainingView(const IntPoint&) const override; |
+ IntRect convertToContainingWidget(const IntRect&) const override; |
+ IntRect convertFromContainingWidget(const IntRect&) const override; |
+ IntPoint convertToContainingWidget(const IntPoint&) const override; |
+ IntPoint convertFromContainingWidget(const IntPoint&) const override; |
void updateWidgetPositionsIfNeeded(); |