OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, Google Inc. All rights reserved. |
3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. | 3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 else if (behaviorString == "smooth") | 201 else if (behaviorString == "smooth") |
202 behavior = ScrollBehaviorSmooth; | 202 behavior = ScrollBehaviorSmooth; |
203 else | 203 else |
204 return false; | 204 return false; |
205 | 205 |
206 return true; | 206 return true; |
207 } | 207 } |
208 | 208 |
209 bool ScrollableArea::handleWheelEvent(const PlatformWheelEvent& wheelEvent) | 209 bool ScrollableArea::handleWheelEvent(const PlatformWheelEvent& wheelEvent) |
210 { | 210 { |
211 return scrollAnimator()->handleWheelEvent(wheelEvent); | 211 return handleWheelEvent(wheelEvent, true, true); |
| 212 } |
| 213 |
| 214 bool ScrollableArea::handleWheelEvent(const PlatformWheelEvent& wheelEvent, bool
canRubberbandLeft, bool canRubberbandRight) |
| 215 { |
| 216 return scrollAnimator()->handleWheelEvent(wheelEvent, canRubberbandLeft, can
RubberbandRight); |
212 } | 217 } |
213 | 218 |
214 // NOTE: Only called from Internals for testing. | 219 // NOTE: Only called from Internals for testing. |
215 void ScrollableArea::setScrollOffsetFromInternals(const IntPoint& offset) | 220 void ScrollableArea::setScrollOffsetFromInternals(const IntPoint& offset) |
216 { | 221 { |
217 setScrollOffsetFromAnimation(offset); | 222 setScrollOffsetFromAnimation(offset); |
218 } | 223 } |
219 | 224 |
220 void ScrollableArea::setScrollOffsetFromAnimation(const IntPoint& offset) | 225 void ScrollableArea::setScrollOffsetFromAnimation(const IntPoint& offset) |
221 { | 226 { |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 { | 426 { |
422 return scrollSize(orientation); | 427 return scrollSize(orientation); |
423 } | 428 } |
424 | 429 |
425 float ScrollableArea::pixelStep(ScrollbarOrientation) const | 430 float ScrollableArea::pixelStep(ScrollbarOrientation) const |
426 { | 431 { |
427 return 1; | 432 return 1; |
428 } | 433 } |
429 | 434 |
430 } // namespace WebCore | 435 } // namespace WebCore |
OLD | NEW |