<!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>[189655] trunk/Source/WebKit2</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/189655">189655</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-12 11:31:21 -0700 (Sat, 12 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Move Already Generic Inspector Page Context Menu to Generic Setup
https://bugs.webkit.org/show_bug.cgi?id=149088
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-09-12
Reviewed by Brian Burg.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::getContextMenuFromProposedMenu):
(WebKit::WebInspectorProxy::eagerlyCreateInspectorPage):
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::getContextMenuFromProposedMenu): Deleted.
(WebKit::WebInspectorProxy::platformCreateInspectorPage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189654 => 189655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-12 17:44:40 UTC (rev 189654)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-12 18:31:21 UTC (rev 189655)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Move Already Generic Inspector Page Context Menu to Generic Setup
+ https://bugs.webkit.org/show_bug.cgi?id=149088
+
+ Reviewed by Brian Burg.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::getContextMenuFromProposedMenu):
+ (WebKit::WebInspectorProxy::eagerlyCreateInspectorPage):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::getContextMenuFromProposedMenu): Deleted.
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+
</ins><span class="cx"> 2015-09-12 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: disambiguate inspected/frontend controllers and pages in backend code
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (189654 => 189655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-09-12 17:44:40 UTC (rev 189654)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-09-12 18:31:21 UTC (rev 189655)
</span><span class="lines">@@ -29,6 +29,9 @@
</span><span class="cx">
</span><span class="cx"> #include "APIProcessPoolConfiguration.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><ins>+#include "WKArray.h"
+#include "WKContextMenuItem.h"
+#include "WKMutableArray.h"
</ins><span class="cx"> #include "WebFramePolicyListenerProxy.h"
</span><span class="cx"> #include "WebFrameProxy.h"
</span><span class="cx"> #include "WebInspectorMessages.h"
</span><span class="lines">@@ -382,6 +385,30 @@
</span><span class="cx"> webInspectorProxy->inspectedPage()->loadRequest(toImpl(requestRef)->resourceRequest());
</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"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="cx"> void WebInspectorProxy::enableRemoteInspection()
</span><span class="cx"> {
</span><span class="lines">@@ -470,8 +497,19 @@
</span><span class="cx"> nullptr, // shouldKeepCurrentBackForwardListItemInList
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ WKPageContextMenuClientV3 contextMenuClient = {
+ { 3, this },
+ 0, // getContextMenuFromProposedMenu_deprecatedForUseWithV0
+ 0, // customContextMenuItemSelected
+ 0, // contextMenuDismissed
+ getContextMenuFromProposedMenu,
+ 0, // showContextMenu
+ 0, // hideContextMenu
+ };
+
</ins><span class="cx"> WKPageSetPagePolicyClient(toAPI(m_inspectorPage), &policyClient.base);
</span><span class="cx"> WKPageSetPageLoaderClient(toAPI(m_inspectorPage), &loaderClient.base);
</span><ins>+ WKPageSetPageContextMenuClient(toAPI(m_inspectorPage), &contextMenuClient.base);
</ins><span class="cx">
</span><span class="cx"> m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
</span><span class="cx"> m_inspectorPage->process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (189654 => 189655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-09-12 17:44:40 UTC (rev 189654)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-09-12 18:31:21 UTC (rev 189655)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #if PLATFORM(MAC) && WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "WKAPICast.h"
</span><del>-#import "WKArray.h"
-#import "WKContextMenuItem.h"
</del><span class="cx"> #import "WKInspectorPrivateMac.h"
</span><span class="cx"> #import "WKMutableArray.h"
</span><span class="cx"> #import "WKOpenPanelParameters.h"
</span><span class="lines">@@ -235,30 +233,6 @@
</span><span class="cx"> completionHandler([openPanel runModal]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><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">@@ -485,18 +459,6 @@
</span><span class="cx">
</span><span class="cx"> WKPageSetPageUIClient(toAPI(inspectorPage), &uiClient.base);
</span><span class="cx">
</span><del>- WKPageContextMenuClientV3 contextMenuClient = {
- { 3, this },
- 0, // getContextMenuFromProposedMenu_deprecatedForUseWithV0
- 0, // customContextMenuItemSelected
- 0, // contextMenuDismissed
- getContextMenuFromProposedMenu,
- 0, // showContextMenu
- 0, // hideContextMenu
- };
-
- WKPageSetPageContextMenuClient(toAPI(inspectorPage), &contextMenuClient.base);
-
</del><span class="cx"> return inspectorPage;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>