| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. |    2  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. | 
|    3  * |    3  * | 
|    4  * Redistribution and use in source and binary forms, with or without |    4  * Redistribution and use in source and binary forms, with or without | 
|    5  * modification, are permitted provided that the following conditions |    5  * modification, are permitted provided that the following conditions | 
|    6  * are met: |    6  * are met: | 
|    7  * 1. Redistributions of source code must retain the above copyright |    7  * 1. Redistributions of source code must retain the above copyright | 
|    8  *    notice, this list of conditions and the following disclaimer. |    8  *    notice, this list of conditions and the following disclaimer. | 
|    9  * 2. Redistributions in binary form must reproduce the above copyright |    9  * 2. Redistributions in binary form must reproduce the above copyright | 
|   10  *    notice, this list of conditions and the following disclaimer in the |   10  *    notice, this list of conditions and the following disclaimer in the | 
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  242     // We can't scroll if we've hit the beginning or end. |  242     // We can't scroll if we've hit the beginning or end. | 
|  243     ScrollDirection dir = pressedPartScrollDirection(); |  243     ScrollDirection dir = pressedPartScrollDirection(); | 
|  244     if (dir == ScrollUp || dir == ScrollLeft) { |  244     if (dir == ScrollUp || dir == ScrollLeft) { | 
|  245         if (m_currentPos == 0) |  245         if (m_currentPos == 0) | 
|  246             return; |  246             return; | 
|  247     } else { |  247     } else { | 
|  248         if (m_currentPos == maximum()) |  248         if (m_currentPos == maximum()) | 
|  249             return; |  249             return; | 
|  250     } |  250     } | 
|  251  |  251  | 
|  252     m_scrollTimer.startOneShot(delay); |  252     m_scrollTimer.startOneShot(delay, FROM_HERE); | 
|  253 } |  253 } | 
|  254  |  254  | 
|  255 void Scrollbar::stopTimerIfNeeded() |  255 void Scrollbar::stopTimerIfNeeded() | 
|  256 { |  256 { | 
|  257     if (m_scrollTimer.isActive()) |  257     if (m_scrollTimer.isActive()) | 
|  258         m_scrollTimer.stop(); |  258         m_scrollTimer.stop(); | 
|  259 } |  259 } | 
|  260  |  260  | 
|  261 ScrollDirection Scrollbar::pressedPartScrollDirection() |  261 ScrollDirection Scrollbar::pressedPartScrollDirection() | 
|  262 { |  262 { | 
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  597     if (!m_scrollableArea) |  597     if (!m_scrollableArea) | 
|  598         return 0; |  598         return 0; | 
|  599  |  599  | 
|  600     if (m_orientation == HorizontalScrollbar) |  600     if (m_orientation == HorizontalScrollbar) | 
|  601         return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimu
     mScrollPosition().x(); |  601         return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimu
     mScrollPosition().x(); | 
|  602  |  602  | 
|  603     return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr
     ollPosition().y(); |  603     return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr
     ollPosition().y(); | 
|  604 } |  604 } | 
|  605  |  605  | 
|  606 } // namespace WebCore |  606 } // namespace WebCore | 
| OLD | NEW |