Changeset 163018 in webkit

Timestamp:

Jan 29, 2014 7:20:56 AM (10 years ago)

Author:

stavila@adobe.com

Message:

[CSSRegions] Unable to scroll a scrollable container for regions using mouse wheel
​https://bugs.webkit.org/show_bug.cgi?id=123886

Source/WebCore:

When an element flowed into a scrollable region is scrolled using the mouse wheel, the event
needs to be propagated to the region containing that element, on top of which the cursor
is located.

Reviewed by Antti Koivisto.

Tests: fast/regions/wheel-scroll-abspos.html

fast/regions/wheel-scroll.html

• page/EventHandler.cpp:

(WebCore::scrollNode):
(WebCore::EventHandler::defaultWheelEventHandler):

• rendering/RenderBox.cpp:

(WebCore::RenderBox::scroll):
(WebCore::RenderBox::scrollWithWheelEventLocation):

• rendering/RenderBox.h:
• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::regionFromAbsolutePointAndBox):

• rendering/RenderFlowThread.h:

LayoutTests:

Added tests for scrolling elements flowed into scrollable regions.

Reviewed by Antti Koivisto.

• fast/regions/wheel-scroll-abspos-expected.html: Added.
• fast/regions/wheel-scroll-abspos.html: Added.
• fast/regions/wheel-scroll-expected.html: Added.
• fast/regions/wheel-scroll.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/wheel-scroll-abspos-expected.html (added)
• LayoutTests/fast/regions/wheel-scroll-abspos.html (added)
• LayoutTests/fast/regions/wheel-scroll-expected.html (added)
• LayoutTests/fast/regions/wheel-scroll.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBox.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-29  Radu Stavila  <stavila@adobe.com>
+
+        [CSSRegions] Unable to scroll a scrollable container for regions using mouse wheel
+        https://bugs.webkit.org/show_bug.cgi?id=123886
+
+        Added tests for scrolling elements flowed into scrollable regions.
+
+        Reviewed by Antti Koivisto.
+
+        * fast/regions/wheel-scroll-abspos-expected.html: Added.
+        * fast/regions/wheel-scroll-abspos.html: Added.
+        * fast/regions/wheel-scroll-expected.html: Added.
+        * fast/regions/wheel-scroll.html: Added.
+
 2014-01-29  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-29  Radu Stavila  <stavila@adobe.com>
+
+        [CSSRegions] Unable to scroll a scrollable container for regions using mouse wheel
+        https://bugs.webkit.org/show_bug.cgi?id=123886
+
+        When an element flowed into a scrollable region is scrolled using the mouse wheel, the event 
+        needs to be propagated to the region containing that element, on top of which the cursor
+        is located.
+
+        Reviewed by Antti Koivisto.
+
+        Tests: fast/regions/wheel-scroll-abspos.html
+               fast/regions/wheel-scroll.html
+
+        * page/EventHandler.cpp:
+        (WebCore::scrollNode):
+        (WebCore::EventHandler::defaultWheelEventHandler):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::scroll):
+        (WebCore::RenderBox::scrollWithWheelEventLocation):
+        * rendering/RenderBox.h:
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::regionFromAbsolutePointAndBox):
+        * rendering/RenderFlowThread.h:
+
 2014-01-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -282 +282 @@
 }
 
-static inline bool scrollNode(float delta, ScrollGranularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Element** stopElement)
+static inline bool scrollNode(float delta, ScrollGranularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Element** stopElement, const IntPoint& absolutePoint)
 {
     if (!delta)
@@ -290 +290 @@
     RenderBox* enclosingBox = node->renderer()->enclosingBox();
     float absDelta = delta > 0 ? delta : -delta;
-    return enclosingBox->scroll(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, stopElement);
+
+    return enclosingBox->scrollWithWheelEventLocation(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, enclosingBox, stopElement, absolutePoint);
 }
 
@@ -2613 +2614 @@
     // Break up into two scrolls if we need to.  Diagonal movement on 
     // a MacBook pro is an example of a 2-dimensional mouse wheel event (where both deltaX and deltaY can be set).
-    if (dominantDirection != DominantScrollDirectionVertical && scrollNode(wheelEvent->deltaX(), granularity, ScrollRight, ScrollLeft, startNode, &stopElement))
+    if (dominantDirection != DominantScrollDirectionVertical && scrollNode(wheelEvent->deltaX(), granularity, ScrollRight, ScrollLeft, startNode, &stopElement, roundedIntPoint(wheelEvent->absoluteLocation())))
         wheelEvent->setDefaultHandled();
     
