Reviewed by Adele.

        - fixed problem with mouse wheel patch where alt and shift keys were switched

        * khtml/xml/dom2_eventsimpl.h:
        use the order cntl, alt, shift, meta in KeyboardEventImpl constructors to match
        superclass. This isn't necessary to fix the bug, but is better for clarity.

        * khtml/xml/dom2_eventsimpl.cpp:
        (KeyboardEventImpl::KeyboardEventImpl):
        switch parameter order to match superclass. Then pass the parameters to superclass's
        constructor in the right order.
        (KeyboardEventImpl::initKeyboardEvent):
        Pass parameters to superclass's constructor in the right order.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c63cd7e364708be3f2e244e3da737139926d1144..77817ee63ad5d282244f76cfeeb0cbaafc291903 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2005-04-27  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Adele.
+
+        - fixed problem with mouse wheel patch where alt and shift keys were switched
+
+        * khtml/xml/dom2_eventsimpl.h:
+        use the order cntl, alt, shift, meta in KeyboardEventImpl constructors to match
+        superclass. This isn't necessary to fix the bug, but is better for clarity.
+        
+        * khtml/xml/dom2_eventsimpl.cpp:
+        (KeyboardEventImpl::KeyboardEventImpl):
+        switch parameter order to match superclass. Then pass the parameters to superclass's
+        constructor in the right order.
+        (KeyboardEventImpl::initKeyboardEvent):
+        Pass parameters to superclass's constructor in the right order.
+
 2005-04-26  Adele Peterson  <adele@apple.com>
 
         Fixed by Darin, reviewed by me.

diff --git a/WebCore/khtml/xml/dom2_eventsimpl.cpp b/WebCore/khtml/xml/dom2_eventsimpl.cpp
index 768a0423dddcd0ceb9e27547756c129d862dd033..7357cbd3b917bbb27d3800b9905d458408ea38da 100644 (file)
--- a/WebCore/khtml/xml/dom2_eventsimpl.cpp
+++ b/WebCore/khtml/xml/dom2_eventsimpl.cpp
@@ -513,8 +513,8 @@ KeyboardEventImpl::KeyboardEventImpl(QKeyEvent *key, AbstractViewImpl *view)
   : UIEventWithKeyStateImpl(key->type() == QEvent::KeyRelease ? KEYUP_EVENT : key->isAutoRepeat() ? KEYPRESS_EVENT : KEYDOWN_EVENT,
     true, true, view, 0,
     key->state() & Qt::ControlButton,
-    key->state() & Qt::ShiftButton,
     key->state() & Qt::AltButton,
+    key->state() & Qt::ShiftButton,
     key->state() & Qt::MetaButton)
 {
 #if APPLE_CHANGES
@@ -547,11 +547,11 @@ KeyboardEventImpl::KeyboardEventImpl(EventId _id,
                                         const DOMString &keyIdentifierArg, 
                                         unsigned long keyLocationArg, 
                                         bool ctrlKeyArg, 
-                                        bool shiftKeyArg, 
                                         bool altKeyArg, 
+                                        bool shiftKeyArg, 
                                         bool metaKeyArg, 
                                         bool altGraphKeyArg)
-  : UIEventWithKeyStateImpl(_id, canBubbleArg, cancelableArg, viewArg, 0, ctrlKeyArg, shiftKeyArg, altKeyArg, metaKeyArg)
+  : UIEventWithKeyStateImpl(_id, canBubbleArg, cancelableArg, viewArg, 0, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg)
 {
     m_keyEvent = 0;
     m_keyIdentifier = keyIdentifierArg.implementation();
@@ -575,8 +575,8 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
                         const DOMString &keyIdentifierArg, 
                         unsigned long keyLocationArg, 
                         bool ctrlKeyArg, 
-                        bool shiftKeyArg, 
                         bool altKeyArg, 
+                        bool shiftKeyArg, 
                         bool metaKeyArg, 
                         bool altGraphKeyArg)
 {

diff --git a/WebCore/khtml/xml/dom2_eventsimpl.h b/WebCore/khtml/xml/dom2_eventsimpl.h
index 7da5f88a802e7a1816b57172d76a19f1d99da569..d5f3f371629ac935a5eb7f22994c24b677a46457 100644 (file)
--- a/WebCore/khtml/xml/dom2_eventsimpl.h
+++ b/WebCore/khtml/xml/dom2_eventsimpl.h
@@ -325,8 +325,8 @@ public:
                 const DOMString &keyIdentifierArg,
                 unsigned long keyLocationArg,
                 bool ctrlKeyArg,
-                bool shiftKeyArg,
                 bool altKeyArg,
+                bool shiftKeyArg,
                 bool metaKeyArg,
                 bool altGraphKeyArg);
     virtual ~KeyboardEventImpl();
@@ -338,8 +338,8 @@ public:
                 const DOMString &keyIdentifierArg,
                 unsigned long keyLocationArg,
                 bool ctrlKeyArg,
-                bool shiftKeyArg,
                 bool altKeyArg,
+                bool shiftKeyArg,
                 bool metaKeyArg,
                 bool altGraphKeyArg);