[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[adachan at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 69ceddb8593cdceddc282e6f91581020a94ba726
Author: adachan at apple.com <adachan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 18:38:10 2010 +0000

            Reviewed by Adam Roben.
    
            https://bugs.webkit.org/show_bug.cgi?id=35976
    
            Retrieve any dwItemData that's set on the context menu item in contextMenuItemByIdOrPosition().
    
            * platform/win/ContextMenuWin.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55787 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eef9d52..4a52342 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-10  Ada Chan  <adachan at apple.com>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35976
+
+        Retrieve any dwItemData that's set on the context menu item in contextMenuItemByIdOrPosition().
+
+        * platform/win/ContextMenuWin.cpp:
+
 2010-03-10  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/win/ContextMenuWin.cpp b/WebCore/platform/win/ContextMenuWin.cpp
index 26b081a..af557fd 100644
--- a/WebCore/platform/win/ContextMenuWin.cpp
+++ b/WebCore/platform/win/ContextMenuWin.cpp
@@ -90,7 +90,8 @@ static ContextMenuItem* contextMenuItemByIdOrPosition(HMENU menu, unsigned id, B
 
     info->cbSize = sizeof(MENUITEMINFO);
     
-    info->fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING;
+    // Setting MIIM_DATA which is useful for WebKit clients who store data in this member for their custom menu items.
+    info->fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_DATA;
 
     if (!::GetMenuItemInfo(menu, id, byPosition, info)) {
         free(info);

-- 
WebKit Debian packaging