Changeset 83464 in webkit

Timestamp:

Apr 11, 2011 11:52:52 AM (13 years ago)

Author:

timothy@apple.com

Message:

Fix a bug where the context menu does not show in PDF documents if there is no
UI delegate or the UI delegate does not respond to the context menu selector.

​https://webkit.org/b/57958

Reviewed by Darin Adler.

• WebView/WebView.mm:

(-[WebView _menuForElement:defaultItems:]): CallUIDelegate returns nil
if UIDelegate is nil or doesn't respond to the selector. So check that
here to distinguish between using defaultMenuItems or the delegate
really returning nil to say "no context menu".

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-04-06  Timothy Hatcher  <timothy@apple.com>
+
+        Fix a bug where the context menu does not show in PDF documents if there is no
+        UI delegate or the UI delegate does not respond to the context menu selector.
+
+        https://webkit.org/b/57958
+
+        Reviewed by Darin Adler.
+
+        * WebView/WebView.mm:
+        (-[WebView _menuForElement:defaultItems:]): CallUIDelegate returns nil
+        if UIDelegate is nil or doesn't respond to the selector. So check that
+        here to distinguish between using defaultMenuItems or the delegate
+        really returning nil to say "no context menu".
+
 2011-04-11  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1298 +1298 @@
 {
     NSArray *defaultMenuItems = [[WebDefaultUIDelegate sharedUIDelegate] webView:self contextMenuItemsForElement:element defaultMenuItems:items];
-
-    NSArray *menuItems = CallUIDelegate(self, @selector(webView:contextMenuItemsForElement:defaultMenuItems:), element, defaultMenuItems);
-    if (!menuItems)
-        return nil;
+    NSArray *menuItems = defaultMenuItems;
+
+    // CallUIDelegate returns nil if UIDelegate is nil or doesn't respond to the selector. So we need to check that here
+    // to distinguish between using defaultMenuItems or the delegate really returning nil to say "no context menu".
+    SEL selector = @selector(webView:contextMenuItemsForElement:defaultMenuItems:);
+    if (_private->UIDelegate && [_private->UIDelegate respondsToSelector:selector]) {
+        menuItems = CallUIDelegate(self, selector, element, defaultMenuItems);
+        if (!menuItems)
+            return nil;
+    }
 
     unsigned count = [menuItems count];