diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-11 06:59:00 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-11 06:59:00 +0000 |
| commit | 4f17e3ba905f08c359ef9c50cc08ef36735af865 (patch) | |
| tree | 31c52447ccc0c206f6cae116d61d969a55ca22aa /webkit | |
| parent | f00e3445a8f44e5d3271ac63e10cc34bc02dc86b (diff) | |
| download | chromium_src-4f17e3ba905f08c359ef9c50cc08ef36735af865.zip chromium_src-4f17e3ba905f08c359ef9c50cc08ef36735af865.tar.gz chromium_src-4f17e3ba905f08c359ef9c50cc08ef36735af865.tar.bz2 | |
Fix a UMR in MakePlatformWheelEvent().
The problem is that WebMouseWheelEvent(HWND, UINT, WPARAM, LPARAM) does not initialize "modifiers".
Moved the initialization into base class to avoid the same mistake in the future.
Review URL: http://codereview.chromium.org/9766
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webinputevent.h | 2 | ||||
| -rw-r--r-- | webkit/glue/webinputevent_mac.mm | 3 | ||||
| -rw-r--r-- | webkit/glue/webinputevent_win.cc | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/webkit/glue/webinputevent.h b/webkit/glue/webinputevent.h index dce4394..c0a79de 100644 --- a/webkit/glue/webinputevent.h +++ b/webkit/glue/webinputevent.h @@ -37,6 +37,8 @@ typedef struct _GdkEventKey GdkEventKey; class WebInputEvent { public: + WebInputEvent() : modifiers(0) { } + enum Type { // WebMouseEvent MOUSE_DOWN, diff --git a/webkit/glue/webinputevent_mac.mm b/webkit/glue/webinputevent_mac.mm index 1358f92..e3f6af6 100644 --- a/webkit/glue/webinputevent_mac.mm +++ b/webkit/glue/webinputevent_mac.mm @@ -79,7 +79,6 @@ WebMouseEvent::WebMouseEvent(NSEvent *event, NSView* view) { // set modifiers: - modifiers = 0; if ([event modifierFlags] & NSControlKeyMask) modifiers |= CTRL_KEY; if ([event modifierFlags] & NSShiftKeyMask) @@ -125,7 +124,6 @@ WebMouseWheelEvent::WebMouseWheelEvent(NSEvent *event, NSView* view) { delta_y = delta_lines; } - modifiers = 0; if ([event modifierFlags] & NSControlKeyMask) modifiers |= CTRL_KEY; if ([event modifierFlags] & NSShiftKeyMask) @@ -943,7 +941,6 @@ static void FillVectorFromNSString(std::vector<unsigned short>* v, WebKeyboardEvent::WebKeyboardEvent(NSEvent *event) { type = WebCore::isKeyUpEvent(event) ? KEY_UP : KEY_DOWN; - modifiers = 0; if ([event modifierFlags] & NSControlKeyMask) modifiers |= CTRL_KEY; if ([event modifierFlags] & NSShiftKeyMask) diff --git a/webkit/glue/webinputevent_win.cc b/webkit/glue/webinputevent_win.cc index 7933427..a359db9 100644 --- a/webkit/glue/webinputevent_win.cc +++ b/webkit/glue/webinputevent_win.cc @@ -96,7 +96,6 @@ WebMouseEvent::WebMouseEvent(HWND hwnd, UINT message, WPARAM wparam, // set modifiers: - modifiers = 0; if (wparam & MK_CONTROL) modifiers |= CTRL_KEY; if (wparam & MK_SHIFT) @@ -249,7 +248,6 @@ WebMouseWheelEvent::WebMouseWheelEvent(HWND hwnd, UINT message, WPARAM wparam, WebKeyboardEvent::WebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { - modifiers = 0; system_key = false; actual_message.hwnd = hwnd; |