WebCore/ChangeLog

2010-07-02  Erik Arvidsson  <arv@chromium.org>

        Reviewed by ojan@chromium.org.

        Fix issue where a contextmenu event was reporting the wrong target if

        the context menu was shown due to pressing the context menu key

        (or Shift+F10).

        Split sendContextMenuForEvent into one case for keyboard events and use

        that when the contextmenu event should be dispatched due to a keypress.

        For the keboard case we now use the focused node as the target for the

        event and use the clipped rect to determine the position of the menu.

        https://bugs.webkit.org/show_bug.cgi?id=38129

        Use manual test since DRT does not handle context menu keys.

        * manual-tests/win/contextmenu-key.html: Added.

        * page/EventHandler.cpp:

        (WebCore::EventHandler::sendContextMenuEvent):

        (WebCore::EventHandler::sendContextMenuEventForKey):

        * page/EventHandler.h:

2010-07-02  Abhishek Arya  <inferno@chromium.org>

        Reviewed by Darin Fisher.

62399

WebCore/manual-tests/win/contextmenu-key.html

<!DOCTYPE html>

<html>

<head>

<style>

#outer {

    overflow: auto;

    width: 200px;

    height: 200px;

}

#inner {

    position: relative;

    height: 400px;

}

#inner:focus {

    background-color: lightblue;

}

#inner:active {

    background-color: blue;

}

#h, #h2 {

    background: rgba(255, 255, 255, 0);

}

#h {

    position: absolute;

    height: 200px;

    width: 200px;

}

#h2 {

    position: absolute;

    top: 200px;

    height: 200px;

    width: 100%;

}

#h:hover,

#h2:hover {

    background: pink;

}

#h:active,

#h2:active {

    background: red;

}

pre {

    position: absolute;

    left: 250px;

    top: 80px;

}

</style>

</head>

<body>

<p>Manual test for <a href="https://bugs.webkit.org/show_bug.cgi?id=38129">bug 38129</a></p>

<p>Click the div below and press the context menu key on your keyboard (Shift+F10 also works)</p>

<div id=outer>

    <div id=inner tabindex=0>

        <div id=h2></div>

    </div>

</div>

<div id=h></div>

<pre></pre>

<script>

function cs(el)

{

    if (window.getComputedStyle)

        return window.getComputedStyle(el, '');

    return el.currentStyle;

}

document.addEventListener('contextmenu', function(e)

{

    var inner = document.querySelector('#inner');

    var outer = document.querySelector('#outer');

    var h = document.querySelector('#h');

    var h2 = document.querySelector('#h2');

    var result = [];

    result.push(e.target, document.querySelector('#inner'));

    result.push(cs(inner, '').backgroundColor, 'rgb(0, 0, 255)');

    result.push(cs(h, '').backgroundColor, 'rgba(255, 255, 255, 0)');

    result.push(cs(h2, '').backgroundColor, 'rgba(255, 255, 255, 0)');

    var s = '';

    for (var i = 0; i < result.length; i += 2) {

        s += result[i] + ' == ' + result[i + 1] + ' - ' +

            (result[i] == result[i + 1] ? 'PASS' : 'FAIL') + '<br>';

    }

    document.querySelector('pre').innerHTML = s;

    return true;

}, false);

</script>

</body>

</html>

0

WebCore/page/EventHandler.cpp

@@bool EventHandler::sendContextMenuEvent(

    }

#endif

2019 swallowEvent = dispatchMouseEvent(eventNames().contextmenuEvent, mev.targetNode(), true, 0, event, ~~tru~~e);

2019 swallowEvent = dispatchMouseEvent(eventNames().contextmenuEvent, mev.targetNode(), true, 0, event, false);

    
    return swallowEvent;

}

bool EventHandler::sendContextMenuEventForKey()

