Changeset 18678 in webkit

Timestamp:

Jan 8, 2007 1:32:01 PM (17 years ago)

Author:

bdakin

Message:

Reviewed by Adam.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=12161 REGRESSION:
Crash when control-clicking on an image for contextual menu

• WebView/WebHTMLView.m: (-[WebHTMLView menuForEvent:]): We need to nil-check coreMenu since it will be nil if the DOM popped up a menu instead. I cleaned up the function to make all the nil checks early returns instead of nesting all of the content. Also moved the autorelease to be with the creation of the menu instead of at the return.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.m (modified) (1 diff)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-01-08  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Adam.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=12161 REGRESSION: 
+        Crash when control-clicking on an image for contextual menu
+
+        * WebView/WebHTMLView.m:
+        (-[WebHTMLView menuForEvent:]): We need to nil-check coreMenu since 
+        it will be nil if the DOM popped up a menu instead. I cleaned up 
+        the function to make all the nil checks early returns instead of 
+        nesting all of the content. Also moved the autorelease to be with 
+        the creation of the menu instead of at the return.
+
 2007-01-08  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit/WebView/WebHTMLView.m

@@ -2545 +2545 @@
     _private->handlingMouseDownEvent = YES;
     BOOL handledEvent = NO;
-    Frame* coreframe = core([self _frame]);
-    if (coreframe)
-        handledEvent = coreframe->eventHandler()->sendContextMenuEvent(event);
+    Frame* coreFrame = core([self _frame]);
+
+    if (!coreFrame) {
+        _private->handlingMouseDownEvent = NO;
+        return nil;
+    }
+
+    handledEvent = coreFrame->eventHandler()->sendContextMenuEvent(event);
     _private->handlingMouseDownEvent = NO;
-    
-    if (handledEvent && coreframe) {
-        if (Page* page = coreframe->page()) {
-            ContextMenu* coreMenu = page->contextMenuController()->contextMenu();
-            NSArray* menuItems = coreMenu->platformDescription();
-            NSMenu* menu = nil;
-            if (menuItems && [menuItems count] > 0) {
-                menu = [[NSMenu alloc] init];
-                [menu setAutoenablesItems:NO];
-                for (unsigned i = 0; i < [menuItems count]; i++)
-                    [menu addItem:[menuItems objectAtIndex:i]];
-            }
-
-            // Add the Inspect Element menu item if the preference is set or if this is a debug build
-            if ([WebView _developerExtrasEnabled]) {
-                if (!menu)
-                    menu = [[NSMenu alloc] init];
-                else if ([menu numberOfItems])
-                    [menu addItem:[NSMenuItem separatorItem]];
-                NSMenuItem *menuItem = [[[NSMenuItem alloc] init] autorelease];
-                [menuItem setAction:@selector(_inspectElement:)];
-                [menuItem setTitle:UI_STRING("Inspect Element", "Inspect Element context menu item")];
-                [menuItem setRepresentedObject:[[[WebElementDictionary alloc] initWithHitTestResult:
-                    coreMenu->hitTestResult()] autorelease]];
-                [menu addItem:menuItem];
-            }
-
-            return [menu autorelease];
-        }
-    }
-
-    return nil;
+
+    if (!handledEvent)
+        return nil;
+
+    Page* page = coreFrame->page();
+    if (!page)
+        return nil;
+
+    ContextMenu* coreMenu = page->contextMenuController()->contextMenu();
+    if (!coreMenu)
+        return nil;
+
+    NSArray* menuItems = coreMenu->platformDescription();
+    NSMenu* menu = nil;
+    if (menuItems && [menuItems count] > 0) {
+        menu = [[[NSMenu alloc] init] autorelease];
+        [menu setAutoenablesItems:NO];
+        for (unsigned i = 0; i < [menuItems count]; i++)
+            [menu addItem:[menuItems objectAtIndex:i]];
+    }
+
+    // Add the Inspect Element menu item if the preference is set or if this is a debug build
+    if ([WebView _developerExtrasEnabled]) {
+        if (!menu)
+            menu = [[[NSMenu alloc] init] autorelease];
+        else if ([menu numberOfItems])
+            [menu addItem:[NSMenuItem separatorItem]];
+        NSMenuItem *inspectorItem = [[NSMenuItem alloc] init];
+        [inspectorItem setAction:@selector(_inspectElement:)];
+        [inspectorItem setTitle:UI_STRING("Inspect Element", "Inspect Element context menu item")];
+        [inspectorItem setRepresentedObject:[[[WebElementDictionary alloc] initWithHitTestResult:
+            coreMenu->hitTestResult()] autorelease]];
+        [menu addItem:inspectorItem];
+        [inspectorItem release];
+    }
+
+    return menu;
 }