Title: [93327] trunk/Source/WebKit2
- Revision
- 93327
- Author
- [email protected]
- Date
- 2011-08-18 11:49:21 -0700 (Thu, 18 Aug 2011)
Log Message
[GTK] [WK2] Activating sub menus cause the WebProcess to crash
https://bugs.webkit.org/show_bug.cgi?id=66471
Patch by Amruth Raj <[email protected]> on 2011-08-18
Reviewed by Anders Carlsson.
* UIProcess/gtk/WebContextMenuProxyGtk.cpp:
(WebKit::WebContextMenuProxyGtk::createGtkMenu):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (93326 => 93327)
--- trunk/Source/WebKit2/ChangeLog 2011-08-18 18:41:28 UTC (rev 93326)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-18 18:49:21 UTC (rev 93327)
@@ -1,3 +1,13 @@
+2011-08-18 Amruth Raj <[email protected]>
+
+ [GTK] [WK2] Activating sub menus cause the WebProcess to crash
+ https://bugs.webkit.org/show_bug.cgi?id=66471
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+ (WebKit::WebContextMenuProxyGtk::createGtkMenu):
+
2011-08-18 Adam Roben <[email protected]>
Update the device scale factor when the WKView's window changes
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp (93326 => 93327)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2011-08-18 18:41:28 UTC (rev 93326)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2011-08-18 18:49:21 UTC (rev 93327)
@@ -58,7 +58,7 @@
ContextMenuItem menuItem(item.type(), item.action(), item.title(), item.enabled(), item.checked());
GtkAction* action = ""
- if (action) {
+ if (action && (item.type() == WebCore::ActionType || item.type() == WebCore::CheckableActionType)) {
g_object_set_data(G_OBJECT(action), gContextMenuActionId, GINT_TO_POINTER(item.action()));
g_signal_connect(action, "activate", G_CALLBACK(contextMenuItemActivatedCallback), m_page);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
