Chromium Code Reviews| Index: Source/platform/scroll/Scrollbar.cpp |
| diff --git a/Source/platform/scroll/Scrollbar.cpp b/Source/platform/scroll/Scrollbar.cpp |
| index 12f8fc35ad36fe271873cbabd050cf3e6591e6b2..12bd604d0bfa064be66f3a3728a54403af26b7a0 100644 |
| --- a/Source/platform/scroll/Scrollbar.cpp |
| +++ b/Source/platform/scroll/Scrollbar.cpp |
| @@ -80,29 +80,17 @@ Scrollbar::Scrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orient |
| Widget::setFrameRect(IntRect(0, 0, thickness, thickness)); |
| m_currentPos = scrollableAreaCurrentPos(); |
| - |
| -#if ENABLE(OILPAN) |
| - if (m_scrollableArea) |
| - m_animator = m_scrollableArea->scrollAnimator(); |
| -#endif |
| } |
| Scrollbar::~Scrollbar() |
| { |
| - stopTimerIfNeeded(); |
| - |
| m_theme->unregisterScrollbar(this); |
| +} |
| -#if ENABLE(OILPAN) |
| - if (!m_animator) |
| - return; |
| - |
| - ASSERT(m_scrollableArea); |
| - if (m_orientation == VerticalScrollbar) |
| - m_animator->willRemoveVerticalScrollbar(this); |
| - else |
| - m_animator->willRemoveHorizontalScrollbar(this); |
| -#endif |
| +DEFINE_TRACE(Scrollbar) |
| +{ |
| + visitor->trace(m_scrollableArea); |
| + Widget::trace(visitor); |
| } |
| void Scrollbar::setFrameRect(const IntRect& frameRect) |
| @@ -156,9 +144,6 @@ void Scrollbar::offsetDidChange() |
| void Scrollbar::disconnectFromScrollableArea() |
|
haraken
2015/06/30 10:30:36
I'd add #if !ENABLE(OILPAN).
|
| { |
| m_scrollableArea = nullptr; |
| -#if ENABLE(OILPAN) |
| - m_animator = nullptr; |
| -#endif |
| } |
| void Scrollbar::setProportion(int visibleSize, int totalSize) |