Changeset 106609 in webkit

Timestamp:

Feb 2, 2012 6:04:51 PM (12 years ago)

Author:

andersca@apple.com

Message:

Add ScrollingTree class
​https://bugs.webkit.org/show_bug.cgi?id=77695

Reviewed by Andreas Kling.

• WebCore.xcodeproj/project.pbxproj:

Add new files.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::ScrollingCoordinator):
Create a scrolling tree.

(WebCore::ScrollingCoordinator::~ScrollingCoordinator):
Assert that the scrolling tree is null.

(WebCore::ScrollingCoordinator::pageDestroyed):
Null out the scrolling tree member variable and tell it to invalidate itself.

• page/scrolling/ScrollingTree.cpp: Added.

(WebCore::ScrollingTree::invalidate):
Null out the scrolling coordinator, breaking the reference cycle between the scrolling
coordinator and the scrolling tree.

• page/scrolling/ScrollingTree.h: Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• page/scrolling/ScrollingCoordinator.cpp (modified) (4 diffs)
• page/scrolling/ScrollingCoordinator.h (modified) (2 diffs)
• page/scrolling/ScrollingTree.cpp (added)
• page/scrolling/ScrollingTree.h (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-02  Anders Carlsson  <andersca@apple.com>
+
+        Add ScrollingTree class
+        https://bugs.webkit.org/show_bug.cgi?id=77695
+
+        Reviewed by Andreas Kling.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        Add new files.
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::ScrollingCoordinator):
+        Create a scrolling tree.
+
+        (WebCore::ScrollingCoordinator::~ScrollingCoordinator):
+        Assert that the scrolling tree is null.
+
+        (WebCore::ScrollingCoordinator::pageDestroyed):
+        Null out the scrolling tree member variable and tell it to invalidate itself.
+
+        * page/scrolling/ScrollingTree.cpp: Added.
+
+        (WebCore::ScrollingTree::invalidate):
+        Null out the scrolling coordinator, breaking the reference cycle between the scrolling
+        coordinator and the scrolling tree.
+    
+        * page/scrolling/ScrollingTree.h: Added.
+
 2012-02-02  Tim Dresser  <tdresser@chromium.org>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -489 +489 @@
                 1AA84F05143BA7BD0051D153 /* ScrollElasticityController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA84F03143BA7BD0051D153 /* ScrollElasticityController.h */; };
                 1AA8799011CBE846003C664F /* PluginStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA8798F11CBE846003C664F /* PluginStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                1AAADDA314DB409F00AF64B3 /* ScrollingTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */; };
+                1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */; };
                 1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */; };
                 1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */; };
@@ -7205 +7207 @@
                 1AA84F03143BA7BD0051D153 /* ScrollElasticityController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollElasticityController.h; sourceTree = "<group>"; };
                 1AA8798F11CBE846003C664F /* PluginStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginStrategy.h; sourceTree = "<group>"; };
+                1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTree.cpp; sourceTree = "<group>"; };
+                1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTree.h; sourceTree = "<group>"; };
                 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomInCursor.png; sourceTree = "<group>"; };
                 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomOutCursor.png; sourceTree = "<group>"; };
@@ -13920 +13924 @@
                                 1AF62F2014DAFE790041556C /* ScrollingThread.cpp */,
                                 1AF62F2114DAFE790041556C /* ScrollingThread.h */,
+                                1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */,
+                                1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */,
                         );
                         path = scrolling;
@@ -24099 +24105 @@
                                 1AF62EE814DA22A70041556C /* ScrollingCoordinator.h in Headers */,
                                 1AF62F2614DAFEA10041556C /* ScrollingThread.h in Headers */,
+                                1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -27027 +27034 @@
                                 1AF62F2414DAFE910041556C /* ScrollingThreadMac.mm in Sources */,
                                 1AF62F2514DAFE9E0041556C /* ScrollingThread.cpp in Sources */,
+                                1AAADDA314DB409F00AF64B3 /* ScrollingTree.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

@@ -37 +37 @@
 #include "ScrollAnimator.h"
 #include "ScrollingThread.h"
+#include "ScrollingTree.h"
 #include <wtf/Functional.h>
 #include <wtf/MainThread.h>
@@ -50 +51 @@
 ScrollingCoordinator::ScrollingCoordinator(Page* page)
     : m_page(page)
+    , m_scrollingTree(ScrollingTree::create(this))
     , m_didDispatchDidUpdateMainFrameScrollPosition(false)
 {
@@ -57 +59 @@
 {
     ASSERT(!m_page);
+    ASSERT(!m_scrollingTree);
 }
 
@@ -63 +66 @@
     ASSERT(m_page);
     m_page = 0;
+
+    // Invalidating the scrolling tree will break the reference cycle between the ScrollingCoordinator and ScrollingTree objects.
+    ScrollingThread::dispatch(bind(&ScrollingTree::invalidate, m_scrollingTree.release()));
 }
 

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h

@@ -45 +45 @@
 class Page;
 class PlatformWheelEvent;
+class ScrollingTree;
 
 #if ENABLE(GESTURE_EVENTS)
@@ -97 +98 @@
 private:
     Page* m_page;
+    RefPtr<ScrollingTree> m_scrollingTree;
 
     Mutex m_mainFrameGeometryMutex;