| 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 18 matching lines...) Expand all Loading... |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "core/page/AutoscrollController.h" | 30 #include "core/page/AutoscrollController.h" |
| 31 | 31 |
| 32 #include "core/page/EventHandler.h" | 32 #include "core/page/EventHandler.h" |
| 33 #include "core/frame/Frame.h" | 33 #include "core/frame/Frame.h" |
| 34 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
| 35 #include "core/page/Chrome.h" | 35 #include "core/page/Chrome.h" |
| 36 #include "core/page/Page.h" | 36 #include "core/page/Page.h" |
| 37 #include "core/rendering/HitTestResult.h" | 37 #include "core/rendering/HitTestResult.h" |
| 38 #include "core/rendering/RenderBox.h" | 38 #include "core/rendering/RenderBox.h" |
| 39 #include "core/rendering/RenderListBox.h" |
| 39 #include "wtf/CurrentTime.h" | 40 #include "wtf/CurrentTime.h" |
| 40 | 41 |
| 41 namespace WebCore { | 42 namespace WebCore { |
| 42 | 43 |
| 43 // Delay time in second for start autoscroll if pointer is in border edge of scr
ollable element. | 44 // Delay time in second for start autoscroll if pointer is in border edge of scr
ollable element. |
| 44 static double autoscrollDelay = 0.2; | 45 static double autoscrollDelay = 0.2; |
| 45 | 46 |
| 46 PassOwnPtr<AutoscrollController> AutoscrollController::create(Page& page) | 47 PassOwnPtr<AutoscrollController> AutoscrollController::create(Page& page) |
| 47 { | 48 { |
| 48 return adoptPtr(new AutoscrollController(page)); | 49 return adoptPtr(new AutoscrollController(page)); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 66 return m_autoscrollRenderer == renderer; | 67 return m_autoscrollRenderer == renderer; |
| 67 } | 68 } |
| 68 | 69 |
| 69 void AutoscrollController::startAutoscrollForSelection(RenderObject* renderer) | 70 void AutoscrollController::startAutoscrollForSelection(RenderObject* renderer) |
| 70 { | 71 { |
| 71 // We don't want to trigger the autoscroll or the panScroll if it's already
active | 72 // We don't want to trigger the autoscroll or the panScroll if it's already
active |
| 72 if (m_autoscrollType != NoAutoscroll) | 73 if (m_autoscrollType != NoAutoscroll) |
| 73 return; | 74 return; |
| 74 RenderBox* scrollable = RenderBox::findAutoscrollable(renderer); | 75 RenderBox* scrollable = RenderBox::findAutoscrollable(renderer); |
| 75 if (!scrollable) | 76 if (!scrollable) |
| 77 scrollable = renderer->isListBox() ? toRenderListBox(renderer) : 0; |
| 78 if (!scrollable) |
| 76 return; | 79 return; |
| 77 m_autoscrollType = AutoscrollForSelection; | 80 m_autoscrollType = AutoscrollForSelection; |
| 78 m_autoscrollRenderer = scrollable; | 81 m_autoscrollRenderer = scrollable; |
| 79 startAutoscroll(); | 82 startAutoscroll(); |
| 80 } | 83 } |
| 81 | 84 |
| 82 void AutoscrollController::stopAutoscroll() | 85 void AutoscrollController::stopAutoscroll() |
| 83 { | 86 { |
| 84 RenderBox* scrollable = m_autoscrollRenderer; | 87 RenderBox* scrollable = m_autoscrollRenderer; |
| 85 m_autoscrollRenderer = 0; | 88 m_autoscrollRenderer = 0; |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 } else if (east) | 290 } else if (east) |
| 288 view->setCursor(eastPanningCursor()); | 291 view->setCursor(eastPanningCursor()); |
| 289 else if (west) | 292 else if (west) |
| 290 view->setCursor(westPanningCursor()); | 293 view->setCursor(westPanningCursor()); |
| 291 else | 294 else |
| 292 view->setCursor(middlePanningCursor()); | 295 view->setCursor(middlePanningCursor()); |
| 293 } | 296 } |
| 294 #endif | 297 #endif |
| 295 | 298 |
| 296 } // namespace WebCore | 299 } // namespace WebCore |
| OLD | NEW |