content/browser/renderer_host/input/web_input_event_builders_mac.mm - Issue 1348843002: Revert of [KeyEvent Mac] Move WebInputEventFactory into chromium.

Unified Diff: content/browser/renderer_host/input/web_input_event_builders_mac.mm

Issue 1348843002: Revert of [KeyEvent Mac] Move WebInputEventFactory into chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/input/web_input_event_builders_mac.h ('k') | content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/input/web_input_event_builders_mac.mm

diff --git a/content/browser/renderer_host/input/web_input_event_builders_mac.mm b/content/browser/renderer_host/input/web_input_event_builders_mac.mm

deleted file mode 100644

index 465544699896047da5d74104b961715153c7eab3..0000000000000000000000000000000000000000

--- a/content/browser/renderer_host/input/web_input_event_builders_mac.mm

+++ /dev/null

@@ -1,912 +0,0 @@

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-/*

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. 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.

- *

- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 "content/browser/renderer_host/input/web_input_event_builders_mac.h"

-#import <ApplicationServices/ApplicationServices.h>

-#import <Cocoa/Cocoa.h>

-#include "base/mac/sdk_forward_declarations.h"

-#include "base/strings/string_util.h"

-#include "content/browser/renderer_host/input/web_input_event_util.h"

-#include "third_party/WebKit/public/web/WebInputEvent.h"

-#include "ui/events/keycodes/keyboard_code_conversion.h"

-#include "ui/events/keycodes/keyboard_code_conversion_mac.h"

-namespace content {

-namespace {

-// Return true if the target modifier key is up. OS X has an "official" flag

-// to test whether either left or right versions of a modifier key are held,

-// and "unofficial" flags for the left and right versions independently. This

-// function verifies that |target_key_mask| and |otherKeyMask| (which should be

-// the left and right versions of a modifier) are consistent with with the

-// state of |eitherKeyMask| (which should be the corresponding ""official"

-// flag). If they are consistent, it tests |target_key_mask|; otherwise it tests

-// |either_key_mask|.

-inline bool IsModifierKeyUp(unsigned int flags,

- unsigned int target_key_mask,

- unsigned int other_key_mask,

- unsigned int either_key_mask) {

- bool either_key_down = (flags & either_key_mask) != 0;

- bool target_key_down = (flags & target_key_mask) != 0;

- bool other_key_down = (flags & other_key_mask) != 0;

- if (either_key_down != (target_key_down || other_key_down))

- return !either_key_down;

- return !target_key_down;

-bool IsKeyUpEvent(NSEvent* event) {

- if ([event type] != NSFlagsChanged)

- return [event type] == NSKeyUp;

- // Unofficial bit-masks for left- and right-hand versions of modifier keys.

- // These values were determined empirically.

- const unsigned int kLeftControlKeyMask = 1 << 0;

- const unsigned int kLeftShiftKeyMask = 1 << 1;

- const unsigned int kRightShiftKeyMask = 1 << 2;

- const unsigned int kLeftCommandKeyMask = 1 << 3;

- const unsigned int kRightCommandKeyMask = 1 << 4;

- const unsigned int kLeftAlternateKeyMask = 1 << 5;

- const unsigned int kRightAlternateKeyMask = 1 << 6;

- const unsigned int kRightControlKeyMask = 1 << 13;

- switch ([event keyCode]) {

- case 54: // Right Command

- return IsModifierKeyUp([event modifierFlags], kRightCommandKeyMask,

- kLeftCommandKeyMask, NSCommandKeyMask);

- case 55: // Left Command

- return IsModifierKeyUp([event modifierFlags], kLeftCommandKeyMask,

- kRightCommandKeyMask, NSCommandKeyMask);

- case 57: // Capslock

- return ([event modifierFlags] & NSAlphaShiftKeyMask) == 0;

- case 56: // Left Shift

- return IsModifierKeyUp([event modifierFlags], kLeftShiftKeyMask,

- kRightShiftKeyMask, NSShiftKeyMask);

- case 60: // Right Shift

- return IsModifierKeyUp([event modifierFlags], kRightShiftKeyMask,

- kLeftShiftKeyMask, NSShiftKeyMask);

- case 58: // Left Alt

- return IsModifierKeyUp([event modifierFlags], kLeftAlternateKeyMask,

- kRightAlternateKeyMask, NSAlternateKeyMask);

- case 61: // Right Alt

- return IsModifierKeyUp([event modifierFlags], kRightAlternateKeyMask,

- kLeftAlternateKeyMask, NSAlternateKeyMask);

- case 59: // Left Ctrl

- return IsModifierKeyUp([event modifierFlags], kLeftControlKeyMask,

- kRightControlKeyMask, NSControlKeyMask);

- case 62: // Right Ctrl

- return IsModifierKeyUp([event modifierFlags], kRightControlKeyMask,

- kLeftControlKeyMask, NSControlKeyMask);

- case 63: // Function

- return ([event modifierFlags] & NSFunctionKeyMask) == 0;

- }

- return false;

-inline NSString* TextFromEvent(NSEvent* event) {

- if ([event type] == NSFlagsChanged)

- return @"";

- return [event characters];

-inline NSString* UnmodifiedTextFromEvent(NSEvent* event) {

- if ([event type] == NSFlagsChanged)

- return @"";

- return [event charactersIgnoringModifiers];

-NSString* KeyIdentifierForKeyEvent(NSEvent* event) {

- if ([event type] == NSFlagsChanged) {

- switch ([event keyCode]) {

- case 54: // Right Command

- case 55: // Left Command

- return @"Meta";

- case 57: // Capslock

- return @"CapsLock";

- case 56: // Left Shift

- case 60: // Right Shift

- return @"Shift";

- case 58: // Left Alt

- case 61: // Right Alt

- return @"Alt";

- case 59: // Left Ctrl

- case 62: // Right Ctrl

- return @"Control";

- // Begin non-Apple addition/modification

- // --------------------------------------

- case 63: // Function

- return @"Function";

- default: // Unknown, but this may be a strange/new keyboard.

- return @"Unidentified";

- // End non-Apple addition/modification

- // ----------------------------------------

- }

- NSString* s = [event charactersIgnoringModifiers];

- if ([s length] != 1)

- return @"Unidentified";

- unichar c = [s characterAtIndex:0];

- switch (c) {

- // Each identifier listed in the DOM spec is listed here.

- // Many are simply commented out since they do not appear on standard

- // Macintosh keyboards

- // or are on a key that doesn't have a corresponding character.

- // "Accept"

- // "AllCandidates"

- // "Alt"

- case NSMenuFunctionKey:

- return @"Alt";

- // "Apps"

- // "BrowserBack"

- // "BrowserForward"

- // "BrowserHome"

- // "BrowserRefresh"

- // "BrowserSearch"

- // "BrowserStop"

- // "CapsLock"

- // "Clear"

- case NSClearLineFunctionKey:

- return @"Clear";

- // "CodeInput"

- // "Compose"

- // "Control"

- // "Crsel"

- // "Convert"

- // "Copy"

- // "Cut"

- // "Down"

- case NSDownArrowFunctionKey:

- return @"Down";

- // "End"

- case NSEndFunctionKey:

- return @"End";

- // "Enter"

- case 0x3:

- case 0xA:

- case 0xD: // Macintosh calls the one on the main keyboard Return, but

- // Windows calls it Enter, so we'll do the same for the DOM

- return @"Enter";

- // "EraseEof"

- // "Execute"

- case NSExecuteFunctionKey:

- return @"Execute";

- // "Exsel"

- // "F1"

- case NSF1FunctionKey:

- return @"F1";

- // "F2"

- case NSF2FunctionKey:

- return @"F2";

- // "F3"

- case NSF3FunctionKey:

- return @"F3";

- // "F4"

- case NSF4FunctionKey:

- return @"F4";

- // "F5"

- case NSF5FunctionKey:

- return @"F5";

- // "F6"

- case NSF6FunctionKey:

- return @"F6";

- // "F7"

- case NSF7FunctionKey:

- return @"F7";

- // "F8"

- case NSF8FunctionKey:

- return @"F8";

- // "F9"

- case NSF9FunctionKey:

- return @"F9";

- // "F10"

- case NSF10FunctionKey:

- return @"F10";

- // "F11"

- case NSF11FunctionKey:

- return @"F11";

- // "F12"

- case NSF12FunctionKey:

- return @"F12";

- // "F13"

- case NSF13FunctionKey:

- return @"F13";

- // "F14"

- case NSF14FunctionKey:

- return @"F14";

- // "F15"

- case NSF15FunctionKey:

- return @"F15";

- // "F16"

- case NSF16FunctionKey:

- return @"F16";

- // "F17"

- case NSF17FunctionKey:

- return @"F17";

- // "F18"

- case NSF18FunctionKey:

- return @"F18";

- // "F19"

- case NSF19FunctionKey:

- return @"F19";

- // "F20"

- case NSF20FunctionKey:

- return @"F20";

- // "F21"

- case NSF21FunctionKey:

- return @"F21";

- // "F22"

- case NSF22FunctionKey:

- return @"F22";

- // "F23"

- case NSF23FunctionKey:

- return @"F23";

- // "F24"

- case NSF24FunctionKey:

- return @"F24";

- // "FinalMode"

- // "Find"

- case NSFindFunctionKey:

- return @"Find";

- // "FullWidth"

- // "HalfWidth"

- // "HangulMode"

- // "HanjaMode"

- // "Help"

- case NSHelpFunctionKey:

- return @"Help";

- // "Hiragana"

- // "Home"

- case NSHomeFunctionKey:

- return @"Home";

- // "Insert"

- case NSInsertFunctionKey:

- return @"Insert";

- // "JapaneseHiragana"

- // "JapaneseKatakana"

- // "JapaneseRomaji"

- // "JunjaMode"

- // "KanaMode"

- // "KanjiMode"

- // "Katakana"

- // "LaunchApplication1"

- // "LaunchApplication2"

- // "LaunchMail"

- // "Left"

- case NSLeftArrowFunctionKey:

- return @"Left";

- // "Meta"

- // "MediaNextTrack"

- // "MediaPlayPause"

- // "MediaPreviousTrack"

- // "MediaStop"

- // "ModeChange"

- case NSModeSwitchFunctionKey:

- return @"ModeChange";

- // "Nonconvert"

- // "NumLock"

- // "PageDown"

- case NSPageDownFunctionKey:

- return @"PageDown";

- // "PageUp"

- case NSPageUpFunctionKey:

- return @"PageUp";

- // "Paste"

- // "Pause"

- case NSPauseFunctionKey:

- return @"Pause";

- // "Play"

- // "PreviousCandidate"

- // "PrintScreen"

- case NSPrintScreenFunctionKey:

- return @"PrintScreen";

- // "Process"

- // "Props"

- // "Right"

- case NSRightArrowFunctionKey:

- return @"Right";

- // "RomanCharacters"

- // "Scroll"

- case NSScrollLockFunctionKey:

- return @"Scroll";

- // "Select"

- case NSSelectFunctionKey:

- return @"Select";

- // "SelectMedia"

- // "Shift"

- // "Stop"

- case NSStopFunctionKey:

- return @"Stop";

- // "Up"

- case NSUpArrowFunctionKey:

- return @"Up";

- // "Undo"

- case NSUndoFunctionKey:

- return @"Undo";

- // "VolumeDown"

- // "VolumeMute"

- // "VolumeUp"

- // "Win"

- // "Zoom"

- // More function keys, not in the key identifier specification.

- case NSF25FunctionKey:

- return @"F25";

- case NSF26FunctionKey:

- return @"F26";

- case NSF27FunctionKey:

- return @"F27";

- case NSF28FunctionKey:

- return @"F28";

- case NSF29FunctionKey:

- return @"F29";

- case NSF30FunctionKey:

- return @"F30";

- case NSF31FunctionKey:

- return @"F31";

- case NSF32FunctionKey:

- return @"F32";

- case NSF33FunctionKey:

- return @"F33";

- case NSF34FunctionKey:

- return @"F34";

- case NSF35FunctionKey:

- return @"F35";

- // Turn 0x7F into 0x08, because backspace needs to always be 0x08.

- case 0x7F:

- return @"U+0008";

- // Standard says that DEL becomes U+007F.

- case NSDeleteFunctionKey:

- return @"U+007F";

- // Always use 0x09 for tab instead of AppKit's backtab character.

- case NSBackTabCharacter:

- return @"U+0009";

- case NSBeginFunctionKey:

- case NSBreakFunctionKey:

- case NSClearDisplayFunctionKey:

- case NSDeleteCharFunctionKey:

- case NSDeleteLineFunctionKey:

- case NSInsertCharFunctionKey:

- case NSInsertLineFunctionKey:

- case NSNextFunctionKey:

- case NSPrevFunctionKey:

- case NSPrintFunctionKey:

- case NSRedoFunctionKey:

- case NSResetFunctionKey:

- case NSSysReqFunctionKey:

- case NSSystemFunctionKey:

- case NSUserFunctionKey:

- // FIXME: We should use something other than the vendor-area Unicode values

- // for the above keys.

- // For now, just fall through to the default.

- default:

- return [NSString stringWithFormat:@"U+%04X", base::ToUpperASCII(c)];

- }

-// End Apple code.

-// ----------------------------------------------------------------------------

-int ModifiersFromEvent(NSEvent* event) {

- int modifiers = 0;

- if ([event modifierFlags] & NSControlKeyMask)

- modifiers |= blink::WebInputEvent::ControlKey;

- if ([event modifierFlags] & NSShiftKeyMask)

- modifiers |= blink::WebInputEvent::ShiftKey;

- if ([event modifierFlags] & NSAlternateKeyMask)

- modifiers |= blink::WebInputEvent::AltKey;

- if ([event modifierFlags] & NSCommandKeyMask)

- modifiers |= blink::WebInputEvent::MetaKey;

- if ([event modifierFlags] & NSAlphaShiftKeyMask)

- modifiers |= blink::WebInputEvent::CapsLockOn;

- // The return value of 1 << 0 corresponds to the left mouse button,

- // 1 << 1 corresponds to the right mouse button,

- // 1 << n, n >= 2 correspond to other mouse buttons.

- NSUInteger pressed_buttons = [NSEvent pressedMouseButtons];

- if (pressed_buttons & (1 << 0))

- modifiers |= blink::WebInputEvent::LeftButtonDown;

- if (pressed_buttons & (1 << 1))

- modifiers |= blink::WebInputEvent::RightButtonDown;

- if (pressed_buttons & (1 << 2))

- modifiers |= blink::WebInputEvent::MiddleButtonDown;

- return modifiers;

-void SetWebEventLocationFromEventInView(blink::WebMouseEvent* result,

- NSEvent* event,

- NSView* view) {

- NSPoint window_local = [event locationInWindow];

- NSPoint screen_local = [[view window] convertBaseToScreen:window_local];

- result->globalX = screen_local.x;

- // Flip y.

- NSScreen* primary_screen = ([[NSScreen screens] count] > 0)

- ? [[NSScreen screens] objectAtIndex:0]

- : nil;

- if (primary_screen)

- result->globalY = [primary_screen frame].size.height - screen_local.y;

- else

- result->globalY = screen_local.y;

- NSPoint content_local = [view convertPoint:window_local fromView:nil];

- result->x = content_local.x;

- result->y = [view frame].size.height - content_local.y; // Flip y.

- result->windowX = result->x;

- result->windowY = result->y;

- result->movementX = [event deltaX];

- result->movementY = [event deltaY];

-bool IsSystemKeyEvent(const blink::WebKeyboardEvent& event) {

- // Windows and Linux set |isSystemKey| if alt is down. Blink looks at this

- // flag to decide if it should handle a key or not. E.g. alt-left/right

- // shouldn't be used by Blink to scroll the current page, because we want

- // to get that key back for it to do history navigation. Hence, the

- // corresponding situation on OS X is to set this for cmd key presses.

- // cmd-b and and cmd-i are system wide key bindings that OS X doesn't

- // handle for us, so the editor handles them.

- return event.modifiers & blink::WebInputEvent::MetaKey &&

- event.windowsKeyCode != ui::VKEY_B &&

- event.windowsKeyCode != ui::VKEY_I;

-blink::WebMouseWheelEvent::Phase PhaseForNSEventPhase(

- NSEventPhase event_phase) {

- uint32_t phase = blink::WebMouseWheelEvent::PhaseNone;

- if (event_phase & NSEventPhaseBegan)

- phase |= blink::WebMouseWheelEvent::PhaseBegan;

- if (event_phase & NSEventPhaseStationary)

- phase |= blink::WebMouseWheelEvent::PhaseStationary;

- if (event_phase & NSEventPhaseChanged)

- phase |= blink::WebMouseWheelEvent::PhaseChanged;

- if (event_phase & NSEventPhaseEnded)

- phase |= blink::WebMouseWheelEvent::PhaseEnded;

- if (event_phase & NSEventPhaseCancelled)

- phase |= blink::WebMouseWheelEvent::PhaseCancelled;

- if (event_phase & NSEventPhaseMayBegin)

- phase |= blink::WebMouseWheelEvent::PhaseMayBegin;

- return static_cast<blink::WebMouseWheelEvent::Phase>(phase);

-blink::WebMouseWheelEvent::Phase PhaseForEvent(NSEvent* event) {

- if (![event respondsToSelector:@selector(phase)])

- return blink::WebMouseWheelEvent::PhaseNone;

- NSEventPhase event_phase = [event phase];

- return PhaseForNSEventPhase(event_phase);

-blink::WebMouseWheelEvent::Phase MomentumPhaseForEvent(NSEvent* event) {

- if (![event respondsToSelector:@selector(momentumPhase)])

- return blink::WebMouseWheelEvent::PhaseNone;

- NSEventPhase event_momentum_phase = [event momentumPhase];

- return PhaseForNSEventPhase(event_momentum_phase);

-} // namespace

-blink::WebKeyboardEvent WebKeyboardEventBuilder::Build(NSEvent* event) {

- blink::WebKeyboardEvent result;

- result.type = IsKeyUpEvent(event) ? blink::WebInputEvent::KeyUp

- : blink::WebInputEvent::RawKeyDown;

- result.modifiers = ModifiersFromEvent(event);

- if (([event type] != NSFlagsChanged) && [event isARepeat])

- result.modifiers |= blink::WebInputEvent::IsAutoRepeat;

- ui::DomCode dom_code = ui::CodeFromNSEvent(event);

- result.windowsKeyCode =

- ui::LocatedToNonLocatedKeyboardCode(ui::KeyboardCodeFromNSEvent(event));

- result.modifiers |= DomCodeToWebInputEventModifiers(dom_code);

- result.nativeKeyCode = [event keyCode];

- result.domCode = static_cast<int>(dom_code);

- NSString* text_str = TextFromEvent(event);

- NSString* unmodified_str = UnmodifiedTextFromEvent(event);

- NSString* identifier_str = KeyIdentifierForKeyEvent(event);

- // Begin Apple code, copied from KeyEventMac.mm

- // Always use 13 for Enter/Return -- we don't want to use AppKit's

- // different character for Enter.

- if (result.windowsKeyCode == '\r') {

- text_str = @"\r";

- unmodified_str = @"\r";

- }

- // The adjustments below are only needed in backward compatibility mode,

- // but we cannot tell what mode we are in from here.

- // Turn 0x7F into 8, because backspace needs to always be 8.

- if ([text_str isEqualToString:@"\x7F"])

- text_str = @"\x8";

- if ([unmodified_str isEqualToString:@"\x7F"])

- unmodified_str = @"\x8";

- // Always use 9 for tab -- we don't want to use AppKit's different character

- // for shift-tab.

- if (result.windowsKeyCode == 9) {

- text_str = @"\x9";

- unmodified_str = @"\x9";

- }

- // End Apple code.

- if ([text_str length] < blink::WebKeyboardEvent::textLengthCap &&

- [unmodified_str length] < blink::WebKeyboardEvent::textLengthCap) {

- [text_str getCharacters:&result.text[0]];

- [unmodified_str getCharacters:&result.unmodifiedText[0]];

- } else

- NOTIMPLEMENTED();

- [identifier_str getCString:&result.keyIdentifier[0]

- maxLength:sizeof(result.keyIdentifier)

- encoding:NSASCIIStringEncoding];

- result.timeStampSeconds = [event timestamp];

- result.isSystemKey = IsSystemKeyEvent(result);

- return result;

-// WebMouseEvent --------------------------------------------------------------

-blink::WebMouseEvent WebMouseEventBuilder::Build(NSEvent* event, NSView* view) {

- blink::WebMouseEvent result;

- result.clickCount = 0;

- switch ([event type]) {

- case NSMouseExited:

- result.type = blink::WebInputEvent::MouseLeave;

- result.button = blink::WebMouseEvent::ButtonNone;

- break;

- case NSLeftMouseDown:

- result.type = blink::WebInputEvent::MouseDown;