Changeset 177848 in webkit for trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp

Timestamp:

Jan 1, 2015, 1:20:21 PM (11 years ago)

Author:

[email protected]

Message:

Move scrolling code off of WTF::bind
​https://bugs.webkit.org/show_bug.cgi?id=140019

Reviewed by Darin Adler.

Source/WebCore:

• page/scrolling/ThreadedScrollingTree.cpp:

(WebCore::ThreadedScrollingTree::tryToHandleWheelEvent):
(WebCore::ThreadedScrollingTree::invalidate):
(WebCore::ThreadedScrollingTree::scrollingTreeNodeDidScroll):
(WebCore::ThreadedScrollingTree::handleWheelEventPhase):
(WebCore::derefScrollingCoordinator): Deleted.

• page/scrolling/ios/ScrollingTreeIOS.cpp:

(WebCore::ScrollingTreeIOS::invalidate):
(WebCore::ScrollingTreeIOS::scrollingTreeNodeDidScroll):
(WebCore::derefScrollingCoordinator): Deleted.

• page/scrolling/mac/ScrollingCoordinatorMac.mm:

(WebCore::ScrollingCoordinatorMac::pageDestroyed):
(WebCore::ScrollingCoordinatorMac::handleWheelEvent):

• platform/MemoryPressureHandler.cpp:

(WebCore::MemoryPressureHandler::releaseMemory):

• workers/WorkerThread.cpp:

(WebCore::WorkerThread::releaseFastMallocFreeMemoryInAllThreads):

Source/WebKit2:

• WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::wheelEvent):
(WebKit::EventDispatcher::touchEvent):

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::updatePreferences):

File:

• trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (modified) (3 diffs)

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

@@ -123 +123 @@
 #if ENABLE(ASYNC_SCROLLING)
     MutexLocker locker(m_scrollingTreesMutex);
-    if (ThreadedScrollingTree* scrollingTree = m_scrollingTrees.get(pageID)) {
+    if (RefPtr<ThreadedScrollingTree> scrollingTree = m_scrollingTrees.get(pageID)) {
         // FIXME: It's pretty horrible that we're updating the back/forward state here.
         // WebCore should always know the current state and know when it changes so the
         // scrolling tree can be notified.
         // We only need to do this at the beginning of the gesture.
-        if (platformWheelEvent.phase() == PlatformWheelEventPhaseBegan)
-            ScrollingThread::dispatch(bind(&ThreadedScrollingTree::setCanRubberBandState, scrollingTree, canRubberBandAtLeft, canRubberBandAtRight, canRubberBandAtTop, canRubberBandAtBottom));
+        if (platformWheelEvent.phase() == PlatformWheelEventPhaseBegan) {
+            ScrollingThread::dispatch([scrollingTree, canRubberBandAtLeft, canRubberBandAtRight, canRubberBandAtTop, canRubberBandAtBottom] {
+                scrollingTree->setCanRubberBandState(canRubberBandAtLeft, canRubberBandAtRight, canRubberBandAtTop, canRubberBandAtBottom);
+            });
+        }
 
         ScrollingTree::EventResult result = scrollingTree->tryToHandleWheelEvent(platformWheelEvent);
@@ -144 +147 @@
 #endif
 
-    RunLoop::main().dispatch(bind(&EventDispatcher::dispatchWheelEvent, this, pageID, wheelEvent));
+    RefPtr<EventDispatcher> eventDispatcher(this);
+    RunLoop::main().dispatch([eventDispatcher, pageID, wheelEvent] {
+        eventDispatcher->dispatchWheelEvent(pageID, wheelEvent);
+    }); 
 }
 
@@ -183 +189 @@
     }
 
-    if (updateListWasEmpty)
-        RunLoop::main().dispatch(bind(&EventDispatcher::dispatchTouchEvents, this));
+    if (updateListWasEmpty) {
+        RefPtr<EventDispatcher> eventDispatcher(this);
+        RunLoop::main().dispatch([eventDispatcher] {
+            eventDispatcher->dispatchTouchEvents();
+        });
+    }
 }