Index: third_party/WebKit/Source/platform/scroll/Scrollbar.cpp |
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp |
index fe31bb28925a3d77f3fa771e98ed977210022d84..74718916c379e18add8d5b9466b6101c6c9f5bf1 100644 |
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp |
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp |
@@ -26,6 +26,7 @@ |
#include "platform/scroll/Scrollbar.h" |
#include <algorithm> |
+#include "platform/FrameViewBase.h" |
#include "platform/PlatformChromeClient.h" |
#include "platform/geometry/FloatRect.h" |
#include "platform/graphics/paint/CullRect.h" |
@@ -578,7 +579,7 @@ IntPoint Scrollbar::ConvertFromRootFrame( |
if (const FrameViewBase* parent = Parent()) { |
IntPoint parent_point = parent->ConvertFromRootFrame(point_in_root_frame); |
if (scrollable_area_) { |
- return scrollable_area_->ConvertFromContainingFrameViewBaseToScrollbar( |
+ return scrollable_area_->ConvertFromContainingFrameViewToScrollbar( |
*this, parent_point); |
} |
} |
@@ -586,20 +587,20 @@ IntPoint Scrollbar::ConvertFromRootFrame( |
return point_in_root_frame; |
} |
-IntRect Scrollbar::ConvertToContainingFrameViewBase( |
+IntRect Scrollbar::ConvertToContainingFrameView( |
const IntRect& local_rect) const { |
if (scrollable_area_) { |
- return scrollable_area_->ConvertFromScrollbarToContainingFrameViewBase( |
+ return scrollable_area_->ConvertFromScrollbarToContainingFrameView( |
*this, local_rect); |
} |
return local_rect; |
} |
-IntPoint Scrollbar::ConvertFromContainingFrameViewBase( |
+IntPoint Scrollbar::ConvertFromContainingFrameView( |
const IntPoint& parent_point) const { |
if (scrollable_area_) { |
- return scrollable_area_->ConvertFromContainingFrameViewBaseToScrollbar( |
+ return scrollable_area_->ConvertFromContainingFrameViewToScrollbar( |
*this, parent_point); |
} |