| Index: Source/core/page/AutoscrollController.cpp
|
| diff --git a/Source/core/page/AutoscrollController.cpp b/Source/core/page/AutoscrollController.cpp
|
| index 99949f73cd692eecabf575e13672a05c93b90e67..2be1af465aa3080b0c75d8360bb569607faa2e9d 100644
|
| --- a/Source/core/page/AutoscrollController.cpp
|
| +++ b/Source/core/page/AutoscrollController.cpp
|
| @@ -122,7 +122,7 @@ void AutoscrollController::updateAutoscrollRenderer()
|
| HitTestResult hitTest = renderer->frame()->eventHandler().hitTestResultAtPoint(m_panScrollStartPos, HitTestRequest::ReadOnly | HitTestRequest::Active);
|
|
|
| if (Node* nodeAtPoint = hitTest.innerNode())
|
| - renderer = nodeAtPoint->renderer();
|
| + renderer = nodeAtPoint->layoutObject();
|
| #endif
|
|
|
| while (renderer && !(renderer->isBox() && toLayoutBox(renderer)->canAutoscroll()))
|
| @@ -132,15 +132,15 @@ void AutoscrollController::updateAutoscrollRenderer()
|
|
|
| void AutoscrollController::updateDragAndDrop(Node* dropTargetNode, const IntPoint& eventPosition, double eventTime)
|
| {
|
| - if (!dropTargetNode || !dropTargetNode->renderer()) {
|
| + if (!dropTargetNode || !dropTargetNode->layoutObject()) {
|
| stopAutoscroll();
|
| return;
|
| }
|
|
|
| - if (m_autoscrollRenderer && m_autoscrollRenderer->frame() != dropTargetNode->renderer()->frame())
|
| + if (m_autoscrollRenderer && m_autoscrollRenderer->frame() != dropTargetNode->layoutObject()->frame())
|
| return;
|
|
|
| - LayoutBox* scrollable = LayoutBox::findAutoscrollable(dropTargetNode->renderer());
|
| + LayoutBox* scrollable = LayoutBox::findAutoscrollable(dropTargetNode->layoutObject());
|
| if (!scrollable) {
|
| stopAutoscroll();
|
| return;
|
|
|