Attachment #222446 for bug #123886

View Details Raw Unified Return to Bug 123886

| Differences between



2014-01-28  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 NOBODY (OOPS!).

        * 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-27  Brian Burg  <bburg@apple.com>

        Web Inspector: clean up initialization of managers and observers in InspectorTest



<!DOCTYPE html>

<style>
    body { font: 16px/16px monospace; }

    .region {
        border: 1px solid red;
        padding: 2px;
        width: 250px;
        height: 55px;
    }

    #region4 {
        height: 356px;
        position: absolute;
        left: 330px;
        top: 120px;
        border-width: thick;
    }

    p {
        margin: 0px;
    }

    #container {
        overflow: auto; 
        border: 3px solid blue;
        width: 270px;
        height: 100px; 
        padding: 10px;
    }

    .inner_scroll {
        height: 75px;
        border: 2px solid green;
        margin: 5px;
        overflow: scroll;
        padding: 5px;
    }
</style>

<script>
    onload = function() {
        if (window.eventSender) {
            eventSender.mouseMoveTo(150, 230);
            eventSender.continuousMouseScrollBy(0, -10000);
            eventSender.continuousMouseScrollBy(0, -10000);
            eventSender.mouseMoveTo(0, 0);
        }
    }
</script>

<body>
    <div>
        The text passes if everything can be scrolled normally using the mouse wheel: 
        <ul>
            <li>Scrolling inside the green div should work until it reaches the end and then the blue container should scroll.</li>
            <li>Scrolling inside the orange div should work until it reaches the end and then the blue container should NOT scroll because the region in which the orange div is flowed is absolutely positioned</li>
        </ul>
    </div>

    <div id="container">
        <div class="region">
            <p>Assume that there is enough content in the flow to fill the regions</p>
        </div>
        <div class="region">
            <div class="inner_scroll" style="height: 30px; margin-top: 0px;">
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
            </div>
        </div>
        <div class="region">
            <p style="margin-top: 1px">is less than the size of regions so that the container gets vertical</p>
        </div>
        <div class="region" id="region4">
            <p style="margin-top: 1px">scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container.</p>
            <div class="inner_scroll" style="border-color: orange;">
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
            </div>
            <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1.</p>
        </div>
    </div>
</body>



<!DOCTYPE html>

<style>
    body { font: 16px/16px monospace; }

    .region {
        -webkit-flow-from: flow;
        width: 250px;
        height: 55px;
        border: 1px solid red;
        padding: 2px;
        overflow: visible;
    }

    #region4 {
        height: auto;
        position: absolute;
        left: 330px;
        top: 120px;
        border-width: thick;
    }

    #container {
        overflow: auto; 
        border: 3px solid blue; 
        height: 100px; 
        padding: 10px;
        width: 270px;
    }

    #article {
        -webkit-flow-into: flow;
    }

    .inner_scroll {
        height: 75px;
        border: 2px solid green;
        margin: 5px;
        overflow: scroll;
        padding: 5px;
    }

    p {
        margin: 0px;
    }
</style>

<script>
    onload = function() {
        if (window.eventSender) {
            eventSender.mouseMoveTo(150, 230);
            eventSender.continuousMouseScrollBy(0, -10000);
            eventSender.continuousMouseScrollBy(0, -10000);
            eventSender.mouseMoveTo(0, 0);
        }
    }
</script>

<body>
    <div>
        The text passes if everything can be scrolled normally using the mouse wheel: 
        <ul>
            <li>Scrolling inside the green div should work until it reaches the end and then the blue container should scroll.</li>
            <li>Scrolling inside the orange div should work until it reaches the end and then the blue container should NOT scroll because the region in which the orange div is flowed is absolutely positioned</li>
        </ul>
    </div>

    <div id="container">
        <!-- content to be flowed in regions -->
        <div id="article">
            <p>Assume that there is enough content in the flow to fill the regions</p>
            <div class="inner_scroll" style="height: 30px">
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
            </div>
            <p>is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. </p>
            <div class="inner_scroll" style="border-color: orange;">
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
            </div>
            <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1.</p>
        </div>

        <!-- regions that will fragment the content -->
        <div class="region"></div>
        <div class="region"></div>
        <div class="region"></div>
        <div class="region" id="region4"></div>
    </div>
