Index: Source/core/platform/ScrollView.cpp |
diff --git a/Source/core/platform/ScrollView.cpp b/Source/core/platform/ScrollView.cpp |
index 7174c9ba452a74c96235dc2dacf201fceaac74b2..f809a8e7005a5ee482e535398171e1ad384c425d 100644 |
--- a/Source/core/platform/ScrollView.cpp |
+++ b/Source/core/platform/ScrollView.cpp |
@@ -26,7 +26,6 @@ |
#include "config.h" |
#include "core/platform/ScrollView.h" |
-#include "core/accessibility/AXObjectCache.h" |
#include "core/platform/ScrollbarTheme.h" |
#include "core/platform/graphics/GraphicsContextStateSaver.h" |
#include "core/platform/graphics/GraphicsLayer.h" |
@@ -77,16 +76,13 @@ void ScrollView::setHasHorizontalScrollbar(bool hasBar) |
if (hasBar && !m_horizontalScrollbar) { |
m_horizontalScrollbar = createScrollbar(HorizontalScrollbar); |
addChild(m_horizontalScrollbar.get()); |
- didAddHorizontalScrollbar(m_horizontalScrollbar.get()); |
+ didAddScrollbar(m_horizontalScrollbar.get(), HorizontalScrollbar); |
m_horizontalScrollbar->styleChanged(); |
} else if (!hasBar && m_horizontalScrollbar) { |
- willRemoveHorizontalScrollbar(m_horizontalScrollbar.get()); |
+ willRemoveScrollbar(m_horizontalScrollbar.get(), HorizontalScrollbar); |
removeChild(m_horizontalScrollbar.get()); |
m_horizontalScrollbar = 0; |
} |
- |
- if (AXObjectCache* cache = axObjectCache()) |
- cache->handleScrollbarUpdate(this); |
} |
void ScrollView::setHasVerticalScrollbar(bool hasBar) |
@@ -94,16 +90,13 @@ void ScrollView::setHasVerticalScrollbar(bool hasBar) |
if (hasBar && !m_verticalScrollbar) { |
m_verticalScrollbar = createScrollbar(VerticalScrollbar); |
addChild(m_verticalScrollbar.get()); |
- didAddVerticalScrollbar(m_verticalScrollbar.get()); |
+ didAddScrollbar(m_verticalScrollbar.get(), VerticalScrollbar); |
m_verticalScrollbar->styleChanged(); |
} else if (!hasBar && m_verticalScrollbar) { |
- willRemoveVerticalScrollbar(m_verticalScrollbar.get()); |
+ willRemoveScrollbar(m_verticalScrollbar.get(), VerticalScrollbar); |
removeChild(m_verticalScrollbar.get()); |
m_verticalScrollbar = 0; |
} |
- |
- if (AXObjectCache* cache = axObjectCache()) |
- cache->handleScrollbarUpdate(this); |
} |
PassRefPtr<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation) |