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

Side by Side Diff: Source/core/page/AutoscrollController.cpp

Issue 13851023: Remove ChromeClient cruft (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 7 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/EmptyClients.h ('k') | Source/core/page/Chrome.h » ('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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 return; 150 return;
151 } 151 }
152 152
153 RenderBox* scrollable = RenderBox::findAutoscrollable(dropTargetNode->render er()); 153 RenderBox* scrollable = RenderBox::findAutoscrollable(dropTargetNode->render er());
154 if (!scrollable) { 154 if (!scrollable) {
155 stopAutoscrollTimer(); 155 stopAutoscrollTimer();
156 return; 156 return;
157 } 157 }
158 158
159 Page* page = m_frame->page(); 159 Page* page = m_frame->page();
160 if (!page || !page->chrome()->client()->shouldAutoscrollForDragAndDrop(scrol lable)) { 160 if (!page) {
161 stopAutoscrollTimer(); 161 stopAutoscrollTimer();
162 return; 162 return;
163 } 163 }
164 164
165 IntSize offset = scrollable->calculateAutoscrollDirection(eventPosition); 165 IntSize offset = scrollable->calculateAutoscrollDirection(eventPosition);
166 if (offset.isZero()) { 166 if (offset.isZero()) {
167 stopAutoscrollTimer(); 167 stopAutoscrollTimer();
168 return; 168 return;
169 } 169 }
170 170
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } else if (east) 319 } else if (east)
320 view->setCursor(eastPanningCursor()); 320 view->setCursor(eastPanningCursor());
321 else if (west) 321 else if (west)
322 view->setCursor(westPanningCursor()); 322 view->setCursor(westPanningCursor());
323 else 323 else
324 view->setCursor(middlePanningCursor()); 324 view->setCursor(middlePanningCursor());
325 } 325 }
326 #endif 326 #endif
327 327
328 } // namespace WebCore 328 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/page/Chrome.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698