Title: [128011] trunk/Source/WebCore
- Revision
- 128011
- Author
- [email protected]
- Date
- 2012-09-09 19:33:40 -0700 (Sun, 09 Sep 2012)
Log Message
[EFL][WK2] Minibrowser locks up when right clicking editable filed
https://bugs.webkit.org/show_bug.cgi?id=96074
Patch by Jinwoo Song <[email protected]> on 2012-09-09
Reviewed by Gyuyoung Kim.
WebProcess crashes when the context menu type is SubmenuType and non-CROSS_PLATFORM_CONTEXT_MENUS is used.
It is because platformSubMenu() in the ContextMenuItemEfl.cpp returns null. This patch implements the setSubMenu()
and platformSubMenu() to set and return the subMenuItems.
* platform/efl/ContextMenuItemEfl.cpp:
(WebCore::ContextMenuItem::setSubMenu):
(WebCore::ContextMenuItem::platformSubMenu):
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128010 => 128011)
--- trunk/Source/WebCore/ChangeLog 2012-09-10 02:08:33 UTC (rev 128010)
+++ trunk/Source/WebCore/ChangeLog 2012-09-10 02:33:40 UTC (rev 128011)
@@ -1,3 +1,19 @@
+2012-09-09 Jinwoo Song <[email protected]>
+
+ [EFL][WK2] Minibrowser locks up when right clicking editable filed
+ https://bugs.webkit.org/show_bug.cgi?id=96074
+
+ Reviewed by Gyuyoung Kim.
+
+ WebProcess crashes when the context menu type is SubmenuType and non-CROSS_PLATFORM_CONTEXT_MENUS is used.
+ It is because platformSubMenu() in the ContextMenuItemEfl.cpp returns null. This patch implements the setSubMenu()
+ and platformSubMenu() to set and return the subMenuItems.
+
+ * platform/efl/ContextMenuItemEfl.cpp:
+ (WebCore::ContextMenuItem::setSubMenu):
+ (WebCore::ContextMenuItem::platformSubMenu):
+ (WebCore):
+
2012-09-09 Kangil Han <[email protected]>
Pass full target idl file path to CodeGenerator as a constructor argument.
Modified: trunk/Source/WebCore/platform/efl/ContextMenuItemEfl.cpp (128010 => 128011)
--- trunk/Source/WebCore/platform/efl/ContextMenuItemEfl.cpp 2012-09-10 02:08:33 UTC (rev 128010)
+++ trunk/Source/WebCore/platform/efl/ContextMenuItemEfl.cpp 2012-09-10 02:33:40 UTC (rev 128011)
@@ -3,7 +3,7 @@
* Copyright (C) 2007 Staikos Computing Services Inc. <[email protected]>
* Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
* Copyright (C) 2009-2010 ProFUSION embedded systems
- * Copyright (C) 2011 Samsung Electronics
+ * Copyright (C) 2011-2012 Samsung Electronics
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,6 +33,7 @@
#include "ContextMenuItem.h"
+#include "ContextMenu.h"
#include "NotImplemented.h"
namespace WebCore {
@@ -121,15 +122,21 @@
return m_platformDescription.enabled;
}
-void ContextMenuItem::setSubMenu(ContextMenu*)
+void ContextMenuItem::setSubMenu(ContextMenu* menu)
{
- notImplemented();
+ m_platformDescription.subMenuItems = *menu->platformDescription();
}
PlatformMenuDescription ContextMenuItem::platformSubMenu() const
-{
- return 0;
-}
+{
+ return &m_platformDescription.subMenuItems;
+}
+
+void ContextMenuItem::setSubMenu(Vector<ContextMenuItem>& items)
+{
+ m_platformDescription.subMenuItems = items;
+}
+
#endif
}
#endif // ENABLE(CONTEXT_MENUS)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
