| 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 } | 149 } |
| 150 | 150 |
| 151 void ScrollableArea::notifyScrollPositionChanged(const IntPoint& position) | 151 void ScrollableArea::notifyScrollPositionChanged(const IntPoint& position) |
| 152 { | 152 { |
| 153 scrollPositionChanged(position); | 153 scrollPositionChanged(position); |
| 154 scrollAnimator()->setCurrentPosition(position); | 154 scrollAnimator()->setCurrentPosition(position); |
| 155 } | 155 } |
| 156 | 156 |
| 157 void ScrollableArea::scrollPositionChanged(const IntPoint& position) | 157 void ScrollableArea::scrollPositionChanged(const IntPoint& position) |
| 158 { | 158 { |
| 159 TRACE_EVENT0("webkit", "ScrollableArea::scrollPositionChanged"); | 159 TRACE_EVENT0("webkit,impl-scroll", "ScrollableArea::scrollPositionChanged"); |
| 160 | 160 |
| 161 IntPoint oldPosition = scrollPosition(); | 161 IntPoint oldPosition = scrollPosition(); |
| 162 // Tell the derived class to scroll its contents. | 162 // Tell the derived class to scroll its contents. |
| 163 setScrollOffset(position); | 163 setScrollOffset(position); |
| 164 | 164 |
| 165 Scrollbar* verticalScrollbar = this->verticalScrollbar(); | 165 Scrollbar* verticalScrollbar = this->verticalScrollbar(); |
| 166 | 166 |
| 167 // Tell the scrollbars to update their thumb postions. | 167 // Tell the scrollbars to update their thumb postions. |
| 168 if (Scrollbar* horizontalScrollbar = this->horizontalScrollbar()) { | 168 if (Scrollbar* horizontalScrollbar = this->horizontalScrollbar()) { |
| 169 horizontalScrollbar->offsetDidChange(); | 169 horizontalScrollbar->offsetDidChange(); |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 { | 411 { |
| 412 return scrollSize(orientation); | 412 return scrollSize(orientation); |
| 413 } | 413 } |
| 414 | 414 |
| 415 float ScrollableArea::pixelStep(ScrollbarOrientation) const | 415 float ScrollableArea::pixelStep(ScrollbarOrientation) const |
| 416 { | 416 { |
| 417 return 1; | 417 return 1; |
| 418 } | 418 } |
| 419 | 419 |
| 420 } // namespace WebCore | 420 } // namespace WebCore |
| OLD | NEW |