Changeset 106723 in webkit

Timestamp:

Feb 3, 2012 5:56:42 PM (12 years ago)

Author:

andersca@apple.com

Message:

WebKit2 should dispatch wheel events to the new ScrollingTree class
​https://bugs.webkit.org/show_bug.cgi?id=77795

Reviewed by Andreas Kling.

Source/WebCore:

• WebCore.exp.in:

Add new symbols needed by WebKit2.

• WebCore.xcodeproj/project.pbxproj:

Make ScrollingTree.h private so it can be included by WebKit2.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::scrollingTree):

• page/scrolling/ScrollingCoordinator.h:

Add a scrolling tree getter.

Source/WebKit2:

Replace all uses of ScrollingCoordinator with ScrollingTree instead.
Also, don't try to handle gesture events on the scrolling thread anymore;
we don't need to to that right now.

• WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::addScrollingTreeForPage):
(WebKit::EventDispatcher::removeScrollingTreeForPage):
(WebKit::EventDispatcher::wheelEvent):
(WebKit::EventDispatcher::gestureEvent):

• WebProcess/WebPage/EventDispatcher.h:

(WebCore):
(EventDispatcher):

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
(WebKit::TiledCoreAnimationDrawingArea::~TiledCoreAnimationDrawingArea):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebCore/page/scrolling/ScrollingCoordinator.cpp (modified) (1 diff)
• WebCore/page/scrolling/ScrollingCoordinator.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/EventDispatcher.cpp (modified) (4 diffs)
• WebKit2/WebProcess/WebPage/EventDispatcher.h (modified) (3 diffs)
• WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Anders Carlsson  <andersca@apple.com>
+
+        WebKit2 should dispatch wheel events to the new ScrollingTree class
+        https://bugs.webkit.org/show_bug.cgi?id=77795
+
+        Reviewed by Andreas Kling.
+
+        * WebCore.exp.in:
+        Add new symbols needed by WebKit2.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        Make ScrollingTree.h private so it can be included by WebKit2.
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::scrollingTree):
+        * page/scrolling/ScrollingCoordinator.h:
+        Add a scrolling tree getter.
+
 2012-02-03  Dmitry Lomov  <dslomov@google.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -2067 +2067 @@
 
 #if ENABLE(THREADED_SCROLLING)
+__ZN7WebCore13ScrollingTree21tryToHandleWheelEventERKNS_18PlatformWheelEventE
+__ZN7WebCore13ScrollingTreeD1Ev
 __ZN7WebCore20ScrollingCoordinator16handleWheelEventERKNS_18PlatformWheelEventE
 __ZN7WebCore20ScrollingCoordinatorD1Ev
 __ZN7WebCore4Page20scrollingCoordinatorEv
+__ZNK7WebCore20ScrollingCoordinator13scrollingTreeEv
 
 #if ENABLE(GESTURE_EVENTS)

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

@@ -490 +490 @@
                 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 */; };
+                1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 1AAADDBE14DC640700AF64B3 /* ScrollingTreeState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDBC14DC640600AF64B3 /* ScrollingTreeState.cpp */; };
                 1AAADDBF14DC640700AF64B3 /* ScrollingTreeState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDBD14DC640600AF64B3 /* ScrollingTreeState.h */; };

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

@@ -74 +74 @@
 }
 
+ScrollingTree* ScrollingCoordinator::scrollingTree() const
+{
+    ASSERT(m_scrollingTree);
+    return m_scrollingTree.get();
+}
+
 bool ScrollingCoordinator::coordinatesScrollingForFrameView(FrameView* frameView) const
 {

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

@@ -59 +59 @@
 
     void pageDestroyed();
+
+    ScrollingTree* scrollingTree() const;
 
     // Return whether this scrolling coordinator handles scrolling for the given frame view.

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-03  Anders Carlsson  <andersca@apple.com>
+
+        WebKit2 should dispatch wheel events to the new ScrollingTree class
+        https://bugs.webkit.org/show_bug.cgi?id=77795
+
+        Reviewed by Andreas Kling.
+
+        Replace all uses of ScrollingCoordinator with ScrollingTree instead.
+        Also, don't try to handle gesture events on the scrolling thread anymore;
+        we don't need to to that right now.
+
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::addScrollingTreeForPage):
+        (WebKit::EventDispatcher::removeScrollingTreeForPage):
+        (WebKit::EventDispatcher::wheelEvent):
+        (WebKit::EventDispatcher::gestureEvent):
+        * WebProcess/WebPage/EventDispatcher.h:
+        (WebCore):
+        (EventDispatcher):
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
+        (WebKit::TiledCoreAnimationDrawingArea::~TiledCoreAnimationDrawingArea):
+
 2012-02-03  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp

@@ -38 +38 @@
 #if ENABLE(THREADED_SCROLLING)
 #include <WebCore/ScrollingCoordinator.h>
