Reviewed by Brady.
authorbdakin <bdakin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2006 20:47:58 +0000 (20:47 +0000)
committerbdakin <bdakin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2006 20:47:58 +0000 (20:47 +0000)
        Build fix for WebCore ContextMenus. It got broken by r18046.

        * WebView/WebHTMLView.m:
        (-[NSArray menuForEvent:]):

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

WebKit/ChangeLog
WebKit/WebView/WebHTMLView.m

index 549b37a72559a9f604bb5fd6c551838c43746e2a..7291c5663d0272abad078d3adad00cf40d70f6ff 100644 (file)
@@ -1,3 +1,12 @@
+2006-12-07  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Brady.
+
+        Build fix for WebCore ContextMenus. It got broken by r18046.
+
+        * WebView/WebHTMLView.m:
+        (-[NSArray menuForEvent:]):
+
 2006-12-07  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Brady.
index 49182011bf94a62c00b9eaede42dc2dfc3b0ecf9..f97049e1e02e08d464d2a84565268b15b63063a6 100644 (file)
@@ -2663,9 +2663,9 @@ static WebHTMLView *lastHitView = nil;
         handledEvent = coreframe->eventHandler()->sendContextMenuEvent(event);
     _private->handlingMouseDownEvent = NO;
     
-    if (handledEvent) {
+    if (handledEvent && coreframe) {
 #ifdef WEBCORE_CONTEXT_MENUS
-        if (coreframe && Page* page = coreframe->page()) {
+        if (Page* page = coreframe->page()) {
             NSArray* menuItems = page->contextMenuController()->contextMenu()->platformDescription();
             NSMenu* menu = nil;
             if (menuItems && [menuItems count] > 0) {