Changeset 165377 in webkit

Timestamp:

Mar 10, 2014 9:29:09 AM (10 years ago)

Author:

stavila@adobe.com

Message:

[CSS Regions] Scrolling regions with the mouse wheel only works properly if hovering over the region's padding
​https://bugs.webkit.org/show_bug.cgi?id=129485

Reviewed by Andrei Bucur.

Source/WebCore:

When searching for the region under the mouse pointer (to identify which region to scroll),
the localToAbsolute method must be called on the region container, not the region itself.
Also, when calling the offsetFromContainer method on a named flow fragment,
it must only take into consideration the border and padding of the fragment container,
not its scrolled offset.

Test: fast/regions/wheel-scrollable-single-region.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::scroll):

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

(WebCore::RenderNamedFlowFragment::offsetFromContainer):

• rendering/RenderNamedFlowFragment.h:
• rendering/RenderNamedFlowThread.cpp:

(WebCore::RenderNamedFlowThread::fragmentFromAbsolutePointAndBox):

• rendering/RenderNamedFlowThread.h:

LayoutTests:

Added layout tests for scrolling regions using the mouse wheel.

• fast/regions/wheel-scrollable-single-region-expected.html: Added.
• fast/regions/wheel-scrollable-single-region.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/wheel-scrollable-single-region-expected.html (added)
• LayoutTests/fast/regions/wheel-scrollable-single-region.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.h (modified) (1 diff)
• Source/WebCore/rendering/RenderNamedFlowFragment.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderNamedFlowFragment.h (modified) (1 diff)
• Source/WebCore/rendering/RenderNamedFlowThread.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderNamedFlowThread.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-10  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] Scrolling regions with the mouse wheel only works properly if hovering over the region's padding
+        https://bugs.webkit.org/show_bug.cgi?id=129485
+
+        Reviewed by Andrei Bucur.
+
+        Added layout tests for scrolling regions using the mouse wheel.
+
+        * fast/regions/wheel-scrollable-single-region-expected.html: Added.
+        * fast/regions/wheel-scrollable-single-region.html: Added.
+
 2014-03-10  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-10  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] Scrolling regions with the mouse wheel only works properly if hovering over the region's padding
+        https://bugs.webkit.org/show_bug.cgi?id=129485
+
+        Reviewed by Andrei Bucur.
+
+        When searching for the region under the mouse pointer (to identify which region to scroll), 
+        the localToAbsolute method must be called on the region container, not the region itself.
+        Also, when calling the offsetFromContainer method on a named flow fragment,
+        it must only take into consideration the border and padding of the fragment container,
+        not its scrolled offset.
+
+        Test: fast/regions/wheel-scrollable-single-region.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::scroll):
+        * rendering/RenderFlowThread.cpp:
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderNamedFlowFragment.cpp:
+        (WebCore::RenderNamedFlowFragment::offsetFromContainer):
+        * rendering/RenderNamedFlowFragment.h:
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore::RenderNamedFlowThread::fragmentFromAbsolutePointAndBox):
+        * rendering/RenderNamedFlowThread.h:
+
 2014-03-10  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -46 +46 @@
 #include "RenderBoxRegionInfo.h"
 #include "RenderFlexibleBox.h"
-#include "RenderFlowThread.h"
 #include "RenderGeometryMap.h"
 #include "RenderInline.h"
@@ -53 +52 @@
 #include "RenderLayerCompositor.h"
 #include "RenderNamedFlowFragment.h"
+#include "RenderNamedFlowThread.h"
 #include "RenderTableCell.h"
 #include "RenderTheme.h"
@@ -782 +782 @@
     if (nextScrollBlock && nextScrollBlock->isRenderNamedFlowThread()) {
         ASSERT(startBox);
-        nextScrollBlock = toRenderFlowThread(nextScrollBlock)->regionFromAbsolutePointAndBox(wheelEventAbsolutePoint, *startBox);
+        nextScrollBlock = toRenderNamedFlowThread(nextScrollBlock)->fragmentFromAbsolutePointAndBox(wheelEventAbsolutePoint, *startBox);
     }
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -435 +435 @@
         return region;
     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;
 }
 

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -105 +105 @@
     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; }

trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp

@@ -253 +253 @@
     return isLastRegion() && (style().regionFragment() == BreakRegionFragment);
 }
+    
+LayoutSize RenderNamedFlowFragment::offsetFromContainer(RenderObject* o, const LayoutPoint&, bool*) const
+{
+    ASSERT(&fragmentContainer() == o);
+    ASSERT(container() == o);
+    UNUSED_PARAM(o);
+    return topLeftLocationOffset();
+}
 
 void RenderNamedFlowFragment::layoutBlock(bool relayoutChildren, LayoutUnit)

trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h

@@ -69 +69 @@
     
     virtual bool shouldClipFlowThreadContent() const override;
+    
+    virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const override;
 
     bool isPseudoElementRegion() const { return parent() && parent()->isPseudoElement(); }

trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp

@@ -365 +365 @@
 
     return visualOverflowRect;
+}
+
+RenderNamedFlowFragment* RenderNamedFlowThread::fragmentFromAbsolutePointAndBox(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) {
+        RenderNamedFlowFragment* fragment = toRenderNamedFlowFragment(*iter);
+        RenderBlockFlow& fragmentContainer = fragment->fragmentContainer();
+        IntRect fragmentAbsoluteRect(roundedIntPoint(fragmentContainer.localToAbsolute()), roundedIntSize(fragmentContainer.paddingBoxRect().size()));
+        if (fragmentAbsoluteRect.contains(absolutePoint))
+            return fragment;
+        
+        if (fragment == endRegion)
+            break;
+    }
+    
+    return nullptr;
 }
 

trunk/Source/WebCore/rendering/RenderNamedFlowThread.h

@@ -70 +70 @@
 
     LayoutRect decorationsClipRectForBoxInNamedFlowFragment(const RenderBox&, RenderNamedFlowFragment&) const;
+
+    RenderNamedFlowFragment* fragmentFromAbsolutePointAndBox(const IntPoint&, const RenderBox& flowedBox);
 
     void registerNamedFlowContentElement(Element&);