Part 2 of "Cleanup Scrollbar/ScrollbarClient relationship"
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Jan 2011 20:15:04 +0000 (20:15 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Jan 2011 20:15:04 +0000 (20:15 +0000)
commit5773516016b42067674370efadd9c9fc96a0bd03
tree814e667d2bdb2fc6c4f72c8eff24da798146ed39
parentceb5bb50e9a88d00e764e4b498337520d5db58ca
Part 2 of "Cleanup Scrollbar/ScrollbarClient relationship"
https://bugs.webkit.org/show_bug.cgi?id=52779

Reviewed by Anders Carlsson.

Rename ScrollbarClient -> ScrollableArea.

Source/WebCore:

- Also replaces Scrollbar::setClient with Scrollbar::disconnectFromScrollableArea
  since that was its only use case.

* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* accessibility/AccessibilityScrollbar.cpp:
(WebCore::AccessibilityScrollbar::setValue):
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::SelectorChecker::checkScrollbarPseudoClass):
* page/FrameView.h:
* platform/PopupMenuClient.h:
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::create):
(WebCore::ScrollAnimator::ScrollAnimator):
(WebCore::ScrollAnimator::scroll):
(WebCore::ScrollAnimator::notityPositionChanged):
* platform/ScrollAnimator.h:
* platform/ScrollAnimatorWin.cpp:
(WebCore::ScrollAnimator::create):
(WebCore::ScrollAnimatorWin::ScrollAnimatorWin):
(WebCore::ScrollAnimatorWin::scroll):
* platform/ScrollAnimatorWin.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::scroll):
(WebCore::ScrollView::updateScrollbars):
(WebCore::ScrollView::wheelEvent):
* platform/ScrollView.h:
* platform/ScrollableArea.cpp: Copied from WebCore/platform/ScrollbarClient.cpp.
(WebCore::ScrollableArea::ScrollableArea):
(WebCore::ScrollableArea::~ScrollableArea):
(WebCore::ScrollableArea::scroll):
(WebCore::ScrollableArea::scrollToOffsetWithoutAnimation):
(WebCore::ScrollableArea::scrollToXOffsetWithoutAnimation):
(WebCore::ScrollableArea::scrollToYOffsetWithoutAnimation):
(WebCore::ScrollableArea::setScrollOffsetFromAnimation):
* platform/ScrollableArea.h: Copied from WebCore/platform/ScrollbarClient.h.
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::createNativeScrollbar):
(WebCore::Scrollbar::Scrollbar):
(WebCore::Scrollbar::offsetDidChange):
(WebCore::Scrollbar::autoscrollPressedPart):
(WebCore::Scrollbar::moveThumb):
(WebCore::Scrollbar::mouseMoved):
(WebCore::Scrollbar::isWindowActive):
(WebCore::Scrollbar::invalidateRect):
(WebCore::Scrollbar::convertToContainingView):
(WebCore::Scrollbar::convertFromContainingView):
* platform/Scrollbar.h:
(WebCore::Scrollbar::disconnectFromScrollableArea):
(WebCore::Scrollbar::scrollableArea):
* platform/ScrollbarClient.cpp: Removed.
* platform/ScrollbarClient.h: Removed.
* platform/ScrollbarThemeComposite.cpp:
* platform/chromium/FramelessScrollView.h:
* platform/chromium/ScrollbarThemeChromium.cpp:
(WebCore::ScrollbarThemeChromium::paintTickmarks):
* platform/efl/ScrollbarEfl.cpp:
(Scrollbar::createNativeScrollbar):
(ScrollbarEfl::ScrollbarEfl):
(scrollbarEflEdjeMessage):
* platform/efl/ScrollbarEfl.h:
* platform/gtk/MainFrameScrollbarGtk.cpp:
(MainFrameScrollbarGtk::create):
(MainFrameScrollbarGtk::MainFrameScrollbarGtk):
(MainFrameScrollbarGtk::gtkValueChanged):
* platform/gtk/MainFrameScrollbarGtk.h:
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimator::create):
(WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
(WebCore::ScrollAnimatorMac::scroll):
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::paint):
* platform/qt/ScrollbarQt.cpp:
(WebCore::Scrollbar::contextMenu):
* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenuWin::scrollToRevealSelection):
(WebCore::PopupMenuWin::wndProc):
* platform/win/PopupMenuWin.h:
* platform/win/ScrollbarThemeSafari.cpp:
(WebCore::ScrollbarThemeSafari::paintTrackBackground):
(WebCore::ScrollbarThemeSafari::paintButton):
(WebCore::ScrollbarThemeSafari::paintThumb):
* platform/wx/ScrollbarThemeWx.cpp:
(WebCore::ScrollbarThemeWx::paint):
* rendering/RenderDataGrid.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollToOffset):
(WebCore::RenderLayer::destroyScrollbar):
(WebCore::RenderLayer::scroll):
* rendering/RenderLayer.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::scrollToRevealElementAtListIndex):
(WebCore::RenderListBox::scroll):
(WebCore::RenderListBox::logicalScroll):
(WebCore::RenderListBox::setScrollTop):
(WebCore::RenderListBox::destroyScrollbar):
* rendering/RenderListBox.h:
* rendering/RenderMenuList.cpp:
(WebCore::RenderMenuList::createScrollbar):
* rendering/RenderMenuList.h:
* rendering/RenderScrollbar.cpp:
(WebCore::RenderScrollbar::createCustomScrollbar):
(WebCore::RenderScrollbar::RenderScrollbar):
* rendering/RenderScrollbar.h:
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::createScrollbar):
* rendering/RenderTextControlSingleLine.h:

