| OLD | NEW |
| 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 stopAutoscroll(); | 170 stopAutoscroll(); |
| 171 return; | 171 return; |
| 172 } | 172 } |
| 173 | 173 |
| 174 m_dragAndDropAutoscrollReferencePosition = eventPosition + offset; | 174 m_dragAndDropAutoscrollReferencePosition = eventPosition + offset; |
| 175 | 175 |
| 176 if (m_autoscrollType == NoAutoscroll) { | 176 if (m_autoscrollType == NoAutoscroll) { |
| 177 m_autoscrollType = AutoscrollForDragAndDrop; | 177 m_autoscrollType = AutoscrollForDragAndDrop; |
| 178 m_autoscrollLayoutObject = scrollable; | 178 m_autoscrollLayoutObject = scrollable; |
| 179 m_dragAndDropAutoscrollStartTime = eventTime; | 179 m_dragAndDropAutoscrollStartTime = eventTime; |
| 180 UseCounter::count(m_page->mainFrame(), UseCounter::DragAndDropScrollStar
t); |
| 180 startAutoscroll(); | 181 startAutoscroll(); |
| 181 } else if (m_autoscrollLayoutObject != scrollable) { | 182 } else if (m_autoscrollLayoutObject != scrollable) { |
| 182 m_dragAndDropAutoscrollStartTime = eventTime; | 183 m_dragAndDropAutoscrollStartTime = eventTime; |
| 183 m_autoscrollLayoutObject = scrollable; | 184 m_autoscrollLayoutObject = scrollable; |
| 184 } | 185 } |
| 185 } | 186 } |
| 186 | 187 |
| 187 void AutoscrollController::handleMouseReleaseForMiddleClickAutoscroll(LocalFrame
* frame, const PlatformMouseEvent& mouseEvent) | 188 void AutoscrollController::handleMouseReleaseForMiddleClickAutoscroll(LocalFrame
* frame, const PlatformMouseEvent& mouseEvent) |
| 188 { | 189 { |
| 189 DCHECK(RuntimeEnabledFeatures::middleClickAutoscrollEnabled()); | 190 DCHECK(RuntimeEnabledFeatures::middleClickAutoscrollEnabled()); |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 } else if (east) { | 300 } else if (east) { |
| 300 view->setCursor(eastPanningCursor()); | 301 view->setCursor(eastPanningCursor()); |
| 301 } else if (west) { | 302 } else if (west) { |
| 302 view->setCursor(westPanningCursor()); | 303 view->setCursor(westPanningCursor()); |
| 303 } else { | 304 } else { |
| 304 view->setCursor(middlePanningCursor()); | 305 view->setCursor(middlePanningCursor()); |
| 305 } | 306 } |
| 306 } | 307 } |
| 307 | 308 |
| 308 } // namespace blink | 309 } // namespace blink |
| OLD | NEW |