{

    FrameView* view = m_frame->view();

    if (!view)

        return false;

    Document* doc = m_frame->document();

    if (!doc)

        return false;

    static const int kContextMenuMargin = 1;

#if OS(WINDOWS)

    int rightAligned = ::GetSystemMetrics(SM_MENUDROPALIGNMENT);

#else

    int rightAligned = 0;

#endif

    IntPoint location;

    Node* focusedNode = doc->focusedNode();

    SelectionController* selectionController = m_frame->selection();

    Position start = selectionController->selection().start();

    if (start.node() && (selectionController->rootEditableElement() || selectionController->isRange())) {

        RenderObject* renderer = start.node()->renderer();

        if (!renderer)

            return false;

        RefPtr<Range> selection = selectionController->toNormalizedRange();

        IntRect firstRect = m_frame->firstRectForRange(selection.get());

        int x = rightAligned ? firstRect.right() : firstRect.x();

        location = IntPoint(x, firstRect.bottom());

    } else if (focusedNode) {

        RenderBoxModelObject* box = focusedNode->renderBoxModelObject();

        IntRect clippedRect = box->absoluteClippedOverflowRect();

        location = clippedRect.bottomLeft();

    } else {

        location = IntPoint(

            rightAligned ? view->contentsWidth() - kContextMenuMargin : kContextMenuMargin,

            kContextMenuMargin);

    }

    m_frame->view()->setCursor(pointerCursor());

    IntPoint position = view->contentsToWindow(location);

    IntPoint globalPosition = view->contentsToScreen(IntRect(location, IntSize())).location();

    Node* targetNode = doc->focusedNode();

    if (!targetNode)

        targetNode = doc;

    // Use the focused node as the target for hover and active.

    HitTestResult result(position);

    result.setInnerNode(targetNode);

    HitTestRequest request(HitTestRequest::Active);

    doc->renderView()->layer()->updateHoverActiveState(request, result);

    doc->updateStyleIfNeeded();

    // The contextmenu event is a mouse event even when invoked using the keyboard.

    // This is required for web compatibility.

#if OS(WINDOWS)

    MouseEventType eventType = MouseEventReleased;

#else

    MouseEventType eventType = MouseEventPressed;

#endif

    PlatformMouseEvent mouseEvent(position, globalPosition, RightButton, eventType, 1, false, false, false, false, WTF::currentTime());

    return dispatchMouseEvent(eventNames().contextmenuEvent, targetNode, true, 0, mouseEvent, false);

}

#endif // ENABLE(CONTEXT_MENUS)

void EventHandler::scheduleHoverStateUpdate()

61791

WebCore/page/EventHandler.h

@@public:

#if ENABLE(CONTEXT_MENUS)

    bool sendContextMenuEvent(const PlatformMouseEvent&);

160 bool sendContextMenuEventForKey();

#endif

    void setMouseDownMayStartAutoscroll() { m_mouseDownMayStartAutoscroll = true; }

61791

WebKit/chromium/ChangeLog

2010-07-02  Erik Arvidsson  <arv@chromium.org>

        Reviewed by ojan@chromium.org.

        Fix issue where a contextmenu event was reporting the wrong target

        if the context menu was shown due to pressing the context menu key

        (or Shift+F10).

        https://bugs.webkit.org/show_bug.cgi?id=38129

        * src/WebViewImpl.cpp:

        (WebKit::WebViewImpl::sendContextMenuEvent):

2010-07-02  Yury Semikhatsky  <yurys@chromium.org>

        Reviewed by Pavel Feldman.

62399

WebKit/chromium/src/WebViewImpl.cpp

@@bool WebViewImpl::touchEvent(const WebTo

}

#endif

// The WebViewImpl::SendContextMenuEvent function is based on the Webkit

// function

// bool WebView::handleContextMenuEvent(WPARAM wParam, LPARAM lParam) in

// webkit\webkit\win\WebView.cpp. The only significant change in this

// function is the code to convert from a Keyboard event to the Right

// Mouse button up event.

//

