diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/page/AutoscrollController.cpp')
| -rw-r--r-- | chromium/third_party/WebKit/Source/core/page/AutoscrollController.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/core/page/AutoscrollController.cpp b/chromium/third_party/WebKit/Source/core/page/AutoscrollController.cpp index 6c460280b17..b168e004358 100644 --- a/chromium/third_party/WebKit/Source/core/page/AutoscrollController.cpp +++ b/chromium/third_party/WebKit/Source/core/page/AutoscrollController.cpp @@ -29,13 +29,14 @@ #include "config.h" #include "core/page/AutoscrollController.h" -#include "core/page/EventHandler.h" -#include "core/frame/Frame.h" #include "core/frame/FrameView.h" +#include "core/frame/LocalFrame.h" #include "core/page/Chrome.h" +#include "core/page/EventHandler.h" #include "core/page/Page.h" #include "core/rendering/HitTestResult.h" #include "core/rendering/RenderBox.h" +#include "core/rendering/RenderListBox.h" #include "wtf/CurrentTime.h" namespace WebCore { @@ -73,6 +74,8 @@ void AutoscrollController::startAutoscrollForSelection(RenderObject* renderer) return; RenderBox* scrollable = RenderBox::findAutoscrollable(renderer); if (!scrollable) + scrollable = renderer->isListBox() ? toRenderListBox(renderer) : 0; + if (!scrollable) return; m_autoscrollType = AutoscrollForSelection; m_autoscrollRenderer = scrollable; @@ -169,7 +172,7 @@ void AutoscrollController::updateDragAndDrop(Node* dropTargetNode, const IntPoin } #if OS(WIN) -void AutoscrollController::handleMouseReleaseForPanScrolling(Frame* frame, const PlatformMouseEvent& mouseEvent) +void AutoscrollController::handleMouseReleaseForPanScrolling(LocalFrame* frame, const PlatformMouseEvent& mouseEvent) { if (!frame->isMainFrame()) return; |