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

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit a176bad0b325bb19861adad37446cf194c8dc381
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 4 01:11:31 2009 +0000

    WebActionModifierFlagsKey should return an unsigned, because
    flags imply a bitmask, and that is what other classes expect from
    it.
    
    Reviewed by Steve Falkenburg.
    
    * WebActionPropertyBag.cpp:
    (WebActionPropertyBag::Read):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50491 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index b3c8c95..4fc80ed 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-03  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        WebActionModifierFlagsKey should return an unsigned, because
+        flags imply a bitmask, and that is what other classes expect from
+        it.
+
+        * WebActionPropertyBag.cpp:
+        (WebActionPropertyBag::Read):
+
 2009-11-02  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by John Sullivan and Mark Rowe.
diff --git a/WebKit/win/WebActionPropertyBag.cpp b/WebKit/win/WebActionPropertyBag.cpp
index 31252a5..c2b9e10 100644
--- a/WebKit/win/WebActionPropertyBag.cpp
+++ b/WebKit/win/WebActionPropertyBag.cpp
@@ -142,7 +142,7 @@ HRESULT STDMETHODCALLTYPE WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARI
     }
     if (isEqual(pszPropName, WebActionModifierFlagsKey)) {
         if (const UIEventWithKeyState* keyEvent = findEventWithKeyState(const_cast<Event*>(m_action.event()))) {
-            int modifiers = 0;
+            unsigned modifiers = 0;
 
             if (keyEvent->ctrlKey())
                 modifiers |= MK_CONTROL;
@@ -151,8 +151,8 @@ HRESULT STDMETHODCALLTYPE WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARI
             if (keyEvent->altKey())
                 modifiers |= MK_ALT;
 
-            V_VT(pVar) = VT_I4;
-            V_I4(pVar) = modifiers;
+            V_VT(pVar) = VT_UI4;
+            V_UI4(pVar) = modifiers;
             return S_OK;
         }
     }

-- 
WebKit Debian packaging