</body>



<!DOCTYPE html>

<style>
    body { font: 16px/16px monospace; }

    .region {
        border: 1px solid red;
        padding: 2px;
        width: 450px;
        height: 40px;
    }

    #region4 {
        height: 308px;
    }

    p {
        margin: 0px;
    }

    #container {
        overflow: auto; 
        border: 3px solid blue;
        width: 470px;
        height: 250px; 
        padding: 30px;
    }

    #inner_scroll {
        height: 75px;
        border: 2px solid green;
        margin: 5px;
        overflow: scroll;
        padding: 5px;
    }
</style>

<script>
    onload = function() {
        if (window.eventSender) {
            eventSender.mouseMoveTo(100, 300);
            eventSender.continuousMouseScrollBy(0, -10000);
            eventSender.mouseMoveTo(100, 100);
            eventSender.continuousMouseScrollBy(0, -10000);
            eventSender.mouseMoveTo(0, 0);
        }
    }
</script>

<body>
    <p><b>The text passes if everything can be scrolled normally using the mouse wheel. Scrolling inside the green div should work until it reaches the end and then the blue container should scroll.</b></p></br>

    <div id="container">
        <div class="region">
            <p>Assume that there is enough content in the flow to fill the regions and the size of the </p>
        </div>
        <div class="region">
            <p style="margin-top: 1px">container is less than the size of regions so that the container gets vertical scrollbar.</p>
        </div>
        <div class="region">
            <p style="margin-top: 1px">Case1. If the mouse cursor is over the flow thread fragmented content inside a region,</p>
        </div>
        <div class="region" id="region4">
            <p style="margin-top: 1px">the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content.</p>
            <div id="inner_scroll">
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
            </div>
            <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2.</p>
        </div>
    </div>
</body>



<!DOCTYPE html>

<style>
    body { font: 16px/16px monospace; }

    .region {
        -webkit-flow-from: flow;
        width: 450px;
        height: 40px;
        border: 1px solid red;
        padding: 2px;
    }

    #region4 {
        height: auto;
    }

    #container {
        overflow: auto; 
        border: 3px solid blue; 
        height: 250px; 
        padding: 30px;
        width: 470px;
    }

    #article {
        -webkit-flow-into: flow;
    }

    #inner_scroll {
        height: 75px;
        border: 2px solid green;
        margin: 5px;
        overflow: scroll;
        padding: 5px;
    }

    p {
        margin: 0px;
    }
</style>

<script>
    onload = function() {
        if (window.eventSender) {
            eventSender.mouseMoveTo(100, 300);
            eventSender.continuousMouseScrollBy(0, -10000);
            eventSender.mouseMoveTo(100, 100);
            eventSender.continuousMouseScrollBy(0, -10000);
            eventSender.mouseMoveTo(0, 0);
        }
    }
</script>

<body>
    <p><b>The text passes if everything can be scrolled normally using the mouse wheel. Scrolling inside the green div should work until it reaches the end and then the blue container should scroll.</b></p></br>

    <div id="container">
        <!-- content to be flowed in regions -->
        <div id="article">
            <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content.</p>
            <div id="inner_scroll">
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
                <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There *should be* a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
            </div>
            <p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2.</p>
        </div>

        <!-- regions that will fragment the content -->
        <div class="region"></div>
        <div class="region"></div>
        <div class="region"></div>
        <div class="region" id="region4"></div>
    </div>
</body>



2014-01-28  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 NOBODY (OOPS!).

        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-28  Mark Rowe  <mrowe@apple.com>

        <https://webkit.org/b/127767> Disable some deprecation warnings to fix the build.



    }
}

static inline bool scrollNode(float delta, ScrollGranularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Element** stopElement, IntPoint absolutePoint)
{
    if (!delta)
        return false;

        return false;
    RenderBox* enclosingBox = node->renderer()->enclosingBox();
    float absDelta = delta > 0 ? delta : -delta;

    return enclosingBox->scrollWithWheelEventLocation(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, node, stopElement, absolutePoint);
}

