[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

weinig at apple.com weinig at apple.com
Wed Dec 22 14:36:40 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8cff94fcf0ba6c236b935e174d88fb11b6158f16
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 04:11:05 2010 +0000

    PlatformMouseEvents need to contain modifier flags
    https://bugs.webkit.org/show_bug.cgi?id=47651
    
    Reviewed by Jon Honeycutt.
    
    * Shared/WebEventConversion.cpp:
    (WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
    Fill in m_modifierFlags.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 73c72ab..746ea6f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-13  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Jon Honeycutt.
+
+        PlatformMouseEvents need to contain modifier flags
+        https://bugs.webkit.org/show_bug.cgi?id=47651
+
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
+        Fill in m_modifierFlags.
+
 2010-10-13  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit2/Shared/WebEventConversion.cpp b/WebKit2/Shared/WebEventConversion.cpp
index a7835a7..ae77e28 100644
--- a/WebKit2/Shared/WebEventConversion.cpp
+++ b/WebKit2/Shared/WebEventConversion.cpp
@@ -75,6 +75,14 @@ public:
         m_metaKey = webEvent.metaKey();
 
         m_modifierFlags = 0;
+        if (m_shiftKey)
+            m_modifierFlags |= WebEvent::ShiftKey;
+        if (m_ctrlKey)
+            m_modifierFlags |= WebEvent::ControlKey;
+        if (m_altKey)
+            m_modifierFlags |= WebEvent::AltKey;
+        if (m_metaKey)
+            m_modifierFlags |= WebEvent::MetaKey;
     }
 };
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list