Changeset 103421 in webkit
- Timestamp:
- Dec 21, 2011 11:41:12 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 1 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r103419 r103421 1 2011-12-21 Anders Carlsson <andersca@apple.com> 2 3 Get rid of ScrollableAreaClient 4 https://bugs.webkit.org/show_bug.cgi?id=75021 5 6 Reviewed by Sam Weinig. 7 8 The ScrollableAreaClient interface will just add an extra level of indirection between ScrollableArea and 9 ScrollAnimator, which is unnecessary. Eventually I'd like to rename ScrollAnimator to something that better reflects 10 all the different responsibilities it currently has. 11 12 * WebCore.exp.in: 13 * page/FrameView.cpp: 14 (WebCore::FrameView::FrameView): 15 * page/ScrollingCoordinator.cpp: 16 * page/ScrollingCoordinator.h: 17 * platform/ScrollView.cpp: 18 (WebCore::ScrollView::ScrollView): 19 * platform/ScrollView.h: 20 * platform/ScrollableArea.cpp: 21 (WebCore::ScrollableArea::ScrollableArea): 22 * platform/ScrollableArea.h: 23 * platform/ScrollableAreaClient.h: Removed. 24 1 25 2011-12-21 Anders Carlsson <andersca@apple.com> 2 26 -
trunk/Source/WebCore/WebCore.exp.in
r103362 r103421 380 380 __ZN7WebCore14ScrollableArea29willRemoveHorizontalScrollbarEPNS_9ScrollbarE 381 381 __ZN7WebCore14ScrollableArea6scrollENS_15ScrollDirectionENS_17ScrollGranularityEf 382 __ZN7WebCore14ScrollableAreaC2E PNS_20ScrollableAreaClientE382 __ZN7WebCore14ScrollableAreaC2Ev 383 383 __ZN7WebCore14ScrollableAreaD2Ev 384 384 __ZN7WebCore14ScrollbarTheme5themeEv -
trunk/Source/WebCore/page/FrameView.cpp
r103362 r103421 125 125 } 126 126 127 static inline ScrollableAreaClient* scrollableAreaClient(Frame* frame)128 {129 #if ENABLE(THREADED_SCROLLING)130 if (Page* page = frame ? frame->page() : 0) {131 if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())132 return scrollingCoordinator->scrollableAreaClientForFrame(frame);133 }134 #else135 UNUSED_PARAM(frame);136 #endif137 138 return 0;139 }140 141 127 FrameView::FrameView(Frame* frame) 142 : ScrollView(scrollableAreaClient(frame)) 143 , m_frame(frame) 128 : m_frame(frame) 144 129 , m_canHaveScrollbars(true) 145 130 , m_slowRepaintObjectCount(0) -
trunk/Source/WebCore/page/ScrollingCoordinator.cpp
r103342 r103421 55 55 { 56 56 ASSERT(!m_page); 57 }58 59 ScrollableAreaClient* ScrollingCoordinator::scrollableAreaClientForFrame(Frame*)60 {61 // FIXME: Implement.62 return 0;63 57 } 64 58 -
trunk/Source/WebCore/page/ScrollingCoordinator.h
r103342 r103421 45 45 class Page; 46 46 class PlatformWheelEvent; 47 class ScrollableAreaClient;48 47 49 48 #if ENABLE(GESTURE_EVENTS) … … 57 56 58 57 void pageDestroyed(); 59 60 // Return a scrollable area client for the given frame.61 ScrollableAreaClient* scrollableAreaClientForFrame(Frame*);62 58 63 59 // Should be called whenever the scroll layer for the given frame changes. -
trunk/Source/WebCore/platform/ScrollView.cpp
r103342 r103421 42 42 namespace WebCore { 43 43 44 ScrollView::ScrollView(ScrollableAreaClient *client) 45 : ScrollableArea(client) 46 , m_horizontalScrollbarMode(ScrollbarAuto) 44 ScrollView::ScrollView() 45 : m_horizontalScrollbarMode(ScrollbarAuto) 47 46 , m_verticalScrollbarMode(ScrollbarAuto) 48 47 , m_horizontalScrollbarLock(false) -
trunk/Source/WebCore/platform/ScrollView.h
r103362 r103421 294 294 295 295 protected: 296 ScrollView( ScrollableAreaClient* = 0);296 ScrollView(); 297 297 298 298 virtual void repaintContentRectangle(const IntRect&, bool now = false); -
trunk/Source/WebCore/platform/ScrollableArea.cpp
r103362 r103421 43 43 namespace WebCore { 44 44 45 ScrollableArea::ScrollableArea(ScrollableAreaClient* client) 46 : m_client(client) 47 , m_constrainsScrollingToContentEdge(true) 45 ScrollableArea::ScrollableArea() 46 : m_constrainsScrollingToContentEdge(true) 48 47 , m_inLiveResize(false) 49 48 , m_verticalScrollElasticity(ScrollElasticityNone) … … 52 51 , m_scrollOriginChanged(false) 53 52 { 54 // FIXME: If no client was supplied, create a default one.55 53 } 56 54 -
trunk/Source/WebCore/platform/ScrollableArea.h
r103362 r103421 37 37 class PlatformWheelEvent; 38 38 class ScrollAnimator; 39 class ScrollableAreaClient;40 39 #if USE(ACCELERATED_COMPOSITING) 41 40 class GraphicsLayer; … … 176 175 177 176 protected: 178 explicit ScrollableArea(ScrollableAreaClient* = 0);177 ScrollableArea(); 179 178 virtual ~ScrollableArea(); 180 179 … … 200 199 201 200 private: 202 ScrollableAreaClient* m_client;203 204 201 // NOTE: Only called from the ScrollAnimator. 205 202 friend class ScrollAnimator;
Note: See TracChangeset
for help on using the changeset viewer.