-    if (dominantDirection != DominantScrollDirectionHorizontal && scrollNode(wheelEvent->deltaY(), granularity, ScrollDown, ScrollUp, startNode, &stopElement))
+    if (dominantDirection != DominantScrollDirectionHorizontal && scrollNode(wheelEvent->deltaY(), granularity, ScrollDown, ScrollUp, startNode, &stopElement, roundedIntPoint(wheelEvent->absoluteLocation())))
         wheelEvent->setDefaultHandled();
     

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -761 +761 @@
 }
 
-bool RenderBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement)
-{
-    RenderLayer* l = layer();
-    if (l && l->scroll(direction, granularity, multiplier)) {
+bool RenderBox::scrollLayer(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement)
+{
+    RenderLayer* boxLayer = layer();
+    if (boxLayer && boxLayer->scroll(direction, granularity, multiplier)) {
         if (stopElement)
             *stopElement = element();
+
         return true;
     }
+
+    return false;
+}
+
+bool RenderBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement)
+{
+    if (scrollLayer(direction, granularity, multiplier, stopElement))
+        return true;
 
     if (stopElement && *stopElement && *stopElement == element())
@@ -776 +785 @@
     if (b && !b->isRenderView())
         return b->scroll(direction, granularity, multiplier, stopElement);
+
+    return false;
+}
+
+bool RenderBox::scrollWithWheelEventLocation(ScrollDirection direction, ScrollGranularity granularity, float multiplier, RenderBox* startBox, Element** stopElement, IntPoint absolutePoint)
+{
+    if (scrollLayer(direction, granularity, multiplier, stopElement))
+        return true;
+
+    if (stopElement && *stopElement && *stopElement == element())
+        return true;
+
+    RenderBlock* nextScrollBlock = containingBlock();
+    if (nextScrollBlock && nextScrollBlock->isRenderNamedFlowThread()) {
+        ASSERT(startBox);
+        nextScrollBlock = toRenderFlowThread(nextScrollBlock)->regionFromAbsolutePointAndBox(absolutePoint, *startBox);
+    }
+
+    if (nextScrollBlock && !nextScrollBlock->isRenderView())
+        return nextScrollBlock->scrollWithWheelEventLocation(direction, granularity, multiplier, startBox, stopElement, absolutePoint);
+
     return false;
 }

trunk/Source/WebCore/rendering/RenderBox.h

@@ -454 +454 @@
     int scrollbarLogicalHeight() const { return style().isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
     virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
+    virtual bool scrollWithWheelEventLocation(ScrollDirection, ScrollGranularity, float multiplier, RenderBox* startBox, Element** stopElement, IntPoint absolutePoint);
     virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
     bool canBeScrolledAndHasScrollableArea() const;
@@ -658 +659 @@
 #endif
 
+    bool scrollLayer(ScrollDirection, ScrollGranularity, float multiplier, Element** stopElement);
+
     bool fixedElementLaysOutRelativeToFrame(const FrameView&) const;
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -461 +461 @@
     return region ? clampBox->clampToStartAndEndRegions(region) : 0;
 }
-    
+
+RenderRegion* RenderFlowThread::regionFromAbsolutePointAndBox(const IntPoint& absolutePoint, const RenderBox& flowedBox)
+{
+    RenderRegion* startRegion = nullptr;
+    RenderRegion* endRegion = nullptr;
+    getRegionRangeForBox(&flowedBox, startRegion, endRegion);
+
+    if (!startRegion)
+        return nullptr;
+
+    for (auto iter = m_regionList.find(startRegion), end = m_regionList.end(); iter != end; ++iter) {
+        RenderRegion* region = *iter;
+        IntRect regionAbsoluteRect(roundedIntPoint(region->localToAbsolute()), roundedIntSize(region->frameRect().size()));
+        if (regionAbsoluteRect.contains(absolutePoint))
+            return region;
+
+        if (region == endRegion)
+            break;
+    }
+
+    return nullptr;
+}
+
 LayoutPoint RenderFlowThread::adjustedPositionRelativeToOffsetParent(const RenderBoxModelObject& boxModelObject, const LayoutPoint& startPoint)
 {

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -116 +116 @@
     RenderRegion* regionAtBlockOffset(const RenderBox*, LayoutUnit, bool extendLastRegion = false, RegionAutoGenerationPolicy = AllowRegionAutoGeneration);
 
+    RenderRegion* regionFromAbsolutePointAndBox(const IntPoint&, const RenderBox& flowedBox);
+
     bool regionsHaveUniformLogicalWidth() const { return m_regionsHaveUniformLogicalWidth; }
     bool regionsHaveUniformLogicalHeight() const { return m_regionsHaveUniformLogicalHeight; }