#if (ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS))

    
    // 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, roundedIntPoint(wheelEvent->absoluteLocation())))
        wheelEvent->setDefaultHandled();
    
    if (dominantDirection != DominantScrollDirectionHorizontal && scrollNode(wheelEvent->deltaY(), granularity, ScrollDown, ScrollUp, startNode, &stopElement, roundedIntPoint(wheelEvent->absoluteLocation())))
        wheelEvent->setDefaultHandled();
    
    if (!m_latchedWheelEventElement)



    RenderBlock* b = containingBlock();
    if (b && !b->isRenderView())
        return b->scroll(direction, granularity, multiplier, stopElement);

    return false;
}

bool RenderBox::scrollWithWheelEventLocation(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Node* startNode, Element** stopElement, IntPoint absolutePoint)
{
    RenderLayer* l = layer();
    if (l && l->scroll(direction, granularity, multiplier)) {
        if (stopElement)
            *stopElement = element();
        return true;
    }

    if (stopElement && *stopElement && *stopElement == element())
        return true;

    RenderBlock* nextScrollBlock = containingBlock();
    if (nextScrollBlock && nextScrollBlock->isRenderNamedFlowThread()) {
        RenderBox* flowedBox = this;

        if (startNode) {
            if (RenderBox* box = startNode->renderBox())
                flowedBox = box;
        }

        nextScrollBlock = toRenderFlowThread(nextScrollBlock)->regionFromAbsolutePointAndBox(absolutePoint, *flowedBox);
    }

    if (nextScrollBlock && !nextScrollBlock->isRenderView())
        return nextScrollBlock->scrollWithWheelEventLocation(direction, granularity, multiplier, startNode, stopElement, absolutePoint);

    return false;
}


Lines 453-458 public: a/Source/WebCore/rendering/RenderBox.h_sec1
- a/Source/WebCore/rendering/RenderBox.h +1 lines
453	int instrinsicScrollbarLogicalWidth() const;	453	int instrinsicScrollbarLogicalWidth() const;
454	int scrollbarLogicalHeight() const { return style().isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }	454	int scrollbarLogicalHeight() const { return style().isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
455	virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);	455	virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
		456	virtual bool scrollWithWheelEventLocation(ScrollDirection, ScrollGranularity, float multiplier, Node* startNode, Element** stopElement, IntPoint absolutePoint);
456	virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);	457	virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
457	bool canBeScrolledAndHasScrollableArea() const;	458	bool canBeScrolledAndHasScrollableArea() const;
458	virtual bool canBeProgramaticallyScrolled() const;	459	virtual bool canBeProgramaticallyScrolled() const;



        return region;
    return region ? clampBox->clampToStartAndEndRegions(region) : 0;
}

