Changeset 106679 in webkit
- Timestamp:
- Feb 3, 2012 11:30:19 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r106678 r106679 1 2012-02-03 Anders Carlsson <andersca@apple.com> 2 3 Add ScrollingTreeState class 4 https://bugs.webkit.org/show_bug.cgi?id=77756 5 6 Reviewed by Andreas Kling. 7 8 Add a new ScrollingTreeState whose intent is to be a data container for the current 9 scrolling tree state. the ScrollingCoordinator class will update it and periodically 10 send over the new state to the ScrollingTree object on the scrolling thread. 11 12 * WebCore.xcodeproj/project.pbxproj: 13 * page/scrolling/ScrollingCoordinator.cpp: 14 (WebCore::ScrollingCoordinator::ScrollingCoordinator): 15 * page/scrolling/ScrollingCoordinator.h: 16 (WebCore): 17 (ScrollingCoordinator): 18 * page/scrolling/ScrollingTreeState.cpp: Added. 19 (WebCore): 20 (WebCore::ScrollingTreeState::create): 21 (WebCore::ScrollingTreeState::ScrollingTreeState): 22 (WebCore::ScrollingTreeState::~ScrollingTreeState): 23 (WebCore::ScrollingTreeState::setViewportRect): 24 (WebCore::ScrollingTreeState::setContentsSize): 25 * page/scrolling/ScrollingTreeState.h: Added. 26 (WebCore): 27 (ScrollingTreeState): 28 (WebCore::ScrollingTreeState::viewportRect): 29 (WebCore::ScrollingTreeState::contentsSize): 30 1 31 2012-02-03 Beth Dakin <bdakin@apple.com> 2 32 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r106609 r106679 491 491 1AAADDA314DB409F00AF64B3 /* ScrollingTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */; }; 492 492 1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */; }; 493 1AAADDBE14DC640700AF64B3 /* ScrollingTreeState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDBC14DC640600AF64B3 /* ScrollingTreeState.cpp */; }; 494 1AAADDBF14DC640700AF64B3 /* ScrollingTreeState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDBD14DC640600AF64B3 /* ScrollingTreeState.h */; }; 493 495 1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */; }; 494 496 1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */; }; … … 7209 7211 1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTree.cpp; sourceTree = "<group>"; }; 7210 7212 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTree.h; sourceTree = "<group>"; }; 7213 1AAADDBC14DC640600AF64B3 /* ScrollingTreeState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeState.cpp; sourceTree = "<group>"; }; 7214 1AAADDBD14DC640600AF64B3 /* ScrollingTreeState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeState.h; sourceTree = "<group>"; }; 7211 7215 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomInCursor.png; sourceTree = "<group>"; }; 7212 7216 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomOutCursor.png; sourceTree = "<group>"; }; … … 13926 13930 1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */, 13927 13931 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */, 13932 1AAADDBC14DC640600AF64B3 /* ScrollingTreeState.cpp */, 13933 1AAADDBD14DC640600AF64B3 /* ScrollingTreeState.h */, 13928 13934 ); 13929 13935 path = scrolling; … … 24106 24112 1AF62F2614DAFEA10041556C /* ScrollingThread.h in Headers */, 24107 24113 1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */, 24114 1AAADDBF14DC640700AF64B3 /* ScrollingTreeState.h in Headers */, 24108 24115 ); 24109 24116 runOnlyForDeploymentPostprocessing = 0; … … 27035 27042 1AF62F2514DAFE9E0041556C /* ScrollingThread.cpp in Sources */, 27036 27043 1AAADDA314DB409F00AF64B3 /* ScrollingTree.cpp in Sources */, 27044 1AAADDBE14DC640700AF64B3 /* ScrollingTreeState.cpp in Sources */, 27037 27045 ); 27038 27046 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
r106609 r106679 38 38 #include "ScrollingThread.h" 39 39 #include "ScrollingTree.h" 40 #include "ScrollingTreeState.h" 40 41 #include <wtf/Functional.h> 41 42 #include <wtf/MainThread.h> … … 52 53 : m_page(page) 53 54 , m_scrollingTree(ScrollingTree::create(this)) 55 , m_scrollingTreeState(ScrollingTreeState::create()) 54 56 , m_didDispatchDidUpdateMainFrameScrollPosition(false) 55 57 { -
trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h
r106609 r106679 46 46 class PlatformWheelEvent; 47 47 class ScrollingTree; 48 class ScrollingTreeState; 48 49 49 50 #if ENABLE(GESTURE_EVENTS) … … 100 101 RefPtr<ScrollingTree> m_scrollingTree; 101 102 103 OwnPtr<ScrollingTreeState> m_scrollingTreeState; 104 102 105 Mutex m_mainFrameGeometryMutex; 103 106 IntRect m_mainFrameVisibleContentRect;
Note: See TracChangeset
for help on using the changeset viewer.