Changeset 128011 in webkit

Timestamp:

Sep 9, 2012 7:33:40 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Minibrowser locks up when right clicking editable filed
​https://bugs.webkit.org/show_bug.cgi?id=96074

Patch by Jinwoo Song <​jinwoo7.song@samsung.com> 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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/efl/ContextMenuItemEfl.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-09  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        [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  <kangil.han@samsung.com>
 

trunk/Source/WebCore/platform/efl/ContextMenuItemEfl.cpp

@@ -4 +4 @@
  * 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
@@ -34 +34 @@
 #include "ContextMenuItem.h"
 
+#include "ContextMenu.h"
 #include "NotImplemented.h"
 
@@ -122 +123 @@
 }
 
-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
 }