<!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>[192881] 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/192881">192881</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-01 05:57:20 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/192247">r192247</a>): [GTK] ASSERTION FAILED: type == WebCore::ActionType || type == WebCore::CheckableActionType || type == WebCore::SeparatorType
https://bugs.webkit.org/show_bug.cgi?id=151513
Reviewed by Martin Robinson.
This happens because we are using our own WebContextMenuItemGtk
derived from WebContextMenuItemData, but using our own submenu
items handling. We are using the non-submenu
WebContextMenuItemData constructor to create our submenu items
too, because WebContextMenuItemData always expect the submenu
items to be passed to the constructor, but we have a set_submenu
method in the public API. So we consider that a
WebContextMenuItemGtk is SubmenuType if it has submenu items, but
we use the action type internally. When converting a
WebContextMenuItemGtk to a generic WebContextMenuItemData, we
correctly set the type and pass the submenu items to the
approriate constructor.
* Shared/gtk/WebContextMenuItemGtk.cpp:
(WebKit::WebContextMenuItemGtk::WebContextMenuItemGtk): When
constructing from a WebContextMenuItemData, set the type as
ActionType when it's a submenu type.
* Shared/gtk/WebContextMenuItemGtk.h:
(WebKit::WebContextMenuItemGtk::type): Return SubmenuType if
submenu items vector is not empty, otherwise use the parent method.
* UIProcess/API/gtk/WebKitContextMenuItem.cpp:
(webkit_context_menu_item_new_with_submenu): Create the
WebContextMenuItemGtk as ActionType.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkWebContextMenuItemGtkcpp">trunk/Source/WebKit2/Shared/gtk/WebContextMenuItemGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkWebContextMenuItemGtkh">trunk/Source/WebKit2/Shared/gtk/WebContextMenuItemGtk.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenuItemcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192880 => 192881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-01 12:23:34 UTC (rev 192880)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-01 13:57:20 UTC (rev 192881)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-12-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ REGRESSION(r192247): [GTK] ASSERTION FAILED: type == WebCore::ActionType || type == WebCore::CheckableActionType || type == WebCore::SeparatorType
+ https://bugs.webkit.org/show_bug.cgi?id=151513
+
+ Reviewed by Martin Robinson.
+
+ This happens because we are using our own WebContextMenuItemGtk
+ derived from WebContextMenuItemData, but using our own submenu
+ items handling. We are using the non-submenu
+ WebContextMenuItemData constructor to create our submenu items
+ too, because WebContextMenuItemData always expect the submenu
+ items to be passed to the constructor, but we have a set_submenu
+ method in the public API. So we consider that a
+ WebContextMenuItemGtk is SubmenuType if it has submenu items, but
+ we use the action type internally. When converting a
+ WebContextMenuItemGtk to a generic WebContextMenuItemData, we
+ correctly set the type and pass the submenu items to the
+ approriate constructor.
+
+ * Shared/gtk/WebContextMenuItemGtk.cpp:
+ (WebKit::WebContextMenuItemGtk::WebContextMenuItemGtk): When
+ constructing from a WebContextMenuItemData, set the type as
+ ActionType when it's a submenu type.
+ * Shared/gtk/WebContextMenuItemGtk.h:
+ (WebKit::WebContextMenuItemGtk::type): Return SubmenuType if
+ submenu items vector is not empty, otherwise use the parent method.
+ * UIProcess/API/gtk/WebKitContextMenuItem.cpp:
+ (webkit_context_menu_item_new_with_submenu): Create the
+ WebContextMenuItemGtk as ActionType.
+
+2015-12-01 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Unreviewed. Add missing inspector files to the GTK+ build.
</span><span class="cx">
</span><span class="cx"> * PlatformGTK.cmake: Add also Debug css files.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkWebContextMenuItemGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/WebContextMenuItemGtk.cpp (192880 => 192881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/WebContextMenuItemGtk.cpp 2015-12-01 12:23:34 UTC (rev 192880)
+++ trunk/Source/WebKit2/Shared/gtk/WebContextMenuItemGtk.cpp 2015-12-01 13:57:20 UTC (rev 192881)
</span><span class="lines">@@ -121,17 +121,18 @@
</span><span class="cx"> WebContextMenuItemGtk::WebContextMenuItemGtk(ContextMenuItemType type, ContextMenuAction action, const String& title, bool enabled, bool checked)
</span><span class="cx"> : WebContextMenuItemData(type, action, title, enabled, checked)
</span><span class="cx"> {
</span><ins>+ ASSERT(type != SubmenuType);
</ins><span class="cx"> createGtkActionIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebContextMenuItemGtk::WebContextMenuItemGtk(const WebContextMenuItemData& data)
</span><del>- : WebContextMenuItemData(data.type(), data.action(), data.title(), data.enabled(), data.checked())
</del><ins>+ : WebContextMenuItemData(data.type() == SubmenuType ? ActionType : data.type(), data.action(), data.title(), data.enabled(), data.checked())
</ins><span class="cx"> {
</span><span class="cx"> createGtkActionIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebContextMenuItemGtk::WebContextMenuItemGtk(const WebContextMenuItemGtk& data, Vector<WebContextMenuItemGtk>&& submenu)
</span><del>- : WebContextMenuItemData(SubmenuType, data.action(), data.title(), data.enabled(), false)
</del><ins>+ : WebContextMenuItemData(ActionType, data.action(), data.title(), data.enabled(), false)
</ins><span class="cx"> {
</span><span class="cx"> m_action = data.gtkAction();
</span><span class="cx"> m_submenuItems = WTF::move(submenu);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkWebContextMenuItemGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/WebContextMenuItemGtk.h (192880 => 192881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/WebContextMenuItemGtk.h 2015-12-01 12:23:34 UTC (rev 192880)
+++ trunk/Source/WebKit2/Shared/gtk/WebContextMenuItemGtk.h 2015-12-01 13:57:20 UTC (rev 192881)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx"> WebContextMenuItemGtk(GtkAction*);
</span><span class="cx"> ~WebContextMenuItemGtk();
</span><span class="cx">
</span><ins>+ // We don't use the SubmenuType internally, so check if we have submenu items.
+ WebCore::ContextMenuItemType type() const { return m_submenuItems.isEmpty() ? WebContextMenuItemData::type() : WebCore::SubmenuType; }
</ins><span class="cx"> GtkAction* gtkAction() const { return m_action.get(); }
</span><span class="cx"> const Vector<WebContextMenuItemGtk>& submenuItems() const { return m_submenuItems; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenuItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp (192880 => 192881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2015-12-01 12:23:34 UTC (rev 192880)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2015-12-01 13:57:20 UTC (rev 192881)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> WebKitContextMenuItem* item = WEBKIT_CONTEXT_MENU_ITEM(g_object_new(WEBKIT_TYPE_CONTEXT_MENU_ITEM, nullptr));
</span><del>- item->priv->menuItem = std::make_unique<WebContextMenuItemGtk>(SubmenuType, ContextMenuItemBaseApplicationTag, String::fromUTF8(label));
</del><ins>+ item->priv->menuItem = std::make_unique<WebContextMenuItemGtk>(ActionType, ContextMenuItemBaseApplicationTag, String::fromUTF8(label));
</ins><span class="cx"> item->priv->subMenu = submenu;
</span><span class="cx"> webkitContextMenuSetParentItem(submenu, item);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>