<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[81619] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/81619">81619</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2011-03-21 16:34:31 -0700 (Mon, 21 Mar 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: showContextMenu not working in WK2
https://bugs.webkit.org/show_bug.cgi?id=56734

Reviewed by Darin Adler.

../WebCore: 

WebKit2 is not able to directly open a context menu because the UI is in the other process.
Instead the chrome client should be used. This also means implementing showContextMenu() in WebKit1
code.
        
* accessibility/mac/AccessibilityObjectWrapper.mm:
(-[AccessibilityObjectWrapper accessibilityShowContextMenu]):

../WebKit/mac: 

Implement showContextMenu() so accessibility related code can call this
independent of whether WK1 or WK2 is running.

* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::showContextMenu):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacAccessibilityObjectWrappermm">trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (81618 => 81619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2011-03-21 23:19:13 UTC (rev 81618)
+++ trunk/Source/WebCore/ChangeLog      2011-03-21 23:34:31 UTC (rev 81619)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2011-03-21  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: showContextMenu not working in WK2
+        https://bugs.webkit.org/show_bug.cgi?id=56734
+
+        WebKit2 is not able to directly open a context menu because the UI is in the other process.
+        Instead the chrome client should be used. This also means implementing showContextMenu() in WebKit1
+        code.
+        
+        * accessibility/mac/AccessibilityObjectWrapper.mm:
+        (-[AccessibilityObjectWrapper accessibilityShowContextMenu]):
+
</ins><span class="cx"> 2011-03-21  Robert Kroeger  <rjkroege@chromium.org>
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Antonio Gomes.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacAccessibilityObjectWrappermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm (81618 => 81619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm     2011-03-21 23:19:13 UTC (rev 81618)
+++ trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm        2011-03-21 23:34:31 UTC (rev 81619)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #import "AccessibilityTableCell.h"
</span><span class="cx"> #import "AccessibilityTableRow.h"
</span><span class="cx"> #import "AccessibilityTableColumn.h"
</span><ins>+#import "Chrome.h"
</ins><span class="cx"> #import "ColorMac.h"
</span><span class="cx"> #import "Frame.h"
</span><span class="cx"> #import "FrameLoaderClient.h"
</span><span class="lines">@@ -2330,28 +2331,20 @@
</span><span class="cx">     FrameView* frameView = m_object->documentFrameView();
</span><span class="cx">     if (!frameView)
</span><span class="cx">         return;
</span><ins>+    Frame* frame = frameView->frame();
+    if (!frame)
+        return;
+    Page* page = frame->page();
+    if (!page)
+        return;
</ins><span class="cx"> 
</span><del>-    // simulate a click in the middle of the object
</del><ins>+    // Simulate a click in the middle of the object.
</ins><span class="cx">     IntPoint clickPoint = m_object->clickPoint();
</span><del>-    NSPoint nsClickPoint = NSMakePoint(clickPoint.x(), clickPoint.y());
</del><span class="cx">     
</span><del>-    NSView* view = nil;
-    if (m_object->isAttachment())
-        view = [self attachmentView];
-    else
-        view = frameView->documentView();
-    
-    if (!view)
-        return;
-    
-    NSPoint nsScreenPoint = [view convertPoint:nsClickPoint toView:nil];
-    
-    // Show the contextual menu for this event.
-    NSEvent* event = [NSEvent mouseEventWithType:NSRightMouseDown location:nsScreenPoint modifierFlags:0 timestamp:0 windowNumber:[[view window] windowNumber] context:0 eventNumber:0 clickCount:1 pressure:1];
-    NSMenu* menu = [view menuForEvent:event];
-    
-    if (menu)
-        [NSMenu popUpContextMenu:menu withEvent:event forView:view];    
</del><ins>+    PlatformMouseEvent mouseEvent(clickPoint, clickPoint, RightButton, MouseEventPressed, 1, false, false, false, false, currentTime());
+    bool handled = frame->eventHandler()->sendContextMenuEvent(mouseEvent);
+    if (handled)
+        page->chrome()->showContextMenu();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)accessibilityPerformAction:(NSString*)action
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (81618 => 81619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2011-03-21 23:19:13 UTC (rev 81618)
+++ trunk/Source/WebKit/mac/ChangeLog   2011-03-21 23:34:31 UTC (rev 81619)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2011-03-21  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: showContextMenu not working in WK2
+        https://bugs.webkit.org/show_bug.cgi?id=56734
+
+        Implement showContextMenu() so accessibility related code can call this
+        independent of whether WK1 or WK2 is running.
+
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::showContextMenu):
+
</ins><span class="cx"> 2011-03-21  Chang Shu  <cshu@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Alexey Proskuryakov.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (81618 => 81619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2011-03-21 23:19:13 UTC (rev 81618)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h    2011-03-21 23:34:31 UTC (rev 81619)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>-    virtual void showContextMenu() { }
</del><ins>+    virtual void showContextMenu();
</ins><span class="cx"> #endif
</span><span class="cx"> private:
</span><span class="cx">     WebView *m_webView;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (81618 => 81619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm        2011-03-21 23:19:13 UTC (rev 81618)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm   2011-03-21 23:34:31 UTC (rev 81619)
</span><span class="lines">@@ -51,14 +51,18 @@
</span><span class="cx"> #import <WebCore/BlockExceptions.h>
</span><span class="cx"> #import <WebCore/Console.h>
</span><span class="cx"> #import <WebCore/Cursor.h>
</span><ins>+#import <WebCore/ContextMenu.h>
+#import <WebCore/ContextMenuController.h>
</ins><span class="cx"> #import <WebCore/Element.h>
</span><span class="cx"> #import <WebCore/FileChooser.h>
</span><span class="cx"> #import <WebCore/FloatRect.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameLoadRequest.h>
</span><ins>+#import <WebCore/FrameView.h>
</ins><span class="cx"> #import <WebCore/HTMLNames.h>
</span><span class="cx"> #import <WebCore/HitTestResult.h>
</span><span class="cx"> #import <WebCore/Icon.h>
</span><ins>+#import <WebCore/IntPoint.h>
</ins><span class="cx"> #import <WebCore/IntRect.h>
</span><span class="cx"> #import <WebCore/NavigationAction.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="lines">@@ -876,6 +880,35 @@
</span><span class="cx">     return adoptRef(new SearchPopupMenuMac(client));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if ENABLE(CONTEXT_MENUS)
+void WebChromeClient::showContextMenu()
+{
+    Page* page = [m_webView page];
+    if (!page)
+        return;
+
+    ContextMenuController* controller = page->contextMenuController();
+    Node* node = controller->hitTestResult().innerNonSharedNode();
+    if (!node)
+        return;
+    Frame* frame = node->document()->frame();
+    if (!frame)
+        return;
+    FrameView* frameView = frame->view();
+    if (!frameView)
+        return;
+    NSView* view = frameView->documentView();
+    
+    IntPoint point = frameView->contentsToWindow(controller->hitTestResult().point());
+    NSPoint nsScreenPoint = [view convertPoint:point toView:nil];
+    // Show the contextual menu for this event.
+    NSEvent* event = [NSEvent mouseEventWithType:NSRightMouseDown location:nsScreenPoint modifierFlags:0 timestamp:0 windowNumber:[[view window] windowNumber] context:0 eventNumber:0 clickCount:1 pressure:1];
+    NSMenu* nsMenu = [view menuForEvent:event];
+    if (nsMenu)
+        [NSMenu popUpContextMenu:nsMenu withEvent:event forView:view];    
+}
+#endif
+
</ins><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> 
</span><span class="cx"> void WebChromeClient::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* graphicsLayer)
</span></span></pre>
</div>
</div>

</body>
</html>