Changeset 19494 in webkit

Timestamp:

Feb 7, 2007 9:41:39 PM (17 years ago)

Author:

aroben

Message:

2007-02-07 Charles Ying <​charles_ying@yahoo.com>

Reviewed by Adam.

Code suggestion by aroben

Fix ​http://bugs.webkit.org/show_bug.cgi?id=12688

REGRESSION (r19469): ASSERT when right clicking on hyperlinks! in TOT webkit

• WebCoreSupport/WebContextMenuClient.mm: (fixMenusReceivedFromOldClients):

• fixMenusReceivedFromOldClients was hitting an ASSERT incorrectly because it could not match [item title] to any of the contentMenuItemTags using pointer comparison ==. Instead, it needs to do a string comparison between [item title] and the various contentMenuItemTags using isEqualToString instead of ==. You would encounter this whenever the context menu was activated, e.g., from a hyperlink right click (or control click).

Location:

trunk/WebKit

Files:

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

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-02-07  Charles Ying  <charles_ying@yahoo.com>
+
+        Reviewed by Adam.
+
+        Code suggestion by aroben
+        
+        Fix http://bugs.webkit.org/show_bug.cgi?id=12688
+
+        REGRESSION (r19469): ASSERT when right clicking on hyperlinks! in TOT webkit
+        
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (fixMenusReceivedFromOldClients):
+
+        - fixMenusReceivedFromOldClients was hitting an ASSERT incorrectly
+        because it could not match [item title] to any of the contentMenuItemTags
+        using pointer comparison ==. Instead, it needs to do a string comparison
+        between [item title] and the various contentMenuItemTags using
+        isEqualToString instead of ==. You would encounter this whenever the
+        context menu was activated, e.g., from a hyperlink right click (or
+        control click).
+
+
 2007-02-07  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebKit/WebCoreSupport/WebContextMenuClient.mm

@@ -133 +133 @@
         
         NSString *title = [item title];
-        if (title == [[WebViewFactory sharedFactory] contextMenuItemTagOpenLink])
+        if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagOpenLink]])
             [item setTag:WebMenuItemTagOpenLink];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagIgnoreGrammar])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagIgnoreGrammar]])
             [item setTag:WebMenuItemTagIgnoreGrammar];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagSpellingMenu])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagSpellingMenu]])
             [item setTag:WebMenuItemTagSpellingMenu];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagShowSpellingPanel:true]
-            || title == [[WebViewFactory sharedFactory] contextMenuItemTagShowSpellingPanel:false])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagShowSpellingPanel:true]]
+            || [title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagShowSpellingPanel:false]])
             [item setTag:WebMenuItemTagShowSpellingPanel];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagCheckSpelling])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagCheckSpelling]])
             [item setTag:WebMenuItemTagCheckSpelling];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagCheckSpellingWhileTyping])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagCheckSpellingWhileTyping]])
             [item setTag:WebMenuItemTagCheckSpellingWhileTyping];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagCheckGrammarWithSpelling])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagCheckGrammarWithSpelling]])
             [item setTag:WebMenuItemTagCheckGrammarWithSpelling];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagFontMenu])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagFontMenu]])
             [item setTag:WebMenuItemTagFontMenu];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagShowFonts])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagShowFonts]])
             [item setTag:WebMenuItemTagShowFonts];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagBold])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagBold]])
             [item setTag:WebMenuItemTagBold];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagItalic])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagItalic]])
             [item setTag:WebMenuItemTagItalic];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagUnderline])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagUnderline]])
             [item setTag:WebMenuItemTagUnderline];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagOutline])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagOutline]])
             [item setTag:WebMenuItemTagOutline];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagStyles])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagStyles]])
             [item setTag:WebMenuItemTagStyles];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagShowColors])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagShowColors]])
             [item setTag:WebMenuItemTagShowColors];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagSpeechMenu])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagSpeechMenu]])
             [item setTag:WebMenuItemTagSpeechMenu];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagStartSpeaking])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagStartSpeaking]])
             [item setTag:WebMenuItemTagStartSpeaking];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagStopSpeaking])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagStopSpeaking]])
             [item setTag:WebMenuItemTagStopSpeaking];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagWritingDirectionMenu])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagWritingDirectionMenu]])
             [item setTag:WebMenuItemTagWritingDirectionMenu];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagDefaultDirection])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagDefaultDirection]])
             [item setTag:WebMenuItemTagDefaultDirection];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagLeftToRight])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagLeftToRight]])
             [item setTag:WebMenuItemTagLeftToRight];
-        else if (title == [[WebViewFactory sharedFactory] contextMenuItemTagRightToLeft])
+        else if ([title isEqualToString:[[WebViewFactory sharedFactory] contextMenuItemTagRightToLeft]])
             [item setTag:WebMenuItemTagRightToLeft];
         else {