RenderRegion* RenderFlowThread::regionFromAbsolutePointAndBox(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)
{
    LayoutPoint referencePoint = startPoint;

Lines 115-120 public: a/Source/WebCore/rendering/RenderFlowThread.h_sec1
- a/Source/WebCore/rendering/RenderFlowThread.h +2 lines
115		115
116	RenderRegion* regionAtBlockOffset(const RenderBox*, LayoutUnit, bool extendLastRegion = false, RegionAutoGenerationPolicy = AllowRegionAutoGeneration);	116	RenderRegion* regionAtBlockOffset(const RenderBox*, LayoutUnit, bool extendLastRegion = false, RegionAutoGenerationPolicy = AllowRegionAutoGeneration);
117		117
		118	RenderRegion* regionFromAbsolutePointAndBox(IntPoint, const RenderBox& flowedBox);
		119
118	bool regionsHaveUniformLogicalWidth() const { return m_regionsHaveUniformLogicalWidth; }	120	bool regionsHaveUniformLogicalWidth() const { return m_regionsHaveUniformLogicalWidth; }
119	bool regionsHaveUniformLogicalHeight() const { return m_regionsHaveUniformLogicalHeight; }	121	bool regionsHaveUniformLogicalHeight() const { return m_regionsHaveUniformLogicalHeight; }
120		122

Return to Bug 123886

Lines 281-287 static inline ScrollGranularity wheelGranularityToScrollGranularity(unsigned del a/Source/WebCore/page/EventHandler.cpp_sec1
- a/Source/WebCore/page/EventHandler.cpp -4 / +5 lines
281	}	281	}
282	}	282	}
283		283
284	static inline bool scrollNode(float delta, ScrollGranularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Element** stopElement)	284	static inline bool scrollNode(float delta, ScrollGranularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Element** stopElement, IntPoint absolutePoint)
285	{	285	{
286	if (!delta)	286	if (!delta)
287	return false;	287	return false;
Lines 289-295 static inline bool scrollNode(float delta, ScrollGranularity granularity, Scroll a/Source/WebCore/page/EventHandler.cpp_sec2
289	return false;	289	return false;
290	RenderBox* enclosingBox = node->renderer()->enclosingBox();	290	RenderBox* enclosingBox = node->renderer()->enclosingBox();
291	float absDelta = delta > 0 ? delta : -delta;	291	float absDelta = delta > 0 ? delta : -delta;
292	return enclosingBox->scroll(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, stopElement);	292
		293	return enclosingBox->scrollWithWheelEventLocation(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, node, stopElement, absolutePoint);
293	}	294	}
294		295
295	#if (ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS))	296	#if (ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS))
Lines 2612-2621 void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEv a/Source/WebCore/page/EventHandler.cpp_sec3
2612		2613
2613	// Break up into two scrolls if we need to. Diagonal movement on	2614	// Break up into two scrolls if we need to. Diagonal movement on
2614	// a MacBook pro is an example of a 2-dimensional mouse wheel event (where both deltaX and deltaY can be set).	2615	// a MacBook pro is an example of a 2-dimensional mouse wheel event (where both deltaX and deltaY can be set).
2615	if (dominantDirection != DominantScrollDirectionVertical && scrollNode(wheelEvent->deltaX(), granularity, ScrollRight, ScrollLeft, startNode, &stopElement))	2616	if (dominantDirection != DominantScrollDirectionVertical && scrollNode(wheelEvent->deltaX(), granularity, ScrollRight, ScrollLeft, startNode, &stopElement, roundedIntPoint(wheelEvent->absoluteLocation())))
2616	wheelEvent->setDefaultHandled();	2617	wheelEvent->setDefaultHandled();
2617		2618
2618	if (dominantDirection != DominantScrollDirectionHorizontal && scrollNode(wheelEvent->deltaY(), granularity, ScrollDown, ScrollUp, startNode, &stopElement))	2619	if (dominantDirection != DominantScrollDirectionHorizontal && scrollNode(wheelEvent->deltaY(), granularity, ScrollDown, ScrollUp, startNode, &stopElement, roundedIntPoint(wheelEvent->absoluteLocation())))
2619	wheelEvent->setDefaultHandled();	2620	wheelEvent->setDefaultHandled();
2620		2621
2621	if (!m_latchedWheelEventElement)	2622	if (!m_latchedWheelEventElement)

Lines 775-780 bool RenderBox::scroll(ScrollDirection direction, ScrollGranularity granularity, a/Source/WebCore/rendering/RenderBox.cpp_sec1
- a/Source/WebCore/rendering/RenderBox.cpp +31 lines
775	RenderBlock* b = containingBlock();	775	RenderBlock* b = containingBlock();
776	if (b && !b->isRenderView())	776	if (b && !b->isRenderView())
777	return b->scroll(direction, granularity, multiplier, stopElement);	777	return b->scroll(direction, granularity, multiplier, stopElement);
		778
		779	return false;
		780	}
		781
		782	bool RenderBox::scrollWithWheelEventLocation(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Node* startNode, Element** stopElement, IntPoint absolutePoint)
		783	{
		784	RenderLayer* l = layer();
		785	if (l && l->scroll(direction, granularity, multiplier)) {
		786	if (stopElement)
		787	*stopElement = element();
		788	return true;
		789	}
		790
		791	if (stopElement && stopElement && stopElement == element())
		792	return true;
		793
		794	RenderBlock* nextScrollBlock = containingBlock();
		795	if (nextScrollBlock && nextScrollBlock->isRenderNamedFlowThread()) {
		796	RenderBox* flowedBox = this;
		797
		798	if (startNode) {
		799	if (RenderBox* box = startNode->renderBox())
		800	flowedBox = box;
		801	}
		802
		803	nextScrollBlock = toRenderFlowThread(nextScrollBlock)->regionFromAbsolutePointAndBox(absolutePoint, *flowedBox);
		804	}
		805
		806	if (nextScrollBlock && !nextScrollBlock->isRenderView())
		807	return nextScrollBlock->scrollWithWheelEventLocation(direction, granularity, multiplier, startNode, stopElement, absolutePoint);
		808
778	return false;	809	return false;
779	}	810	}
780		811

