Changeset 148211 in webkit


Ignore:
Timestamp:
Apr 11, 2013 9:52:29 AM (11 years ago)
Author:
allan.jensen@digia.com
Message:

handleMouseMoveEvent should let hit-testing hit-test scrollbars
https://bugs.webkit.org/show_bug.cgi?id=114430

Reviewed by Antonio Gomes.

Allow hit-testing to hit-test frame scrollbars so handleMouseMoveEvent
does not have to do it itself.

  • page/EventHandler.cpp:

(WebCore::EventHandler::handleMouseMoveEvent):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r148210 r148211  
     12013-04-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        handleMouseMoveEvent should let hit-testing hit-test scrollbars
     4        https://bugs.webkit.org/show_bug.cgi?id=114430
     5
     6        Reviewed by Antonio Gomes.
     7
     8        Allow hit-testing to hit-test frame scrollbars so handleMouseMoveEvent
     9        does not have to do it itself.
     10
     11        * page/EventHandler.cpp:
     12        (WebCore::EventHandler::handleMouseMoveEvent):
     13
    1142013-04-11  Brian Holt  <brian.holt@samsung.com>
    215
  • trunk/Source/WebCore/page/EventHandler.cpp

    r148195 r148211  
    17731773        return m_lastScrollbarUnderMouse->mouseMoved(mouseEvent);
    17741774
    1775     HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestRequest::DisallowShadowContent;
     1775    HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestRequest::DisallowShadowContent | HitTestRequest::AllowFrameScrollbars;
    17761776    if (m_mousePressed)
    17771777        hitType |= HitTestRequest::Active;
     
    17941794        *hoveredNode = mev.hitTestResult();
    17951795
    1796     Scrollbar* scrollbar = 0;
    1797 
    17981796    if (m_resizeLayer && m_resizeLayer->inResizeMode())
    17991797        m_resizeLayer->resize(mouseEvent, m_offsetFromResizeCorner);
    18001798    else {
    1801         if (FrameView* view = m_frame->view())
    1802             scrollbar = view->scrollbarAtPoint(mouseEvent.position());
    1803 
    1804         if (!scrollbar)
    1805             scrollbar = mev.scrollbar();
    1806 
     1799        Scrollbar* scrollbar = mev.scrollbar();
    18071800        updateLastScrollbarUnderMouse(scrollbar, !m_mousePressed);
     1801        if (!m_mousePressed && scrollbar)
     1802            scrollbar->mouseMoved(mouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
    18081803        if (onlyUpdateScrollbars)
    18091804            return true;
     
    18261821            swallowEvent |= passMouseMoveEventToSubframe(mev, newSubframe.get(), hoveredNode);
    18271822    } else {
    1828         if (scrollbar && !m_mousePressed)
    1829             scrollbar->mouseMoved(mouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
    18301823        if (FrameView* view = m_frame->view()) {
    18311824            OptionalCursor optionalCursor = selectCursor(mev.hitTestResult(), mouseEvent.shiftKey());
Note: See TracChangeset for help on using the changeset viewer.