Changeset 83153 in webkit


Ignore:
Timestamp:
Apr 7, 2011 2:04:54 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-07 Alice Boxhall <​aboxhall@chromium.org>

Reviewed by Ryosuke Niwa.

Move the MouseEventWithHitTestResults::targetNode() method on to EventHandler.
​https://bugs.webkit.org/show_bug.cgi?id=57921

Moves the MouseEventWithHitTestResults::targetNode() method on to EventHandler, so
that the same logic can be used for a HitTestResult.

No visible changes, just cleanup, so no tests.

  • page/EventHandler.cpp: (WebCore::EventHandler::selectClosestWordFromMouseEvent): (WebCore::EventHandler::selectClosestWordOrLinkFromMouseEvent): (WebCore::EventHandler::handleMousePressEventTripleClick): (WebCore::EventHandler::handleMousePressEventSingleClick): (WebCore::EventHandler::handleMousePressEvent): (WebCore::EventHandler::handleMouseDraggedEvent): (WebCore::EventHandler::handleMouseReleaseEvent): (WebCore::EventHandler::subframeForHitTestResult): Made public static member, so that it can access targetNode(), and be accessed by webkitwebview in gtk. (WebCore::EventHandler::selectCursor): (WebCore::EventHandler::targetNode): (WebCore::EventHandler::handleMouseDoubleClickEvent): (WebCore::EventHandler::handleMouseMoveEvent): (WebCore::EventHandler::updateDragAndDrop): (WebCore::EventHandler::sendContextMenuEvent):
  • page/EventHandler.h:
  • page/MouseEventWithHitTestResults.cpp: (WebCore::MouseEventWithHitTestResults::MouseEventWithHitTestResults):
  • page/MouseEventWithHitTestResults.h:
  • page/android/EventHandlerAndroid.cpp: (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
  • page/brew/EventHandlerBrew.cpp: (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
  • page/chromium/EventHandlerChromium.cpp: (WebCore::EventHandler::passMousePressEventToSubframe): (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
  • page/efl/EventHandlerEfl.cpp: (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
  • page/gtk/EventHandlerGtk.cpp: (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
  • page/haiku/EventHandlerHaiku.cpp: (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
  • page/mac/EventHandlerMac.mm: (WebCore::EventHandler::passWidgetMouseDownEventToWidget): (WebCore::EventHandler::passSubframeEventToSubframe):
  • page/wx/EventHandlerWx.cpp: (WebCore::EventHandler::passWidgetMouseDownEventToWidget):

2011-04-07 Alice Boxhall <​aboxhall@chromium.org>

Reviewed by Ryosuke Niwa.

Move the MouseEventWithHitTestResults::targetNode() method on to EventHandler.
​https://bugs.webkit.org/show_bug.cgi?id=57921

  • webkit/webkitwebview.cpp: (webkit_web_view_forward_context_menu_event): Call subframeForHitTestResult rather than subframeForTargetNode as the targetNode() method has moved on to EventHandler.
Location:
trunk/Source
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r83151 r83153  
     12011-04-07  Alice Boxhall  <aboxhall@chromium.org>
     2
     3        Reviewed by Ryosuke Niwa.
     4
     5        Move the MouseEventWithHitTestResults::targetNode() method on to EventHandler.
     6        https://bugs.webkit.org/show_bug.cgi?id=57921
     7
     8        Moves the MouseEventWithHitTestResults::targetNode() method on to EventHandler, so
     9        that the same logic can be used for a HitTestResult.
     10
     11        No visible changes, just cleanup, so no tests.
     12
     13        * page/EventHandler.cpp:
     14        (WebCore::EventHandler::selectClosestWordFromMouseEvent):
     15        (WebCore::EventHandler::selectClosestWordOrLinkFromMouseEvent):
     16        (WebCore::EventHandler::handleMousePressEventTripleClick):
     17        (WebCore::EventHandler::handleMousePressEventSingleClick):
     18        (WebCore::EventHandler::handleMousePressEvent):
     19        (WebCore::EventHandler::handleMouseDraggedEvent):
     20        (WebCore::EventHandler::handleMouseReleaseEvent):
     21        (WebCore::EventHandler::subframeForHitTestResult):
     22        Made public static member, so that it can access targetNode(), and be accessed by
     23        webkitwebview in gtk.
     24        (WebCore::EventHandler::selectCursor):
     25        (WebCore::EventHandler::targetNode):
     26        (WebCore::EventHandler::handleMouseDoubleClickEvent):
     27        (WebCore::EventHandler::handleMouseMoveEvent):
     28        (WebCore::EventHandler::updateDragAndDrop):
     29        (WebCore::EventHandler::sendContextMenuEvent):
     30        * page/EventHandler.h:
     31        * page/MouseEventWithHitTestResults.cpp:
     32        (WebCore::MouseEventWithHitTestResults::MouseEventWithHitTestResults):
     33        * page/MouseEventWithHitTestResults.h:
     34        * page/android/EventHandlerAndroid.cpp:
     35        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
     36        * page/brew/EventHandlerBrew.cpp:
     37        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
     38        * page/chromium/EventHandlerChromium.cpp:
     39        (WebCore::EventHandler::passMousePressEventToSubframe):
     40        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
     41        * page/efl/EventHandlerEfl.cpp:
     42        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
     43        * page/gtk/EventHandlerGtk.cpp:
     44        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
     45        * page/haiku/EventHandlerHaiku.cpp:
     46        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
     47        * page/mac/EventHandlerMac.mm:
     48        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
     49        (WebCore::EventHandler::passSubframeEventToSubframe):
     50        * page/wx/EventHandlerWx.cpp:
     51        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
     52
    1532011-04-07  Pavel Podivilov  <podivilov@chromium.org>
    254

  • trunk/Source/WebCore/page/EventHandler.cpp

    r82870 r83153  
    128128const double fakeMouseMoveInterval = 0.1;
    129129
    130 static Frame* subframeForHitTestResult(const MouseEventWithHitTestResults&);
    131 
    132130static inline bool scrollNode(float delta, WheelEvent::Granularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Node** stopNode)
    133131{
    … …  
    275273void EventHandler::selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults& result)
    276274{
    277     Node* innerNode = result.targetNode();
     275    Node* innerNode = targetNode(result);
    278276    VisibleSelection newSelection;
    279277
    … …  
    302300        return selectClosestWordFromMouseEvent(result);
    303301
    304     Node* innerNode = result.targetNode();
     302    Node* innerNode = targetNode(result);
    305303
    306304    if (innerNode && innerNode->renderer() && m_mouseDownMayStartSelect) {
    … …  
    344342        return false;
    345343   
    346     Node* innerNode = event.targetNode();
     344    Node* innerNode = targetNode(event);
    347345    if (!(innerNode && innerNode->renderer() && m_mouseDownMayStartSelect))
    348346        return false;
    … …  
    374372bool EventHandler::handleMousePressEventSingleClick(const MouseEventWithHitTestResults& event)
    375373{
    376     Node* innerNode = event.targetNode();
     374    Node* innerNode = targetNode(event);
    377375    if (!(innerNode && innerNode->renderer() && m_mouseDownMayStartSelect))
    378376        return false;
    … …  
    450448    // If we got the event back, that must mean it wasn't prevented,
    451449    // so it's allowed to start a drag or selection.
    452     m_mouseDownMayStartSelect = canMouseDownStartSelect(event.targetNode());
     450    m_mouseDownMayStartSelect = canMouseDownStartSelect(targetNode(event));
    453451   
    454452#if ENABLE(DRAG_SUPPORT)
    … …  
    480478        focusDocumentView();
    481479
    482     Node* innerNode = event.targetNode();
     480    Node* innerNode = targetNode(event);
    483481
    484482    m_mousePressNode = innerNode;
    … …  
    537535        return false;
    538536
    539     Node* targetNode = event.targetNode();
     537    Node* targetNode = EventHandler::targetNode(event);
    540538    if (event.event().button() != LeftButton || !targetNode || !targetNode->renderer())
    541539        return false;
    … …  
    723721            && event.event().button() != RightButton) {
    724722        VisibleSelection newSelection;
    725         Node* node = event.targetNode();
     723        Node* node = targetNode(event);
    726724        bool caretBrowsing = m_frame->settings()->caretBrowsingEnabled();
    727725        if (node && (caretBrowsing || node->rendererIsEditable()) && node->renderer()) {
    … …  
    10981096}
    10991097
    1100 Frame* subframeForHitTestResult(const MouseEventWithHitTestResults& hitTestResult)
     1098Frame* EventHandler::subframeForHitTestResult(const MouseEventWithHitTestResults& hitTestResult)
    11011099{
    11021100    if (!hitTestResult.isOverWidget())
    11031101        return 0;
    1104     return EventHandler::subframeForTargetNode(hitTestResult.targetNode());
     1102    return subframeForTargetNode(targetNode(hitTestResult));
    11051103}
    11061104
    … …  
    11341132Cursor EventHandler::selectCursor(const MouseEventWithHitTestResults& event, Scrollbar* scrollbar)
    11351133{
    1136     Node* node = event.targetNode();
     1134    Node* node = targetNode(event);
    11371135    RenderObject* renderer = node ? node->renderer() : 0;
    11381136    RenderStyle* style = renderer ? renderer->style() : 0;
    … …  
    12991297}
    13001298
     1299Node* EventHandler::targetNode(const MouseEventWithHitTestResults& event)
     1300{
     1301    return targetNode(event.hitTestResult());
     1302}
     1303
     1304Node* EventHandler::targetNode(const HitTestResult& hitTestResult)
     1305{
     1306    Node* node = hitTestResult.innerNode();
     1307    if (!node)
     1308        return 0;
     1309    if (node->inDocument())
     1310        return node;
     1311
     1312    Element* element = node->parentElement();
     1313    if (element && element->inDocument())
     1314        return element;
     1315
     1316    return node;
     1317
     1318}
     1319
    13011320bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent)
    13021321{
    … …  
    13291348    MouseEventWithHitTestResults mev = m_frame->document()->prepareMouseEvent(request, documentPoint, mouseEvent);
    13301349
    1331     if (!mev.targetNode()) {
     1350    if (!targetNode(mev)) {
    13321351        invalidateClick();
    13331352        return false;
    13341353    }
    13351354
    1336     m_mousePressNode = mev.targetNode();
     1355    m_mousePressNode = targetNode(mev);
    13371356
    13381357    if (InspectorInstrumentation::handleMousePress(m_frame->page())) {
    … …  
    13471366        m_capturesDragging = subframe->eventHandler()->capturesDragging();
    13481367        if (m_mousePressed && m_capturesDragging) {
    1349             m_capturingMouseEventsNode = mev.targetNode();
     1368            m_capturingMouseEventsNode = targetNode(mev);
    13501369            m_eventHandlerWillResetCapturingMouseEventsNode = true;
    13511370        }
    … …  
    13641383
    13651384    m_clickCount = mouseEvent.clickCount();
    1366     m_clickNode = mev.targetNode();
     1385    m_clickNode = targetNode(mev);
    13671386
    13681387    if (FrameView* view = m_frame->view()) {
    … …  
    13801399    m_frame->selection()->setCaretBlinkingSuspended(true);
    13811400
    1382     bool swallowEvent = dispatchMouseEvent(eventNames().mousedownEvent, mev.targetNode(), true, m_clickCount, mouseEvent, true);
     1401    bool swallowEvent = dispatchMouseEvent(eventNames().mousedownEvent, targetNode(mev), true, m_clickCount, mouseEvent, true);
    13831402    m_capturesDragging = !swallowEvent;
    13841403
    … …  
    14061425        // we'd like to EventHandler::handleMousePressEvent to pass the event to the widget and thus the
    14071426        // event target node can't still be the shadow node.
    1408         if (mev.targetNode()->isShadowRoot() && mev.targetNode()->shadowHost()->hasTagName(inputTag)) {
     1427        if (targetNode(mev)->isShadowRoot() && targetNode(mev)->shadowHost()->hasTagName(inputTag)) {
    14091428            HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
    14101429            mev = m_frame->document()->prepareMouseEvent(request, documentPoint, mouseEvent);
    … …  
    14471466
    14481467    m_clickCount = mouseEvent.clickCount();
    1449     bool swallowMouseUpEvent = dispatchMouseEvent(eventNames().mouseupEvent, mev.targetNode(), true, m_clickCount, mouseEvent, false);
    1450 
    1451     bool swallowClickEvent = mouseEvent.button() != RightButton && mev.targetNode() == m_clickNode && dispatchMouseEvent(eventNames().clickEvent, mev.targetNode(), true, m_clickCount, mouseEvent, true);
     1468    bool swallowMouseUpEvent = dispatchMouseEvent(eventNames().mouseupEvent, targetNode(mev), true, m_clickCount, mouseEvent, false);
     1469
     1470    bool swallowClickEvent = mouseEvent.button() != RightButton && targetNode(mev) == m_clickNode && dispatchMouseEvent(eventNames().clickEvent, targetNode(mev), true, m_clickCount, mouseEvent, true);
    14521471
    14531472    if (m_lastScrollbarUnderMouse)
    … …  
    15751594    if (newSubframe) {
    15761595        // Update over/out state before passing the event to the subframe.
    1577         updateMouseEventTargetNode(mev.targetNode(), mouseEvent, true);
     1596        updateMouseEventTargetNode(targetNode(mev), mouseEvent, true);
    15781597       
    15791598        // Event dispatch in updateMouseEventTargetNode may have caused the subframe of the target
    … …  
    15901609                // effect on plugins (which matches Firefox).
    15911610                bool overPluginElement = false;
    1592                 if (mev.targetNode() && mev.targetNode()->isHTMLElement()) {
    1593                     HTMLElement* el = toHTMLElement(mev.targetNode());
     1611                if (targetNode(mev) && targetNode(mev)->isHTMLElement()) {
     1612                    HTMLElement* el = toHTMLElement(targetNode(mev));
    15941613                    overPluginElement = el->hasTagName(appletTag) || el->hasTagName(objectTag) || el->hasTagName(embedTag);
    15951614                }
    … …  
    16071626        return true;
    16081627   
    1609     swallowEvent = dispatchMouseEvent(eventNames().mousemoveEvent, mev.targetNode(), false, 0, mouseEvent, true);
     1628    swallowEvent = dispatchMouseEvent(eventNames().mousemoveEvent, targetNode(mev), false, 0, mouseEvent, true);
    16101629#if ENABLE(DRAG_SUPPORT)
    16111630    if (!swallowEvent)
    … …  
    16621681        return true;
    16631682
    1664     bool swallowMouseUpEvent = dispatchMouseEvent(eventNames().mouseupEvent, mev.targetNode(), true, m_clickCount, mouseEvent, false);
    1665 
    1666     bool swallowClickEvent = m_clickCount > 0 && mouseEvent.button() != RightButton && mev.targetNode() == m_clickNode && dispatchMouseEvent(eventNames().clickEvent, mev.targetNode(), true, m_clickCount, mouseEvent, true);
     1683    bool swallowMouseUpEvent = dispatchMouseEvent(eventNames().mouseupEvent, targetNode(mev), true, m_clickCount, mouseEvent, false);
     1684
     1685    bool swallowClickEvent = m_clickCount > 0 && mouseEvent.button() != RightButton && targetNode(mev) == m_clickNode && dispatchMouseEvent(eventNames().clickEvent, targetNode(mev), true, m_clickCount, mouseEvent, true);
    16671686
    16681687    if (m_resizeLayer) {
    … …  
    17411760
    17421761    // Drag events should never go to text nodes (following IE, and proper mouseover/out dispatch)
    1743     Node* newTarget = mev.targetNode();
     1762    Node* newTarget = targetNode(mev);
    17441763    if (newTarget && newTarget->isTextNode())
    17451764        newTarget = newTarget->parentNode();
    … …  
    21512170        // If the selection is non-editable, we do word selection to make it easier to use the contextual menu items
    21522171        // available for text selections.  But only if we're above text.
    2153         && (m_frame->selection()->isContentEditable() || (mev.targetNode() && mev.targetNode()->isTextNode()))) {
     2172        && (m_frame->selection()->isContentEditable() || (targetNode(mev) && targetNode(mev)->isTextNode()))) {
    21542173        m_mouseDownMayStartSelect = true; // context menu events are always allowed to perform a selection
    21552174        selectClosestWordOrLinkFromMouseEvent(mev);
    21562175    }
    21572176
    2158     swallowEvent = dispatchMouseEvent(eventNames().contextmenuEvent, mev.targetNode(), true, 0, event, false);
     2177    swallowEvent = dispatchMouseEvent(eventNames().contextmenuEvent, targetNode(mev), true, 0, event, false);
    21592178   
    21602179    return swallowEvent;

  • trunk/Source/WebCore/page/EventHandler.h

    r81835 r83153  
    144144
    145145    static Frame* subframeForTargetNode(Node*);
     146    static Frame* subframeForHitTestResult(const MouseEventWithHitTestResults&);
    146147
    147148    bool scrollOverflow(ScrollDirection, ScrollGranularity, Node* startingNode = 0);
    … …  
    262263    PassRefPtr<Clipboard> createDraggingClipboard() const;
    263264#endif // ENABLE(DRAG_SUPPORT)
    264    
     265
    265266    bool eventActivatedView(const PlatformMouseEvent&) const;
    266267    void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&);
    … …  
    268269
    269270    bool handleMouseDoubleClickEvent(const PlatformMouseEvent&);
     271
     272    static Node* targetNode(const MouseEventWithHitTestResults&);
     273    static Node* targetNode(const HitTestResult&);
    270274
    271275    bool handleMousePressEvent(const MouseEventWithHitTestResults&);

  • trunk/Source/WebCore/page/MouseEventWithHitTestResults.cpp

    r39456 r83153  
    3333{
    3434}
    35        
    36 Node* MouseEventWithHitTestResults::targetNode() const
    37 {
    38     Node* node = m_hitTestResult.innerNode();
    39     if (!node)
    40         return 0;
    41     if (node->inDocument())
    42         return node;
    43 
    44     Element* element = node->parentElement();
    45     if (element && element->inDocument())
    46         return element;
    47 
    48     return node;
    49 }
    5035
    5136const IntPoint MouseEventWithHitTestResults::localPoint() const

  • trunk/Source/WebCore/page/MouseEventWithHitTestResults.h

    r50583 r83153  
    3535    const PlatformMouseEvent& event() const { return m_event; }
    3636    const HitTestResult& hitTestResult() const { return m_hitTestResult; }
    37     Node* targetNode() const;
    3837    const IntPoint localPoint() const;
    3938    Scrollbar* scrollbar() const;

  • trunk/Source/WebCore/page/android/EventHandlerAndroid.cpp

    r80172 r83153  
    5454{
    5555    // Figure out which view to send the event to.
    56     RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0;
     56    RenderObject* target = targetNode(event) ? targetNode(event)->renderer() : 0;
    5757    if (!target || !target->isWidget())
    5858        return false;

  • trunk/Source/WebCore/page/brew/EventHandlerBrew.cpp

    r80172 r83153  
    6060{
    6161    // Figure out which view to send the event to.
    62     RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0;
     62    RenderObject* target = targetNode(event) ? targetNode(event)->renderer() : 0;
    6363    if (!target || !target->isWidget())
    6464        return false;

  • trunk/Source/WebCore/page/chromium/EventHandlerChromium.cpp

    r80185 r83153  
    6262    if (m_frame->selection()->contains(p)) {
    6363        VisiblePosition visiblePos(
    64             mev.targetNode()->renderer()->positionForPoint(mev.localPoint()));
     64            targetNode(mev)->renderer()->positionForPoint(mev.localPoint()));
    6565        VisibleSelection newSelection(visiblePos);
    6666        if (m_frame->selection()->shouldChangeSelection(newSelection))
    … …  
    104104{
    105105    // Figure out which view to send the event to.
    106     if (!event.targetNode() || !event.targetNode()->renderer() || !event.targetNode()->renderer()->isWidget())
     106    if (!targetNode(event) || !targetNode(event)->renderer() || !targetNode(event)->renderer()->isWidget())
    107107        return false;
    108     return passMouseDownEventToWidget(toRenderWidget(event.targetNode()->renderer())->widget());
     108    return passMouseDownEventToWidget(toRenderWidget(targetNode(event)->renderer())->widget());
    109109}
    110110

  • trunk/Source/WebCore/page/efl/EventHandlerEfl.cpp

    r80172 r83153  
    6262bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults& event)
    6363{
    64     RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0;
     64    RenderObject* target = targetNode(event) ? targetNode(event)->renderer() : 0;
    6565
    6666    if (!target || !target->isWidget())

  • trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp

    r80172 r83153  
    6060{
    6161    // Figure out which view to send the event to.
    62     RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0;
     62    RenderObject* target = targetNode(event) ? targetNode(event)->renderer() : 0;
    6363    if (!target || !target->isWidget())
    6464        return false;

  • trunk/Source/WebCore/page/haiku/EventHandlerHaiku.cpp

    r80172 r83153  
    7474{
    7575    // Figure out which view to send the event to.
    76     RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0;
     76    RenderObject* target = targetNode(event) ? targetNode(event)->renderer() : 0;
    7777    if (!target || !target->isWidget())
    7878        return false;

  • trunk/Source/WebCore/page/mac/EventHandlerMac.mm

    r82709 r83153  
    169169{
    170170    // Figure out which view to send the event to.
    171     RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0;
     171    RenderObject* target = targetNode(event) ? targetNode(event)->renderer() : 0;
    172172    if (!target || !target->isWidget())
    173173        return false;
    … …  
    382382       
    383383        case NSLeftMouseDown: {
    384             Node* node = event.targetNode();
     384            Node* node = targetNode(event);
    385385            if (!node)
    386386                return false;

  • trunk/Source/WebCore/page/wx/EventHandlerWx.cpp

    r80172 r83153  
    6464{
    6565    // Figure out which view to send the event to.
    66     if (!event.targetNode() || !event.targetNode()->renderer() || !event.targetNode()->renderer()->isWidget())
     66    if (!targetNode(event) || !targetNode(event)->renderer() || !targetNode(event)->renderer()->isWidget())
    6767        return false;
    6868   
    69     return passMouseDownEventToWidget(toRenderWidget(event.targetNode()->renderer())->widget());
     69    return passMouseDownEventToWidget(toRenderWidget(targetNode(event)->renderer())->widget());
    7070}
    7171

  • trunk/Source/WebKit/gtk/ChangeLog

    r82962 r83153  
     12011-04-07  Alice Boxhall  <aboxhall@chromium.org>
     2
     3        Reviewed by Ryosuke Niwa.
     4
     5        Move the MouseEventWithHitTestResults::targetNode() method on to EventHandler.
     6        https://bugs.webkit.org/show_bug.cgi?id=57921
     7
     8        * webkit/webkitwebview.cpp:
     9        (webkit_web_view_forward_context_menu_event):
     10        Call subframeForHitTestResult rather than subframeForTargetNode as the targetNode()
     11        method has moved on to EventHandler.
     12
    1132011-04-05  Martin Robinson  <mrobinson@igalia.com>
    214

  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r82962 r83153  
    320320        MouseEventWithHitTestResults mev = mainFrame->document()->prepareMouseEvent(request, point, event);
    321321
    322         Frame* targetFrame = EventHandler::subframeForTargetNode(mev.targetNode());
     322        Frame* targetFrame = EventHandler::subframeForHitTestResult(mev);
    323323        if (!targetFrame)
    324324            targetFrame = mainFrame;
Note: See TracChangeset for help on using the changeset viewer.