<!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>[159780] 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/159780">159780</a></dd>
<dt>Author</dt> <dd>graouts@apple.com</dd>
<dt>Date</dt> <dd>2013-11-26 00:29:11 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Allow showing a context menu on all mouse events.
https://bugs.webkit.org/show_bug.cgi?id=124747
Reviewed by Joseph Pecoraro.
Source/WebCore:
Add a new InspectorFrontendHost::dispatchEventAsContextMenuEvent(Event*) method
to let the inspector front-end dispatch a native contextmenu event that will allow
for a context menu to be shown from within a non-contextmenu event handler.
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::dispatchEventAsContextMenuEvent):
Check that we're dealing with a mouse event, get the frame for the event target
and the event's location to call ContextMenuController::showContextMenuAt()
which will handle the new contextmenu event dispatch to the original event target.
* inspector/InspectorFrontendHost.h:
* inspector/InspectorFrontendHost.idl:
Source/WebInspectorUI:
Automatically dispatch a contextmenu event in case WebInspector.ContextMenu.prototype.show()
is called outside of a contextmenu event handler and would therefore not show the expected
context menu (except in the Remote Web Inspector where this already works).
* UserInterface/ContextMenu.js:
(WebInspector.ContextMenu.prototype.show):
Check whether the event is a contextmenu event, and if not, add an event listener for a manually
dispatched contextmenu event such that we may then call InspectorFrontendHost.showContextMenu()
in a contextmenu event handler.
(WebInspector.ContextMenu.prototype.handleEvent):
Call InspectorFrontendHost.showContextMenu() now that we received the manually dispatched
contextmenu event.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostcpp">trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHosth">trunk/Source/WebCore/inspector/InspectorFrontendHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostidl">trunk/Source/WebCore/inspector/InspectorFrontendHost.idl</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceContextMenujs">trunk/Source/WebInspectorUI/UserInterface/ContextMenu.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159779 => 159780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-26 05:54:30 UTC (rev 159779)
+++ trunk/Source/WebCore/ChangeLog 2013-11-26 08:29:11 UTC (rev 159780)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-11-26 Antoine Quint <graouts@apple.com>
+
+ Web Inspector: Allow showing a context menu on all mouse events.
+ https://bugs.webkit.org/show_bug.cgi?id=124747
+
+ Reviewed by Joseph Pecoraro.
+
+ Add a new InspectorFrontendHost::dispatchEventAsContextMenuEvent(Event*) method
+ to let the inspector front-end dispatch a native contextmenu event that will allow
+ for a context menu to be shown from within a non-contextmenu event handler.
+
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::InspectorFrontendHost::dispatchEventAsContextMenuEvent):
+ Check that we're dealing with a mouse event, get the frame for the event target
+ and the event's location to call ContextMenuController::showContextMenuAt()
+ which will handle the new contextmenu event dispatch to the original event target.
+
+ * inspector/InspectorFrontendHost.h:
+ * inspector/InspectorFrontendHost.idl:
+
</ins><span class="cx"> 2013-11-25 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Convert some Shape code to use references
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (159779 => 159780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2013-11-26 05:54:30 UTC (rev 159779)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2013-11-26 08:29:11 UTC (rev 159780)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "ContextMenuProvider.h"
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><span class="cx"> #include "Element.h"
</span><ins>+#include "Event.h"
</ins><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="lines">@@ -46,6 +47,7 @@
</span><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "InspectorFrontendClient.h"
</span><span class="cx"> #include "MainFrame.h"
</span><ins>+#include "MouseEvent.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="cx"> #include "ResourceError.h"
</span><span class="lines">@@ -279,7 +281,23 @@
</span><span class="cx"> m_frontendPage->contextMenuController().showContextMenu(event, menuProvider);
</span><span class="cx"> m_menuProvider = menuProvider.get();
</span><span class="cx"> }
</span><ins>+
+void InspectorFrontendHost::dispatchEventAsContextMenuEvent(Event* event)
+{
+#if USE(ACCESSIBILITY_CONTEXT_MENUS)
+ if (!event || !event->isMouseEvent())
+ return;
+
+ Frame* frame = event->target()->toNode()->document().frame();
+ MouseEvent* mouseEvent = toMouseEvent(event);
+ IntPoint mousePoint = IntPoint(mouseEvent->clientX(), mouseEvent->clientY());
+
+ m_frontendPage->contextMenuController().showContextMenuAt(frame, mousePoint);
+#else
+ UNUSED_PARAM(event);
</ins><span class="cx"> #endif
</span><ins>+}
+#endif
</ins><span class="cx">
</span><span class="cx"> String InspectorFrontendHost::loadResourceSynchronously(const String& url)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (159779 => 159780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2013-11-26 05:54:30 UTC (rev 159779)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2013-11-26 08:29:11 UTC (rev 159780)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> // Called from [Custom] implementations.
</span><span class="cx"> void showContextMenu(Event*, const Vector<ContextMenuItem>& items);
</span><span class="cx"> void sendMessageToBackend(const String& message);
</span><ins>+ void dispatchEventAsContextMenuEvent(Event*);
</ins><span class="cx">
</span><span class="cx"> String loadResourceSynchronously(const String& url);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.idl (159779 => 159780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2013-11-26 05:54:30 UTC (rev 159779)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2013-11-26 08:29:11 UTC (rev 159780)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> [Custom] DOMString platform();
</span><span class="cx"> [Custom] DOMString port();
</span><span class="cx"> [Custom] void showContextMenu(MouseEvent event, any items);
</span><ins>+ void dispatchEventAsContextMenuEvent(Event event);
</ins><span class="cx"> void sendMessageToBackend(DOMString message);
</span><span class="cx">
</span><span class="cx"> [Custom] void recordActionTaken(unsigned long actionCode);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (159779 => 159780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2013-11-26 05:54:30 UTC (rev 159779)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-11-26 08:29:11 UTC (rev 159780)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-11-26 Antoine Quint <graouts@apple.com>
+
+ Web Inspector: Allow showing a context menu on all mouse events.
+ https://bugs.webkit.org/show_bug.cgi?id=124747
+
+ Reviewed by Joseph Pecoraro.
+
+ Automatically dispatch a contextmenu event in case WebInspector.ContextMenu.prototype.show()
+ is called outside of a contextmenu event handler and would therefore not show the expected
+ context menu (except in the Remote Web Inspector where this already works).
+
+ * UserInterface/ContextMenu.js:
+ (WebInspector.ContextMenu.prototype.show):
+ Check whether the event is a contextmenu event, and if not, add an event listener for a manually
+ dispatched contextmenu event such that we may then call InspectorFrontendHost.showContextMenu()
+ in a contextmenu event handler.
+
+ (WebInspector.ContextMenu.prototype.handleEvent):
+ Call InspectorFrontendHost.showContextMenu() now that we received the manually dispatched
+ contextmenu event.
+
</ins><span class="cx"> 2013-11-25 Alexandru Chiculita <achicu@adobe.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: [CSS Regions] A page with many flows should collapse the resources tree
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceContextMenujs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/ContextMenu.js (159779 => 159780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/ContextMenu.js 2013-11-26 05:54:30 UTC (rev 159779)
+++ trunk/Source/WebInspectorUI/UserInterface/ContextMenu.js 2013-11-26 08:29:11 UTC (rev 159780)
</span><span class="lines">@@ -185,6 +185,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebInspector.ContextMenu.prototype = {
</span><ins>+
+ // Public
+
</ins><span class="cx"> nextId: function()
</span><span class="cx"> {
</span><span class="cx"> return this._id++;
</span><span class="lines">@@ -192,16 +195,36 @@
</span><span class="cx">
</span><span class="cx"> show: function()
</span><span class="cx"> {
</span><ins>+ console.assert(this._event instanceof MouseEvent);
+
</ins><span class="cx"> var menuObject = this._buildDescriptor();
</span><span class="cx">
</span><span class="cx"> if (menuObject.length) {
</span><span class="cx"> WebInspector._contextMenu = this;
</span><del>- InspectorFrontendHost.showContextMenu(this._event, menuObject);
</del><ins>+ if (this._event.type !== "contextmenu" && typeof InspectorFrontendHost.dispatchEventAsContextMenuEvent === "function") {
+ this._menuObject = menuObject;
+ this._event.target.addEventListener("contextmenu", this, true);
+ InspectorFrontendHost.dispatchEventAsContextMenuEvent(this._event);
+ } else
+ InspectorFrontendHost.showContextMenu(this._event, menuObject);
</ins><span class="cx"> }
</span><span class="cx"> if (this._event)
</span><span class="cx"> this._event.stopImmediatePropagation();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ // Protected
+
+ handleEvent: function(event)
+ {
+ this._event.target.removeEventListener("contextmenu", this, true);
+ InspectorFrontendHost.showContextMenu(event, this._menuObject);
+ delete this._menuObject;
+
+ event.stopImmediatePropagation();
+ },
+
+ // Private
+
</ins><span class="cx"> _setHandler: function(id, handler)
</span><span class="cx"> {
</span><span class="cx"> if (handler)
</span></span></pre>
</div>
</div>
</body>
</html>