// This function is an ugly copy/paste and should be cleaned up when the

// WebKitWin version is cleaned: https://bugs.webkit.org/show_bug.cgi?id=20438

673664#if OS(WINDOWS) || OS(LINUX)

674 // ~~FIXME:~~ implement on Mac

665// Mac has no way to open a context menu based on a keyboard event.

675666bool WebViewImpl::sendContextMenuEvent(const WebKeyboardEvent& event)

676667{

    static const int kContextMenuMargin = 1;

    Frame* mainFrameImpl = page()->mainFrame();

    FrameView* view = mainFrameImpl->view();

    if (!view)

        return false;

    IntPoint coords(-1, -1);

#if OS(WINDOWS)

    int rightAligned = ::GetSystemMetrics(SM_MENUDROPALIGNMENT);

#else

    int rightAligned = 0;

#endif

    IntPoint location;

    Frame* focusedFrame = page()->focusController()->focusedOrMainFrame();

    Node* focusedNode = focusedFrame->document()->focusedNode();

    Position start = mainFrameImpl->selection()->selection().start();

    if (start.node()) {

        RenderObject* renderer = start.node()->renderer();

        if (!renderer)

            return false;

        RefPtr<Range> selection = mainFrameImpl->selection()->toNormalizedRange();

        IntRect firstRect = mainFrameImpl->firstRectForRange(selection.get());

        int x = rightAligned ? firstRect.right() : firstRect.x();

        location = IntPoint(x, firstRect.bottom());

    } else if (focusedNode)

        location = focusedNode->getRect().bottomLeft();

    else {

        location = IntPoint(

            rightAligned ? view->contentsWidth() - kContextMenuMargin : kContextMenuMargin,

            kContextMenuMargin);

    }

    location = view->contentsToWindow(location);

    // FIXME: The IntSize(0, -1) is a hack to get the hit-testing to result in

    // the selected element. Ideally we'd have the position of a context menu

    // event be separate from its target node.

    coords = location + IntSize(0, -1);

    // The contextMenuController() holds onto the last context menu that was

    // popped up on the page until a new one is created. We need to clear

    // this menu before propagating the event through the DOM so that we can

@@bool WebViewImpl::sendContextMenuEvent(c

    // not run.

    page()->contextMenuController()->clearContextMenu();

    focusedFrame->view()->setCursor(pointerCursor());

    WebMouseEvent mouseEvent;

    mouseEvent.button = WebMouseEvent::ButtonRight;

    mouseEvent.x = coords.x();

    mouseEvent.y = coords.y();

    mouseEvent.type = WebInputEvent::MouseUp;

    PlatformMouseEventBuilder platformEvent(view, mouseEvent);

737676 m_contextMenuAllowed = true;

738 bool handled = focusedFrame->eventHandler()->sendContextMenuEvent(platformEvent);

677 Frame* focusedFrame = page()->focusController()->focusedOrMainFrame();

678 bool handled = focusedFrame->eventHandler()->sendContextMenuEventForKey();

    m_contextMenuAllowed = false;

    return handled;

}

61791

WebKit/win/ChangeLog

2010-07-02  Erik Arvidsson  <arv@chromium.org>

        Reviewed by ojan@chromium.org.

        Fix issue where a contextmenu event was reporting the wrong target

        if the context menu was shown due to pressing the context menu key

        (or Shift+F10).

        * WebView.cpp:

        (WebView::handleContextMenuEvent):

2010-07-01  Steve Falkenburg  <sfalken@apple.com>

        Reviewed by Adele Peterson.

62399

WebKit/win/WebView.cpp

@@Page* WebView::page()

bool WebView::handleContextMenuEvent(WPARAM wParam, LPARAM lParam)

{

1191 static const int contextMenuMargin = 1;

1192

    // Translate the screen coordinates into window coordinates

    POINT coords = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };

    if (coords.x == -1 || coords.y == -1) {

        FrameView* view = m_page->mainFrame()->view();

        if (!view)

            return false;

        // The contextMenuController() holds onto the last context menu that was popped up on the

        // page until a new one is created. We need to clear this menu before propagating the event

        // through the DOM so that we can detect if we create a new menu for this event, since we

        // won't create a new menu if the DOM swallows the event and the defaultEventHandler does

        // not run.

        m_page->contextMenuController()->clearContextMenu();

11991200

1200 ~~int~~ ~~rightAlign~~ed = ~~::GetSystemMe~~tr~~ics(SM_MENUDROPALIGNMENT~~);

1201 I~~ntP~~oi~~nt location~~;

1201 Frame* focusedFrame = m_page->focusController()->focusedOrMainFrame();

1202 return focusedFrame->eventHandler()->sendContextMenuEventForKey();

12021203

        // The context menu event was generated from the keyboard, so show the context menu by the current selection.

        Position start = m_page->mainFrame()->selection()->selection().start();

        Position end = m_page->mainFrame()->selection()->selection().end();

        if (!start.node() || !end.node())

            location = IntPoint(rightAligned ? view->contentsWidth() - contextMenuMargin : contextMenuMargin, contextMenuMargin);

        else {

            RenderObject* renderer = start.node()->renderer();

            if (!renderer)

                return false;

            // Calculate the rect of the first line of the selection (cribbed from -[WebCoreFrameBridge firstRectForDOMRange:],

            // now Frame::firstRectForRange(), which perhaps this should call).

            int extraWidthToEndOfLine = 0;

            InlineBox* startInlineBox;

            int startCaretOffset;

            start.getInlineBoxAndOffset(DOWNSTREAM, startInlineBox, startCaretOffset);

            IntRect startCaretRect = renderer->localCaretRect(startInlineBox, startCaretOffset, &extraWidthToEndOfLine);

            if (startCaretRect != IntRect())

                startCaretRect = renderer->localToAbsoluteQuad(FloatRect(startCaretRect)).enclosingBoundingBox();

            InlineBox* endInlineBox;

            int endCaretOffset;

            end.getInlineBoxAndOffset(UPSTREAM, endInlineBox, endCaretOffset);

            IntRect endCaretRect = renderer->localCaretRect(endInlineBox, endCaretOffset);

            if (endCaretRect != IntRect())

                endCaretRect = renderer->localToAbsoluteQuad(FloatRect(endCaretRect)).enclosingBoundingBox();

            IntRect firstRect;

            if (startCaretRect.y() == endCaretRect.y())

                firstRect = IntRect(min(startCaretRect.x(), endCaretRect.x()), startCaretRect.y(), abs(endCaretRect.x() - startCaretRect.x()), max(startCaretRect.height(), endCaretRect.height()));

            else

                firstRect = IntRect(startCaretRect.x(), startCaretRect.y(), startCaretRect.width() + extraWidthToEndOfLine, startCaretRect.height());

            location = IntPoint(rightAligned ? firstRect.right() : firstRect.x(), firstRect.bottom());

        }

        location = view->contentsToWindow(location);

        // FIXME: The IntSize(0, -1) is a hack to get the hit-testing to result in the selected element.

        // Ideally we'd have the position of a context menu event be separate from its target node.

        coords = location + IntSize(0, -1);

    } else {

        if (!::ScreenToClient(m_viewWindow, &coords))

            return false;

@@bool WebView::handleContextMenuEvent(WPA

    lParam = MAKELPARAM(coords.x, coords.y);

    // The contextMenuController() holds onto the last context menu that was popped up on the

    // page until a new one is created. We need to clear this menu before propagating the event

    // through the DOM so that we can detect if we create a new menu for this event, since we

    // won't create a new menu if the DOM swallows the event and the defaultEventHandler does

    // not run.

    m_page->contextMenuController()->clearContextMenu();

    IntPoint documentPoint(m_page->mainFrame()->view()->windowToContents(coords));

61791