Reviewed by Geoff.

        With the new changes to ContextMenuItems, WebCore context menus
        stopped appearing at all. And then when I got them to appear, they
        crashed. This fixes both of these problems.

        * platform/mac/ContextMenuItemMac.mm:
        (WebCore::ContextMenuItem::ContextMenuItem): keyEquivalent cannot
        be nil. This was causing Obj-C to throw an exception preventing the
        menus from popping up at all.
        * platform/mac/ContextMenuMac.mm:
        (+[WebCoreMenuTarget sharedMenuTarget]): Re-name our static
        MenuTarget so that it is more clear that it is a static and shared
        WebCoreMenuTarget.
        (WebCore::ContextMenu::ContextMenu): Initialize the
        WebCoreMenuTarget's controller in the ContextMenu constructor
        instead of in getNSMenuItem since the controller will only possibly
        change when a new ContextMenu has been created.
        (WebCore::ContextMenu::~ContextMenu): Set the target's controller
        to 0.
        (WebCore::getNSMenuItem): A lot of this work is being done other
        places now. Call new class method on WebCoreMenuTarget to get the
        shared target.
        (WebCore::ContextMenu::appendItem): We should not be releasing the
        menuItem here! This caused the crashes I saw.
        (WebCore::ContextMenu::insertItem): Same.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@18015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9a5c8d6a652eb0b9364c4b14c19cb0104902e4de..79a39eec5766530ff128bdc8ffcc8cb94899e803 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2006-12-04  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Geoff.
+
+        With the new changes to ContextMenuItems, WebCore context menus 
+        stopped appearing at all. And then when I got them to appear, they 
+        crashed. This fixes both of these problems.
+
+        * platform/mac/ContextMenuItemMac.mm:
+        (WebCore::ContextMenuItem::ContextMenuItem): keyEquivalent cannot 
+        be nil. This was causing Obj-C to throw an exception preventing the 
+        menus from popping up at all. 
+        * platform/mac/ContextMenuMac.mm:
+        (+[WebCoreMenuTarget sharedMenuTarget]): Re-name our static 
+        MenuTarget so that it is more clear that it is a static and shared 
+        WebCoreMenuTarget.
+        (WebCore::ContextMenu::ContextMenu): Initialize the 
+        WebCoreMenuTarget's controller in the ContextMenu constructor 
+        instead of in getNSMenuItem since the controller will only possibly 
+        change when a new ContextMenu has been created.
+        (WebCore::ContextMenu::~ContextMenu): Set the target's controller 
+        to 0.
+        (WebCore::getNSMenuItem): A lot of this work is being done other 
+        places now. Call new class method on WebCoreMenuTarget to get the 
+        shared target.
+        (WebCore::ContextMenu::appendItem): We should not be releasing the 
+        menuItem here! This caused the crashes I saw.
+        (WebCore::ContextMenu::insertItem): Same.
+
 2006-12-04  Anders Carlsson  <acarlsson@apple.com>
 
         Fix the build.

diff --git a/WebCore/platform/mac/ContextMenuItemMac.mm b/WebCore/platform/mac/ContextMenuItemMac.mm
index 439ca9ed6321e1c6a939a37146109776ee4c5fa9..80ba6dd7fbd9334e101d022b42e46dfb84ed9b92 100644 (file)
--- a/WebCore/platform/mac/ContextMenuItemMac.mm
+++ b/WebCore/platform/mac/ContextMenuItemMac.mm
@@ -46,7 +46,7 @@ ContextMenuItem::ContextMenuItem(ContextMenu* parentMenu, ContextMenu* subMenu)
     : m_parentMenu(parentMenu)
     , m_type(SeparatorType)
 {
-    NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:String() action:nil keyEquivalent:nil];
+    NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
     m_platformDescription = item;
     [item release];
 
@@ -60,7 +60,7 @@ ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction act
     : m_parentMenu(parentMenu)
     , m_type(type)
 {
-    NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:title action:nil keyEquivalent:nil];
+    NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
     m_platformDescription = item;
     [item release];
 

