Modified: branches/chromium/1271/Source/WebKit/chromium/WebKit.gypi (130945 => 130946)
--- branches/chromium/1271/Source/WebKit/chromium/WebKit.gypi 2012-10-10 20:18:55 UTC (rev 130945)
+++ branches/chromium/1271/Source/WebKit/chromium/WebKit.gypi 2012-10-10 20:22:21 UTC (rev 130946)
@@ -103,6 +103,7 @@
'tests/WebCompositorInputHandlerImplTest.cpp',
'tests/WebFrameTest.cpp',
'tests/WebInputEventConversionTest.cpp',
+ 'tests/WebInputEventFactoryTestMac.mm',
'tests/WebMediaPlayerClientImplTest.cpp',
'tests/WebPageNewSerializerTest.cpp',
'tests/WebPageSerializerTest.cpp',
Modified: branches/chromium/1271/Source/WebKit/chromium/WebKitUnitTests.gyp (130945 => 130946)
--- branches/chromium/1271/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-10-10 20:18:55 UTC (rev 130945)
+++ branches/chromium/1271/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-10-10 20:22:21 UTC (rev 130946)
@@ -129,6 +129,11 @@
'io_stream_forwarder_android',
],
}],
+ ['OS=="mac"', {
+ 'include_dirs': [
+ 'public/mac',
+ ],
+ }],
],
}
], # targets
Modified: branches/chromium/1271/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm (130945 => 130946)
--- branches/chromium/1271/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm 2012-10-10 20:18:55 UTC (rev 130945)
+++ branches/chromium/1271/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm 2012-10-10 20:22:21 UTC (rev 130946)
@@ -135,9 +135,6 @@
return false;
}
- if ([event modifierFlags] & NSNumericPadKeyMask)
- return true;
-
switch ([event keyCode]) {
case 71: // Clear
case 81: // =
Copied: branches/chromium/1271/Source/WebKit/chromium/tests/WebInputEventFactoryTestMac.mm (from rev 130691, trunk/Source/WebKit/chromium/tests/WebInputEventFactoryTestMac.mm) (0 => 130946)
--- branches/chromium/1271/Source/WebKit/chromium/tests/WebInputEventFactoryTestMac.mm (rev 0)
+++ branches/chromium/1271/Source/WebKit/chromium/tests/WebInputEventFactoryTestMac.mm 2012-10-10 20:22:21 UTC (rev 130946)
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#import <Cocoa/Cocoa.h>
+#include <gtest/gtest.h>
+
+#include "KeyboardEvent.h"
+#include "WebInputEvent.h"
+#include "WebInputEventFactory.h"
+
+using WebKit::WebInputEventFactory;
+using WebKit::WebKeyboardEvent;
+
+namespace {
+
+NSEvent* BuildFakeKeyEvent(NSUInteger keyCode, unichar character, NSUInteger modifierFlags)
+{
+ NSString* string = [NSString stringWithCharacters:&character length:1];
+ return [NSEvent keyEventWithType:NSKeyDown
+ location:NSZeroPoint
+ modifierFlags:modifierFlags
+ timestamp:0.0
+ windowNumber:0
+ context:nil
+ characters:string
+ charactersIgnoringModifiers:string
+ isARepeat:NO
+ keyCode:keyCode];
+}
+
+} // namespace
+
+// Test that arrow keys don't have numpad modifier set.
+TEST(WebInputEventFactoryTestMac, ArrowKeyNumPad)
+{
+ // Left
+ NSEvent* macEvent = BuildFakeKeyEvent(0x7B, NSLeftArrowFunctionKey, NSNumericPadKeyMask);
+ WebKeyboardEvent webEvent = WebInputEventFactory::keyboardEvent(macEvent);
+ EXPECT_EQ(0, webEvent.modifiers);
+
+ // Right
+ macEvent = BuildFakeKeyEvent(0x7C, NSRightArrowFunctionKey, NSNumericPadKeyMask);
+ webEvent = WebInputEventFactory::keyboardEvent(macEvent);
+ EXPECT_EQ(0, webEvent.modifiers);
+
+ // Down
+ macEvent = BuildFakeKeyEvent(0x7D, NSDownArrowFunctionKey, NSNumericPadKeyMask);
+ webEvent = WebInputEventFactory::keyboardEvent(macEvent);
+ EXPECT_EQ(0, webEvent.modifiers);
+
+ // Up
+ macEvent = BuildFakeKeyEvent(0x7E, NSUpArrowFunctionKey, NSNumericPadKeyMask);
+ webEvent = WebInputEventFactory::keyboardEvent(macEvent);
+ EXPECT_EQ(0, webEvent.modifiers);
+}
