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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/ImageLoader.cpp ('k') | Source/core/page/DragController.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 { 115 {
116 if (!m_autoscrollRenderer) 116 if (!m_autoscrollRenderer)
117 return; 117 return;
118 118
119 LayoutObject* renderer = m_autoscrollRenderer; 119 LayoutObject* renderer = m_autoscrollRenderer;
120 120
121 #if OS(WIN) 121 #if OS(WIN)
122 HitTestResult hitTest = renderer->frame()->eventHandler().hitTestResultAtPoi nt(m_panScrollStartPos, HitTestRequest::ReadOnly | HitTestRequest::Active); 122 HitTestResult hitTest = renderer->frame()->eventHandler().hitTestResultAtPoi nt(m_panScrollStartPos, HitTestRequest::ReadOnly | HitTestRequest::Active);
123 123
124 if (Node* nodeAtPoint = hitTest.innerNode()) 124 if (Node* nodeAtPoint = hitTest.innerNode())
125 renderer = nodeAtPoint->renderer(); 125 renderer = nodeAtPoint->layoutObject();
126 #endif 126 #endif
127 127
128 while (renderer && !(renderer->isBox() && toLayoutBox(renderer)->canAutoscro ll())) 128 while (renderer && !(renderer->isBox() && toLayoutBox(renderer)->canAutoscro ll()))
129 renderer = renderer->parent(); 129 renderer = renderer->parent();
130 m_autoscrollRenderer = renderer && renderer->isBox() ? toLayoutBox(renderer) : nullptr; 130 m_autoscrollRenderer = renderer && renderer->isBox() ? toLayoutBox(renderer) : nullptr;
131 } 131 }
132 132
133 void AutoscrollController::updateDragAndDrop(Node* dropTargetNode, const IntPoin t& eventPosition, double eventTime) 133 void AutoscrollController::updateDragAndDrop(Node* dropTargetNode, const IntPoin t& eventPosition, double eventTime)
134 { 134 {
135 if (!dropTargetNode || !dropTargetNode->renderer()) { 135 if (!dropTargetNode || !dropTargetNode->layoutObject()) {
136 stopAutoscroll(); 136 stopAutoscroll();
137 return; 137 return;
138 } 138 }
139 139
140 if (m_autoscrollRenderer && m_autoscrollRenderer->frame() != dropTargetNode- >renderer()->frame()) 140 if (m_autoscrollRenderer && m_autoscrollRenderer->frame() != dropTargetNode- >layoutObject()->frame())
141 return; 141 return;
142 142
143 LayoutBox* scrollable = LayoutBox::findAutoscrollable(dropTargetNode->render er()); 143 LayoutBox* scrollable = LayoutBox::findAutoscrollable(dropTargetNode->layout Object());
144 if (!scrollable) { 144 if (!scrollable) {
145 stopAutoscroll(); 145 stopAutoscroll();
146 return; 146 return;
147 } 147 }
148 148
149 Page* page = scrollable->frame() ? scrollable->frame()->page() : nullptr; 149 Page* page = scrollable->frame() ? scrollable->frame()->page() : nullptr;
150 if (!page) { 150 if (!page) {
151 stopAutoscroll(); 151 stopAutoscroll();
152 return; 152 return;
153 } 153 }
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 } else if (east) 290 } else if (east)
291 view->setCursor(eastPanningCursor()); 291 view->setCursor(eastPanningCursor());
292 else if (west) 292 else if (west)
293 view->setCursor(westPanningCursor()); 293 view->setCursor(westPanningCursor());
294 else 294 else
295 view->setCursor(middlePanningCursor()); 295 view->setCursor(middlePanningCursor());
296 } 296 }
297 #endif 297 #endif
298 298
299 } // namespace blink 299 } // namespace blink
OLDNEW
« 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