Changeset 21240 in webkit

Timestamp:

May 3, 2007, 4:08:28 PM (18 years ago)

Author:

thatcher

Message:

Reviewed by Kevin.

<rdar://problem/4975212> REGRESSION: With NetNewsWire 2.1.1, the contextual menu shows extra menu items when focus
is placed in input or textarea field

The NetNewsWire UI delegate isn't expecting calls for form controls, so we need to do a linked-on-or-after check.
If the application was linked against Tiger or earlier and the element is a text form control, just return the
default menu items and bypass the delegate call completely.

• WebCoreSupport/WebContextMenuClient.mm: (isPreVersion3Client): Cache the result of the WebKitLinkedOnOrAfter call (fixMenusToSendToOldClients): Call the new isPreVersion3Client() (fixMenusReceivedFromOldClients): Ditto. (WebContextMenuClient::getCustomMenuFromDefaultItems): Return the default menu items if the element is a text form control.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebContextMenuClient.mm (modified) (4 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-05-03  TImothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Kevin.
+
+        <rdar://problem/4975212> REGRESSION: With NetNewsWire 2.1.1, the contextual menu shows extra menu items when focus
+        is placed in input or textarea field
+
+        The NetNewsWire UI delegate isn't expecting calls for form controls, so we need to do a linked-on-or-after check.
+        If the application was linked against Tiger or earlier and the element is a text form control, just return the
+        default menu items and bypass the delegate call completely.
+
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (isPreVersion3Client): Cache the result of the WebKitLinkedOnOrAfter call
+        (fixMenusToSendToOldClients): Call the new isPreVersion3Client()
+        (fixMenusReceivedFromOldClients): Ditto.
+        (WebContextMenuClient::getCustomMenuFromDefaultItems): Return the default menu items if the element is a text form control.
+
 2007-05-03  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/WebCoreSupport/WebContextMenuClient.mm

@@ -43 +43 @@
 #import <WebCore/ContextMenu.h>
 #import <WebCore/KURL.h>
+#import <WebKit/DOMPrivate.h>
 
 using namespace WebCore;
@@ -65 +66 @@
 }
 
+static BOOL isPreVersion3Client(void)
+{
+    static BOOL preVersion3Client = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_3_0_CONTEXT_MENU_TAGS);
+    return preVersion3Client;
+}
+
 static void fixMenusToSendToOldClients(NSMutableArray *defaultMenuItems)
 {
-    BOOL preVersion3Client = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_3_0_CONTEXT_MENU_TAGS);
+    BOOL preVersion3Client = isPreVersion3Client();
     if (!preVersion3Client)
         return;
@@ -121 +128 @@
 static void fixMenusReceivedFromOldClients(NSMutableArray *newMenuItems)
 {   
-    BOOL preVersion3Client = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_3_0_CONTEXT_MENU_TAGS);
+    BOOL preVersion3Client = isPreVersion3Client();
     if (!preVersion3Client)
         return;
@@ -216 +223 @@
     if (![delegate respondsToSelector:@selector(webView:contextMenuItemsForElement:defaultMenuItems:)])
         return defaultMenu->platformDescription();
-    
+
     NSDictionary *element = [[[WebElementDictionary alloc] initWithHitTestResult:defaultMenu->hitTestResult()] autorelease];
+
+    BOOL preVersion3Client = isPreVersion3Client();
+    if (preVersion3Client) {
+        DOMNode *node = [element objectForKey:WebElementDOMNodeKey];
+        if ([node isKindOfClass:[DOMHTMLInputElement class]] && [(DOMHTMLInputElement *)node _isTextField])
+            return defaultMenu->platformDescription();
+        if ([node isKindOfClass:[DOMHTMLTextAreaElement class]])
+            return defaultMenu->platformDescription();
+    }
+
     NSMutableArray *defaultMenuItems = defaultMenu->platformDescription();