OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 if (*data->m_currentPos > data->m_desiredPos) | 287 if (*data->m_currentPos > data->m_desiredPos) |
288 distanceTraveled = -distanceTraveled; | 288 distanceTraveled = -distanceTraveled; |
289 *data->m_currentPos += distanceTraveled; | 289 *data->m_currentPos += distanceTraveled; |
290 data->m_animationTimer.startOneShot(animationTimerDelay); | 290 data->m_animationTimer.startOneShot(animationTimerDelay); |
291 data->m_lastAnimationTime = WTF::currentTime(); | 291 data->m_lastAnimationTime = WTF::currentTime(); |
292 } | 292 } |
293 m_client->setScrollOffsetFromAnimation(IntPoint(*m_horizontalData.m_currentP
os, *m_verticalData.m_currentPos)); | 293 m_client->setScrollOffsetFromAnimation(IntPoint(*m_horizontalData.m_currentP
os, *m_verticalData.m_currentPos)); |
294 } | 294 } |
295 | 295 |
296 } // namespace WebCore | 296 } // namespace WebCore |
OLD | NEW |