diff --git a/WebCore/platform/mac/ContextMenuMac.mm b/WebCore/platform/mac/ContextMenuMac.mm
index c6a7011dddb67410522e10847abab1765ba423eb..80e8e762682807eabbb81a21eecd29bb524d6519 100644 (file)
--- a/WebCore/platform/mac/ContextMenuMac.mm
+++ b/WebCore/platform/mac/ContextMenuMac.mm
@@ -27,25 +27,25 @@
 #include "ContextMenu.h"
 
 #include "ContextMenuController.h"
- 
-@interface MenuTarget : NSObject {
+
+@interface WebCoreMenuTarget : NSObject {
     WebCore::ContextMenuController* _menuController;
 }
++ (WebCoreMenuTarget*)sharedMenuTarget;
 - (WebCore::ContextMenuController*)menuController;
 - (void)setMenuController:(WebCore::ContextMenuController*)menuController;
 - (void)forwardContextMenuAction:(id)sender;
 @end
 
-@implementation MenuTarget
+static WebCoreMenuTarget* target;
+
+@implementation WebCoreMenuTarget
 
-- (id)initWithContextMenuController:(WebCore::ContextMenuController*)menuController
++ (WebCoreMenuTarget*)sharedMenuTarget
 {
-    self = [super init];
-    if (!self)
-        return nil;
-    
-    _menuController = menuController;
-    return self;
+    if (!target)
+        target = [[WebCoreMenuTarget alloc] init];
+    return target;
 }
 
 - (WebCore::ContextMenuController*)menuController
@@ -68,24 +68,26 @@
 
 namespace WebCore {
 
-static MenuTarget* target;
-
 ContextMenu::ContextMenu(const HitTestResult& result)
     : m_hitTestResult(result)
 {
     NSMutableArray* array = [[NSMutableArray alloc] init];
     m_platformDescription = array;
-    [array release];    
+    [array release];
+
+    [[WebCoreMenuTarget sharedMenuTarget] setMenuController:controller()];
 }
 
 ContextMenu::ContextMenu(const HitTestResult& result, const PlatformMenuDescription menu)
     : m_hitTestResult(result)
     , m_platformDescription(menu)
 {
+    [[WebCoreMenuTarget sharedMenuTarget] setMenuController:controller()];
 }
 
 ContextMenu::~ContextMenu()
 {
+    [[WebCoreMenuTarget sharedMenuTarget] setMenuController:0];
 }
  
 static NSMenuItem* getNSMenuItem(ContextMenu* menu, const ContextMenuItem& item)
@@ -93,15 +95,9 @@ static NSMenuItem* getNSMenuItem(ContextMenu* menu, const ContextMenuItem& item)
     if (!menu->platformDescription())
         return 0;
     
-    ContextMenuController* currentController = menu->controller();
-    if (!target)
-        target = [[MenuTarget alloc] initWithContextMenuController:currentController];
-    else if (currentController != [target menuController])
-        [target setMenuController:currentController];
-    
     NSMenuItem* menuItem = item.platformDescription();
     if (item.type() == ActionType) {
-        [menuItem setTarget:target];
+        [menuItem setTarget:[WebCoreMenuTarget sharedMenuTarget]];
         [menuItem setAction:@selector(forwardContextMenuAction:)];
     }
 
@@ -113,9 +109,7 @@ void ContextMenu::appendItem(const ContextMenuItem& item)
     NSMenuItem* menuItem = getNSMenuItem(this, item);
     if (!menuItem)
         return;
-
     [m_platformDescription.get() addObject:menuItem];
-    [menuItem release];
 }
 
 void ContextMenu::insertItem(unsigned position, const ContextMenuItem& item)
@@ -123,9 +117,7 @@ void ContextMenu::insertItem(unsigned position, const ContextMenuItem& item)
     NSMenuItem* menuItem = getNSMenuItem(this, item);
     if (!menuItem)
         return;
-
     [m_platformDescription.get() insertObject:menuItem atIndex:position];
-    [menuItem release];
 }
 
 unsigned ContextMenu::itemCount() const