Lines 460-466 RenderRegion* RenderFlowThread::regionAtBlockOffset(const RenderBox* clampBox, L a/Source/WebCore/rendering/RenderFlowThread.cpp_sec1
- a/Source/WebCore/rendering/RenderFlowThread.cpp -1 / +23 lines
460	return region;	460	return region;
461	return region ? clampBox->clampToStartAndEndRegions(region) : 0;	461	return region ? clampBox->clampToStartAndEndRegions(region) : 0;
462	}	462	}
463		463
		464	RenderRegion* RenderFlowThread::regionFromAbsolutePointAndBox(IntPoint absolutePoint, const RenderBox& flowedBox)
		465	{
		466	RenderRegion* startRegion = nullptr;
		467	RenderRegion* endRegion = nullptr;
		468	getRegionRangeForBox(&flowedBox, startRegion, endRegion);
		469
		470	if (!startRegion)
		471	return nullptr;
		472
		473	for (auto iter = m_regionList.find(startRegion), end = m_regionList.end(); iter != end; ++iter) {
		474	RenderRegion* region = *iter;
		475	IntRect regionAbsoluteRect(roundedIntPoint(region->localToAbsolute()), roundedIntSize(region->frameRect().size()));
		476	if (regionAbsoluteRect.contains(absolutePoint))
		477	return region;
		478
		479	if (region == endRegion)
		480	break;
		481	}
		482
		483	return nullptr;
		484	}
		485
464	LayoutPoint RenderFlowThread::adjustedPositionRelativeToOffsetParent(const RenderBoxModelObject& boxModelObject, const LayoutPoint& startPoint)	486	LayoutPoint RenderFlowThread::adjustedPositionRelativeToOffsetParent(const RenderBoxModelObject& boxModelObject, const LayoutPoint& startPoint)
465	{	487	{
466	LayoutPoint referencePoint = startPoint;	488	LayoutPoint referencePoint = startPoint;

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +14 lines
		1	2014-01-28 Radu Stavila <stavila@adobe.com>
		2
		3	[CSSRegions] Unable to scroll a scrollable container for regions using mouse wheel
		4	https://bugs.webkit.org/show_bug.cgi?id=123886
		5
		6	Added tests for scrolling elements flowed into scrollable regions.
		7
		8	Reviewed by NOBODY (OOPS!).
		9
		10	* fast/regions/wheel-scroll-abspos-expected.html: Added.
		11	* fast/regions/wheel-scroll-abspos.html: Added.
		12	* fast/regions/wheel-scroll-expected.html: Added.
		13	* fast/regions/wheel-scroll.html: Added.
		14
1	2014-01-27 Brian Burg <bburg@apple.com>	15	2014-01-27 Brian Burg <bburg@apple.com>
2		16
3	Web Inspector: clean up initialization of managers and observers in InspectorTest	17	Web Inspector: clean up initialization of managers and observers in InspectorTest

Line 0 a/LayoutTests/fast/regions/wheel-scroll-abspos-expected.html_sec1
- a/LayoutTests/fast/regions/wheel-scroll-abspos-expected.html +84 lines
		1	<!DOCTYPE html>
		2
		3	<style>
		4	body { font: 16px/16px monospace; }
		5
		6	.region {
		7	border: 1px solid red;
		8	padding: 2px;
		9	width: 250px;
		10	height: 55px;
		11	}
		12
		13	#region4 {
		14	height: 356px;
		15	position: absolute;
		16	left: 330px;
		17	top: 120px;
		18	border-width: thick;
		19	}
		20
		21	p {
		22	margin: 0px;
		23	}
		24
		25	#container {
		26	overflow: auto;
		27	border: 3px solid blue;
		28	width: 270px;
		29	height: 100px;
		30	padding: 10px;
		31	}
		32
		33	.inner_scroll {
		34	height: 75px;
		35	border: 2px solid green;
		36	margin: 5px;
		37	overflow: scroll;
		38	padding: 5px;
		39	}
		40	</style>
		41
		42	<script>
		43	onload = function() {
		44	if (window.eventSender) {
		45	eventSender.mouseMoveTo(150, 230);
		46	eventSender.continuousMouseScrollBy(0, -10000);
		47	eventSender.continuousMouseScrollBy(0, -10000);
		48	eventSender.mouseMoveTo(0, 0);
		49	}
		50	}
		51	</script>
		52
		53	<body>
		54	<div>
		55	The text passes if everything can be scrolled normally using the mouse wheel:
		56	<ul>
		57	<li>Scrolling inside the green div should work until it reaches the end and then the blue container should scroll.</li>
		58	<li>Scrolling inside the orange div should work until it reaches the end and then the blue container should NOT scroll because the region in which the orange div is flowed is absolutely positioned</li>
		59	</ul>
		60	</div>
		61
		62	<div id="container">
		63	<div class="region">
		64	<p>Assume that there is enough content in the flow to fill the regions</p>
