Changeset 107013 in webkit

Timestamp:

Feb 7, 2012 5:00:06 PM (12 years ago)

Author:

andersca@apple.com

Message:

Use the non-fast-scrollable region to detect when we can't do fast scrolling
​https://bugs.webkit.org/show_bug.cgi?id=78056
<rdar://problem/10247932>

Reviewed by Sam Weinig.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::frameViewLayoutUpdated):
Actually set the non-fast scrollable region on the scrolling tree state.

• page/scrolling/ScrollingTree.cpp:

(WebCore::ScrollingTree::tryToHandleWheelEvent):
Check if the wheel event's position is inside the non-fast-scrollable region
and return false if it is.

(WebCore::ScrollingTree::updateMainFrameScrollPosition):
Store the cached main frame scroll position so we can use it in tryToHandleWheelEvent.

• platform/graphics/Region.cpp:
• platform/graphics/Region.h:

Add a simple contains(const IntPoint&) member function.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingCoordinator.cpp (modified) (1 diff)
• page/scrolling/ScrollingTree.cpp (modified) (2 diffs)
• page/scrolling/ScrollingTree.h (modified) (1 diff)
• platform/graphics/Region.cpp (modified) (1 diff)
• platform/graphics/Region.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-07  Anders Carlsson  <andersca@apple.com>
+
+        Use the non-fast-scrollable region to detect when we can't do fast scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=78056
+        <rdar://problem/10247932>
+
+        Reviewed by Sam Weinig.
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::frameViewLayoutUpdated):
+        Actually set the non-fast scrollable region on the scrolling tree state.
+
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::tryToHandleWheelEvent):
+        Check if the wheel event's position is inside the non-fast-scrollable region
+        and return false if it is.
+
+        (WebCore::ScrollingTree::updateMainFrameScrollPosition):
+        Store the cached main frame scroll position so we can use it in tryToHandleWheelEvent.
+
+        * platform/graphics/Region.cpp:
+        * platform/graphics/Region.h:
+        Add a simple contains(const IntPoint&) member function.
+
 2012-02-07  Dan Bernstein  <mitz@apple.com>
 

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

@@ -118 +118 @@
     m_scrollingTreeState->setViewportRect(IntRect(IntPoint(), frameView->visibleContentRect().size()));
     m_scrollingTreeState->setContentsSize(frameView->contentsSize());
+    m_scrollingTreeState->setNonFastScrollableRegion(nonScrollableRegion);
     scheduleTreeStateCommit();
 }

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

@@ -62 +62 @@
         if (m_hasWheelEventHandlers)
             return false;
+
+        if (!m_nonFastScrollableRegion.isEmpty()) {
+            // FIXME: This is not correct for non-default scroll origins.
+            IntPoint position = wheelEvent.position();
+            position.moveBy(m_mainFrameScrollPosition);
+            if (m_nonFastScrollableRegion.contains(position))
+                return false;
+        }
     }
-
-    // FIXME: Check if we're over a subframe or overflow div.
 
     ScrollingThread::dispatch(bind(&ScrollingTree::handleWheelEvent, this, wheelEvent));
@@ -107 +113 @@
         return;
 
+    {
+        MutexLocker lock(m_mutex);
+        m_mainFrameScrollPosition = scrollPosition;
+    }
+
     callOnMainThread(bind(&ScrollingCoordinator::updateMainFrameScrollPosition, m_scrollingCoordinator.get(), scrollPosition));
 }

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

@@ -74 +74 @@
     Mutex m_mutex;
     Region m_nonFastScrollableRegion;
+    IntPoint m_mainFrameScrollPosition;
     bool m_hasWheelEventHandlers;
 };

trunk/Source/WebCore/platform/graphics/Region.cpp

@@ -71 +71 @@
 }
 
+bool Region::contains(const IntPoint& point) const
+{
+    // FIXME: This is inefficient. We should be able to iterate over the spans and find
+    // out if the region contains the point.
+    return contains(IntRect(point, IntSize(1, 1)));
+}
+
 Region::Shape::Shape()
 {

trunk/Source/WebCore/platform/graphics/Region.h

@@ -50 +50 @@
     // Returns true if the query region is a subset of this region.
     bool contains(const Region&) const;
+
+    bool contains(const IntPoint&) const;
 
 #ifndef NDEBUG