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

Unified Diff: Source/core/page/AutoscrollController.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months 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
« no previous file with comments | « Source/core/loader/ImageLoader.cpp ('k') | Source/core/page/DragController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « Source/core/loader/ImageLoader.cpp ('k') | Source/core/page/DragController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698