Source/WebKit/chromium:

* src/AutoFillPopupMenuClient.cpp:
(WebKit::AutoFillPopupMenuClient::createScrollbar):
* src/AutoFillPopupMenuClient.h:
* src/WebScrollbarImpl.cpp:
(WebKit::WebScrollbarImpl::WebScrollbarImpl):
(WebKit::WebScrollbarImpl::scroll):
(WebKit::WebScrollbarImpl::onMouseWheel):
(WebKit::WebScrollbarImpl::onKeyDown):
* src/WebScrollbarImpl.h:
* tests/PopupMenuTest.cpp:
(WebKit::TestPopupMenuClient::createScrollbar):

Source/WebKit/qt:

* Api/qwebframe.cpp:
(QWebFrame::setScrollBarValue):

Source/WebKit/win:

* WebScrollBar.cpp:
(WebScrollBar::scroll):
* WebScrollBar.h:

Source/WebKit2:

* UIProcess/win/WebPopupMenuProxyWin.cpp:
(WebKit::WebPopupMenuProxyWin::onMouseWheel):
(WebKit::WebPopupMenuProxyWin::scrollToRevealSelection):
* UIProcess/win/WebPopupMenuProxyWin.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76378 268f45cc-cd09-0410-ab3c-d52691b4dbfc
61 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/accessibility/AccessibilityScrollbar.cpp
Source/WebCore/css/CSSStyleSelector.cpp
Source/WebCore/page/FrameView.h
Source/WebCore/platform/PopupMenuClient.h
Source/WebCore/platform/ScrollAnimator.cpp
Source/WebCore/platform/ScrollAnimator.h
Source/WebCore/platform/ScrollAnimatorWin.cpp
Source/WebCore/platform/ScrollAnimatorWin.h
Source/WebCore/platform/ScrollView.cpp
Source/WebCore/platform/ScrollView.h
Source/WebCore/platform/ScrollableArea.cpp [moved from Source/WebCore/platform/ScrollbarClient.cpp with 83% similarity]
Source/WebCore/platform/ScrollableArea.h [moved from Source/WebCore/platform/ScrollbarClient.h with 94% similarity]
Source/WebCore/platform/Scrollbar.cpp
Source/WebCore/platform/Scrollbar.h
Source/WebCore/platform/ScrollbarThemeComposite.cpp
Source/WebCore/platform/chromium/FramelessScrollView.h
Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp
Source/WebCore/platform/efl/ScrollbarEfl.cpp
Source/WebCore/platform/efl/ScrollbarEfl.h
Source/WebCore/platform/gtk/MainFrameScrollbarGtk.cpp
Source/WebCore/platform/gtk/MainFrameScrollbarGtk.h
Source/WebCore/platform/mac/ScrollAnimatorMac.h
Source/WebCore/platform/mac/ScrollAnimatorMac.mm
Source/WebCore/platform/mac/ScrollbarThemeMac.mm
Source/WebCore/platform/qt/ScrollbarQt.cpp
Source/WebCore/platform/win/PopupMenuWin.cpp
Source/WebCore/platform/win/PopupMenuWin.h
Source/WebCore/platform/win/ScrollbarThemeSafari.cpp
Source/WebCore/platform/wx/ScrollbarThemeWx.cpp
Source/WebCore/rendering/RenderDataGrid.h
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderLayer.h
Source/WebCore/rendering/RenderListBox.cpp
Source/WebCore/rendering/RenderListBox.h
Source/WebCore/rendering/RenderMenuList.cpp
Source/WebCore/rendering/RenderMenuList.h
Source/WebCore/rendering/RenderScrollbar.cpp
Source/WebCore/rendering/RenderScrollbar.h
Source/WebCore/rendering/RenderTextControlSingleLine.cpp
Source/WebCore/rendering/RenderTextControlSingleLine.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/AutoFillPopupMenuClient.cpp
Source/WebKit/chromium/src/AutoFillPopupMenuClient.h
Source/WebKit/chromium/src/WebScrollbarImpl.cpp
Source/WebKit/chromium/src/WebScrollbarImpl.h
Source/WebKit/chromium/tests/PopupMenuTest.cpp
Source/WebKit/qt/Api/qwebframe.cpp
Source/WebKit/qt/ChangeLog
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebScrollBar.cpp
Source/WebKit/win/WebScrollBar.h
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp
Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.h