| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 } | 154 } |
| 155 | 155 |
| 156 if (direction == ScrollUp || direction == ScrollLeft) | 156 if (direction == ScrollUp || direction == ScrollLeft) |
| 157 delta = -delta; | 157 delta = -delta; |
| 158 | 158 |
| 159 return scrollAnimator()->scroll(orientation, granularity, step, delta); | 159 return scrollAnimator()->scroll(orientation, granularity, step, delta); |
| 160 } | 160 } |
| 161 | 161 |
| 162 void ScrollableArea::setScrollPosition(const DoublePoint& position, ScrollBehavi
or behavior) | 162 void ScrollableArea::setScrollPosition(const DoublePoint& position, ScrollBehavi
or behavior) |
| 163 { | 163 { |
| 164 // FIXME(417782): This should be unified with RenderLayerScrollableArea::scr
ollToOffset. | 164 // FIXME(417782): This should be unified with LayerScrollableArea::scrollToO
ffset. |
| 165 ASSERT_NOT_REACHED(); | 165 ASSERT_NOT_REACHED(); |
| 166 } | 166 } |
| 167 | 167 |
| 168 void ScrollableArea::scrollToOffsetWithoutAnimation(const FloatPoint& offset, bo
ol cancelProgrammaticAnimations) | 168 void ScrollableArea::scrollToOffsetWithoutAnimation(const FloatPoint& offset, bo
ol cancelProgrammaticAnimations) |
| 169 { | 169 { |
| 170 if (cancelProgrammaticAnimations) | 170 if (cancelProgrammaticAnimations) |
| 171 cancelProgrammaticScrollAnimation(); | 171 cancelProgrammaticScrollAnimation(); |
| 172 scrollAnimator()->scrollToOffsetWithoutAnimation(offset); | 172 scrollAnimator()->scrollToOffsetWithoutAnimation(offset); |
| 173 } | 173 } |
| 174 | 174 |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 { | 517 { |
| 518 return scrollSize(orientation); | 518 return scrollSize(orientation); |
| 519 } | 519 } |
| 520 | 520 |
| 521 float ScrollableArea::pixelStep(ScrollbarOrientation) const | 521 float ScrollableArea::pixelStep(ScrollbarOrientation) const |
| 522 { | 522 { |
| 523 return 1; | 523 return 1; |
| 524 } | 524 } |
| 525 | 525 |
| 526 } // namespace blink | 526 } // namespace blink |
| OLD | NEW |