Fix REGRESSION: Right-click/control-click broken

        http://bugs.webkit.org/show_bug.cgi?id=14658
        <rdar://problem/5346830>

        Reviewed by Mitz.

        * WebCoreSupport/WebContextMenuClient.mm:
        (fixMenusToSendToOldClients): Update defaultItemsCount after removing
        items from the defaultItems array.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 653a09a76251b8fcf4095fc65e4ff437f20bc4a2..f9c5972aa250376f2254c62977f1c87cf5033802 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-21  Adam Roben  <aroben@apple.com>
+
+        Fix REGRESSION: Right-click/control-click broken
+
+        http://bugs.webkit.org/show_bug.cgi?id=14658
+        <rdar://problem/5346830>
+
+        Reviewed by Mitz.
+
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (fixMenusToSendToOldClients): Update defaultItemsCount after removing
+        items from the defaultItems array.
+
 2007-07-20  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Adele.

diff --git a/WebKit/WebCoreSupport/WebContextMenuClient.mm b/WebKit/WebCoreSupport/WebContextMenuClient.mm
index b6ec273c07431d070ec7976b59c4e7abecaf978f..c325f09593338898d5c3a1a33ffd7c801737e796 100644 (file)
--- a/WebKit/WebCoreSupport/WebContextMenuClient.mm
+++ b/WebKit/WebCoreSupport/WebContextMenuClient.mm
@@ -94,6 +94,7 @@ static NSMutableArray *fixMenusToSendToOldClients(NSMutableArray *defaultMenuIte
 
             [defaultMenuItems removeObject:secondToLastItem];
             [defaultMenuItems removeObject:lastItem];
+            defaultItemsCount -= 2;
         }
     }