65	</div>
66	<div class="region">
67	<div class="inner_scroll" style="height: 30px; margin-top: 0px;">
68	<p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There should be a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
69	</div>
70	</div>
71	<div class="region">
72	<p style="margin-top: 1px">is less than the size of regions so that the container gets vertical</p>
73	</div>
74	<div class="region" id="region4">
75	<p style="margin-top: 1px">scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container.</p>
76	<div class="inner_scroll" style="border-color: orange;">
77	<p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There should be a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
78	<p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There should be a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
79	<p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1. If the mouse cursor is over the flow thread fragmented content inside a region, the user is unable to scroll the content inside the container. Case2. However, if the mouse is outside the flow thread content but still inside the container, then the user is able to scroll the container content. There should be a possibility to scroll the container content even when the mouse cursor is over the flow thread content in regions. (Case1)</p>
80	</div>
81	<p>Assume that there is enough content in the flow to fill the regions and the size of the container is less than the size of regions so that the container gets vertical scrollbar. Case1.</p>
82	</div>
83	</div>
84	</body>

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +25 lines
		1	2014-01-28 Radu Stavila <stavila@adobe.com>
		2
		3	[CSSRegions] Unable to scroll a scrollable container for regions using mouse wheel
		4	https://bugs.webkit.org/show_bug.cgi?id=123886
		5
		6	When an element flowed into a scrollable region is scrolled using the mouse wheel, the event
		7	needs to be propagated to the region containing that element, on top of which the cursor
		8	is located.
		9
		10	Reviewed by NOBODY (OOPS!).
		11
		12	Tests: fast/regions/wheel-scroll-abspos.html
		13	fast/regions/wheel-scroll.html
		14
		15	* page/EventHandler.cpp:
		16	(WebCore::scrollNode):
		17	(WebCore::EventHandler::defaultWheelEventHandler):
		18	* rendering/RenderBox.cpp:
		19	(WebCore::RenderBox::scroll):
		20	(WebCore::RenderBox::scrollWithWheelEventLocation):
		21	* rendering/RenderBox.h:
		22	* rendering/RenderFlowThread.cpp:
		23	(WebCore::RenderFlowThread::regionFromAbsolutePointAndBox):
		24	* rendering/RenderFlowThread.h:
		25
1	2014-01-28 Mark Rowe <mrowe@apple.com>	26	2014-01-28 Mark Rowe <mrowe@apple.com>
2		27
3	<https://webkit.org/b/127767> Disable some deprecation warnings to fix the build.	28	<https://webkit.org/b/127767> Disable some deprecation warnings to fix the build.