<!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>[191471] 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/191471">191471</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-22 14:00:31 -0700 (Thu, 22 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CTTE WebContextMenuItemData
https://bugs.webkit.org/show_bug.cgi?id=150471
Reviewed by Tim Horton.
* Shared/API/c/WKContextMenuItem.cpp:
(WKContextMenuItemGetTag):
(WKContextMenuItemGetType):
(WKContextMenuItemCopyTitle):
(WKContextMenuItemGetEnabled):
(WKContextMenuItemGetChecked):
* Shared/WebContextMenuItem.cpp:
(WebKit::WebContextMenuItem::create):
* Shared/WebContextMenuItem.h:
(WebKit::WebContextMenuItem::data):
* UIProcess/API/C/WKPage.cpp:
(WKPageSelectContextMenuItem):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::nsMenuItem):
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageClickMenuItem):
* WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
(WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKContextMenuItemcpp">trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebContextMenuItemcpp">trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebContextMenuItemh">trunk/Source/WebKit2/Shared/WebContextMenuItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191470 => 191471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 21:00:31 UTC (rev 191471)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-10-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ CTTE WebContextMenuItemData
+ https://bugs.webkit.org/show_bug.cgi?id=150471
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/c/WKContextMenuItem.cpp:
+ (WKContextMenuItemGetTag):
+ (WKContextMenuItemGetType):
+ (WKContextMenuItemCopyTitle):
+ (WKContextMenuItemGetEnabled):
+ (WKContextMenuItemGetChecked):
+ * Shared/WebContextMenuItem.cpp:
+ (WebKit::WebContextMenuItem::create):
+ * Shared/WebContextMenuItem.h:
+ (WebKit::WebContextMenuItem::data):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSelectContextMenuItem):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::nsMenuItem):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageClickMenuItem):
+ * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
+ (WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):
+
+2015-10-22 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Handle nil menu items.
</span><span class="cx">
</span><span class="cx"> * UIProcess/mac/WebContextMenuProxyMac.mm:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKContextMenuItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp (191470 => 191471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2015-10-22 21:00:31 UTC (rev 191471)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> WKContextMenuItemTag WKContextMenuItemGetTag(WKContextMenuItemRef itemRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- return toAPI(toImpl(itemRef)->data()->action());
</del><ins>+ return toAPI(toImpl(itemRef)->data().action());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(itemRef);
</span><span class="cx"> return toAPI(ContextMenuItemTagNoAction);
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> WKContextMenuItemType WKContextMenuItemGetType(WKContextMenuItemRef itemRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- return toAPI(toImpl(itemRef)->data()->type());
</del><ins>+ return toAPI(toImpl(itemRef)->data().type());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(itemRef);
</span><span class="cx"> return toAPI(ActionType);
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> WKStringRef WKContextMenuItemCopyTitle(WKContextMenuItemRef itemRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- return toCopiedAPI(toImpl(itemRef)->data()->title().impl());
</del><ins>+ return toCopiedAPI(toImpl(itemRef)->data().title().impl());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(itemRef);
</span><span class="cx"> return 0;
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> bool WKContextMenuItemGetEnabled(WKContextMenuItemRef itemRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- return toImpl(itemRef)->data()->enabled();
</del><ins>+ return toImpl(itemRef)->data().enabled();
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(itemRef);
</span><span class="cx"> return false;
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> bool WKContextMenuItemGetChecked(WKContextMenuItemRef itemRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- return toImpl(itemRef)->data()->checked();
</del><ins>+ return toImpl(itemRef)->data().checked();
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(itemRef);
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebContextMenuItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp (191470 => 191471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2015-10-22 21:00:31 UTC (rev 191471)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> for (size_t i = 0; i < size; ++i) {
</span><span class="cx"> WebContextMenuItem* item = submenuItems->at<WebContextMenuItem>(i);
</span><span class="cx"> if (item)
</span><del>- submenu.append(*item->data());
</del><ins>+ submenu.append(item->data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return adoptRef(new WebContextMenuItem(WebContextMenuItemData(WebCore::ContextMenuItemTagNoAction, title, enabled, submenu))).leakRef();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.h (191470 => 191471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2015-10-22 21:00:31 UTC (rev 191471)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> API::Object* userData() const;
</span><span class="cx"> void setUserData(API::Object*);
</span><span class="cx">
</span><del>- WebContextMenuItemData* data() { return &m_webContextMenuItemData; }
</del><ins>+ const WebContextMenuItemData& data() { return m_webContextMenuItemData; }
</ins><span class="cx"> NativeContextMenuItem* nativeContextMenuItem() { return m_nativeContextMenuItem.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191470 => 191471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-22 21:00:31 UTC (rev 191471)
</span><span class="lines">@@ -2423,7 +2423,7 @@
</span><span class="cx"> void WKPageSelectContextMenuItem(WKPageRef page, WKContextMenuItemRef item)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- toImpl(page)->contextMenuItemSelected(*(toImpl(item)->data()));
</del><ins>+ toImpl(page)->contextMenuItemSelected((toImpl(item)->data()));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(item);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191470 => 191471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 21:00:31 UTC (rev 191471)
</span><span class="lines">@@ -232,8 +232,7 @@
</span><span class="cx"> if (NativeContextMenuItem* nativeItem = item->nativeContextMenuItem())
</span><span class="cx"> return nativeItem->nsMenuItem();
</span><span class="cx">
</span><del>- ASSERT(item->data());
- return nsMenuItem(contextMenuProxy, *item->data());
</del><ins>+ return nsMenuItem(contextMenuProxy, item->data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(WebContextMenuProxyMac& contextMenuProxy, const Vector<ItemType>& items)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (191470 => 191471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2015-10-22 21:00:31 UTC (rev 191471)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> void WKBundlePageClickMenuItem(WKBundlePageRef pageRef, WKContextMenuItemRef item)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- toImpl(pageRef)->contextMenu()->itemSelected(*toImpl(item)->data());
</del><ins>+ toImpl(pageRef)->contextMenu()->itemSelected(toImpl(item)->data());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span><span class="cx"> UNUSED_PARAM(item);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp (191470 => 191471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp 2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp 2015-10-22 21:00:31 UTC (rev 191471)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- newMenu.append(*item->data());
</del><ins>+ newMenu.append(item->data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>