+#include <WebCore/ScrollingTree.h>
 #endif
 
@@ -53 +54 @@
 
 #if ENABLE(THREADED_SCROLLING)
-void EventDispatcher::addScrollingCoordinatorForPage(WebPage* webPage)
+void EventDispatcher::addScrollingTreeForPage(WebPage* webPage)
 {
-    MutexLocker locker(m_scrollingCoordinatorsMutex);
+    MutexLocker locker(m_scrollingTreesMutex);
 
     ASSERT(webPage->corePage()->scrollingCoordinator());
-    ASSERT(!m_scrollingCoordinators.contains(webPage->pageID()));
-    m_scrollingCoordinators.set(webPage->pageID(), webPage->corePage()->scrollingCoordinator());
+    ASSERT(!m_scrollingTrees.contains(webPage->pageID()));
+    m_scrollingTrees.set(webPage->pageID(), webPage->corePage()->scrollingCoordinator()->scrollingTree());
 }
 
-void EventDispatcher::removeScrollingCoordinatorForPage(WebPage* webPage)
+void EventDispatcher::removeScrollingTreeForPage(WebPage* webPage)
 {
-    MutexLocker locker(m_scrollingCoordinatorsMutex);
-    ASSERT(m_scrollingCoordinators.contains(webPage->pageID()));
+    MutexLocker locker(m_scrollingTreesMutex);
+    ASSERT(m_scrollingTrees.contains(webPage->pageID()));
 
-    m_scrollingCoordinators.remove(webPage->pageID());
+    m_scrollingTrees.remove(webPage->pageID());
 }
 #endif
@@ -82 +83 @@
 {
 #if ENABLE(THREADED_SCROLLING)
-    MutexLocker locker(m_scrollingCoordinatorsMutex);
-    if (ScrollingCoordinator* scrollingCoordinator = m_scrollingCoordinators.get(pageID).get()) {
+    MutexLocker locker(m_scrollingTreesMutex);
+    if (ScrollingTree* scrollingTree = m_scrollingTrees.get(pageID).get()) {
         PlatformWheelEvent platformWheelEvent = platform(wheelEvent);
 
-        if (scrollingCoordinator->handleWheelEvent(platformWheelEvent)) {
+        if (scrollingTree->tryToHandleWheelEvent(platformWheelEvent)) {
             sendDidHandleEvent(pageID, wheelEvent);
             return;
@@ -99 +100 @@
 void EventDispatcher::gestureEvent(CoreIPC::Connection*, uint64_t pageID, const WebGestureEvent& gestureEvent)
 {
-#if ENABLE(THREADED_SCROLLING)
-    MutexLocker locker(m_scrollingCoordinatorsMutex);
-    if (ScrollingCoordinator* scrollingCoordinator = m_scrollingCoordinators.get(pageID).get()) {
-        PlatformGestureEvent platformGestureEvent = platform(gestureEvent);
-
-        if (scrollingCoordinator->handleGestureEvent(platformGestureEvent)) {
-            sendDidHandleEvent(pageID, gestureEvent);
-            return;
-        }
-    }
-#endif
-
     RunLoop::main()->dispatch(bind(&EventDispatcher::dispatchGestureEvent, this, pageID, gestureEvent));
 }

trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h

@@ -34 +34 @@
 
 namespace WebCore {
-    class ScrollingCoordinator;
+    class ScrollingTree;
 }
 
@@ -55 +55 @@
 
 #if ENABLE(THREADED_SCROLLING)
-    void addScrollingCoordinatorForPage(WebPage*);
-    void removeScrollingCoordinatorForPage(WebPage*);
+    void addScrollingTreeForPage(WebPage*);
+    void removeScrollingTreeForPage(WebPage*);
 #endif
 
@@ -81 +81 @@
     void sendDidHandleEvent(uint64_t pageID, const WebEvent&);
 
-    Mutex m_scrollingCoordinatorsMutex;
-    HashMap<uint64_t, RefPtr<WebCore::ScrollingCoordinator> > m_scrollingCoordinators;
+    Mutex m_scrollingTreesMutex;
+    HashMap<uint64_t, RefPtr<WebCore::ScrollingTree> > m_scrollingTrees;
 #endif
 };

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -67 +67 @@
     page->settings()->setScrollingCoordinatorEnabled(true);
 
-    WebProcess::shared().eventDispatcher().addScrollingCoordinatorForPage(webPage);
+    WebProcess::shared().eventDispatcher().addScrollingTreeForPage(webPage);
 #endif
 
@@ -89 +89 @@
 {
 #if ENABLE(THREADED_SCROLLING)
-    WebProcess::shared().eventDispatcher().removeScrollingCoordinatorForPage(m_webPage);
+    WebProcess::shared().eventDispatcher().removeScrollingTreeForPage(m_webPage);
 #endif