<!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>[187146] 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/187146">187146</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-21 18:49:40 -0700 (Tue, 21 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: [Mac] "Open Image In New Window" context menu item does nothing on an image
https://bugs.webkit.org/show_bug.cgi?id=147175
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-07-21
Reviewed by Timothy Hatcher.
Source/WebKit/mac:
* WebCoreSupport/WebInspectorClient.mm:
(-[WebInspectorWindowController webView:contextMenuItemsForElement:defaultMenuItems:]):
Remove default context menus that won't work in the inspector page.
Source/WebKit2:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::getContextMenuFromProposedMenu):
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
Remove default context menus that won't work in the inspector page.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (187145 => 187146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-07-22 01:46:00 UTC (rev 187145)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-07-22 01:49:40 UTC (rev 187146)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-07-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: [Mac] "Open Image In New Window" context menu item does nothing on an image
+ https://bugs.webkit.org/show_bug.cgi?id=147175
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (-[WebInspectorWindowController webView:contextMenuItemsForElement:defaultMenuItems:]):
+ Remove default context menus that won't work in the inspector page.
+
</ins><span class="cx"> 2015-07-21 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a logging channel for Layout, remove the LiveConnect channel
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (187145 => 187146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-07-22 01:46:00 UTC (rev 187145)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-07-22 01:49:40 UTC (rev 187146)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #import "WebPolicyDelegate.h"
</span><span class="cx"> #import "WebQuotaManager.h"
</span><span class="cx"> #import "WebSecurityOriginPrivate.h"
</span><del>-#import "WebUIDelegate.h"
</del><ins>+#import "WebUIDelegatePrivate.h"
</ins><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import <algorithm>
</span><span class="cx"> #import <bindings/ScriptValue.h>
</span><span class="lines">@@ -737,6 +737,28 @@
</span><span class="cx"> databaseQuotaManager.quota = std::max<unsigned long long>(5 * 1024 * 1024, databaseQuotaManager.usage * 1.25);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
+{
+ NSMutableArray *menuItems = [[NSMutableArray alloc] init];
+
+ for (NSMenuItem *item in defaultMenuItems) {
+ switch (item.tag) {
+ case WebMenuItemTagOpenLinkInNewWindow:
+ case WebMenuItemTagOpenImageInNewWindow:
+ case WebMenuItemTagOpenFrameInNewWindow:
+ case WebMenuItemTagOpenMediaInNewWindow:
+ case WebMenuItemTagDownloadLinkToDisk:
+ case WebMenuItemTagDownloadImageToDisk:
+ break;
+ default:
+ [menuItems addObject:item];
+ break;
+ }
+ }
+
+ return [menuItems autorelease];
+}
+
</ins><span class="cx"> // MARK: -
</span><span class="cx"> // MARK: Policy delegate
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187145 => 187146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-22 01:46:00 UTC (rev 187145)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-22 01:49:40 UTC (rev 187146)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: [Mac] "Open Image In New Window" context menu item does nothing on an image
+ https://bugs.webkit.org/show_bug.cgi?id=147175
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::getContextMenuFromProposedMenu):
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ Remove default context menus that won't work in the inspector page.
+
</ins><span class="cx"> 2015-07-21 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Use a jump table when consecutive transitions have different targets
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (187145 => 187146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-07-22 01:46:00 UTC (rev 187145)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-07-22 01:49:40 UTC (rev 187146)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #if PLATFORM(MAC) && WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "WKAPICast.h"
</span><ins>+#import "WKArray.h"
+#import "WKContextMenuItem.h"
</ins><span class="cx"> #import "WKInspectorPrivateMac.h"
</span><span class="cx"> #import "WKMutableArray.h"
</span><span class="cx"> #import "WKOpenPanelParameters.h"
</span><span class="lines">@@ -249,6 +251,30 @@
</span><span class="cx"> completionHandler([openPanel runModal]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void getContextMenuFromProposedMenu(WKPageRef pageRef, WKArrayRef proposedMenuRef, WKArrayRef* newMenuRef, WKHitTestResultRef, WKTypeRef, const void*)
+{
+ WKMutableArrayRef menuItems = WKMutableArrayCreate();
+
+ size_t count = WKArrayGetSize(proposedMenuRef);
+ for (size_t i = 0; i < count; ++i) {
+ WKContextMenuItemRef contextMenuItem = static_cast<WKContextMenuItemRef>(WKArrayGetItemAtIndex(proposedMenuRef, i));
+ switch (WKContextMenuItemGetTag(contextMenuItem)) {
+ case kWKContextMenuItemTagOpenLinkInNewWindow:
+ case kWKContextMenuItemTagOpenImageInNewWindow:
+ case kWKContextMenuItemTagOpenFrameInNewWindow:
+ case kWKContextMenuItemTagOpenMediaInNewWindow:
+ case kWKContextMenuItemTagDownloadLinkToDisk:
+ case kWKContextMenuItemTagDownloadImageToDisk:
+ break;
+ default:
+ WKArrayAppendItem(menuItems, contextMenuItem);
+ break;
+ }
+ }
+
+ *newMenuRef = menuItems;
+}
+
</ins><span class="cx"> void WebInspectorProxy::attachmentViewDidChange(NSView *oldView, NSView *newView)
</span><span class="cx"> {
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_inspectorProxyObjCAdapter.get() name:NSViewFrameDidChangeNotification object:oldView];
</span><span class="lines">@@ -470,6 +496,18 @@
</span><span class="cx">
</span><span class="cx"> WKPageSetPageUIClient(toAPI(inspectorPage), &uiClient.base);
</span><span class="cx">
</span><ins>+ WKPageContextMenuClientV3 contextMenuClient = {
+ { 3, this },
+ 0, // getContextMenuFromProposedMenu_deprecatedForUseWithV0
+ 0, // customContextMenuItemSelected
+ 0, // contextMenuDismissed
+ getContextMenuFromProposedMenu,
+ 0, // showContextMenu
+ 0, // hideContextMenu
+ };
+
+ WKPageSetPageContextMenuClient(toAPI(inspectorPage), &contextMenuClient.base);
+
</ins><span class="cx"> return inspectorPage;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>