OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007 Apple, Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007 Apple, Inc. All rights reserved. |
3 * Copyright (C) 2012 Google, Inc. All rights reserved. | 3 * Copyright (C) 2012 Google, Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
378 { VKEY_RIGHT, CtrlKey | ShiftKey, | 378 { VKEY_RIGHT, CtrlKey | ShiftKey, |
379 "MoveWordRightAndModifySelection" }, | 379 "MoveWordRightAndModifySelection" }, |
380 #endif | 380 #endif |
381 { VKEY_UP, 0, "MoveUp" }, | 381 { VKEY_UP, 0, "MoveUp" }, |
382 { VKEY_UP, ShiftKey, "MoveUpAndModifySelection" }, | 382 { VKEY_UP, ShiftKey, "MoveUpAndModifySelection" }, |
383 { VKEY_PRIOR, ShiftKey, "MovePageUpAndModifySelection" }, | 383 { VKEY_PRIOR, ShiftKey, "MovePageUpAndModifySelection" }, |
384 { VKEY_DOWN, 0, "MoveDown" }, | 384 { VKEY_DOWN, 0, "MoveDown" }, |
385 { VKEY_DOWN, ShiftKey, "MoveDownAndModifySelection" }, | 385 { VKEY_DOWN, ShiftKey, "MoveDownAndModifySelection" }, |
386 { VKEY_NEXT, ShiftKey, "MovePageDownAndModifySelection" }, | 386 { VKEY_NEXT, ShiftKey, "MovePageDownAndModifySelection" }, |
387 #if !OS(DARWIN) | 387 #if !OS(DARWIN) |
388 { VKEY_UP, CtrlKey, "MoveParagraphBackward" }, | |
389 { VKEY_UP, CtrlKey | ShiftKey, "MoveParagraphBackwardAndModifySelection" }, | |
390 { VKEY_DOWN, CtrlKey, "MoveParagraphForward" }, | |
391 { VKEY_DOWN, CtrlKey | ShiftKey, "MoveParagraphForwardAndModifySelection" }, | |
392 #endif | |
tkent
2013/06/27 05:33:14
This #endif and #if are unnecessary.
yosin_UTC9
2013/06/27 05:48:03
Done.
| |
393 #if !OS(DARWIN) | |
388 { VKEY_PRIOR, 0, "MovePageUp" }, | 394 { VKEY_PRIOR, 0, "MovePageUp" }, |
389 { VKEY_NEXT, 0, "MovePageDown" }, | 395 { VKEY_NEXT, 0, "MovePageDown" }, |
390 #endif | 396 #endif |
391 { VKEY_HOME, 0, "MoveToBeginningOfLine" }, | 397 { VKEY_HOME, 0, "MoveToBeginningOfLine" }, |
392 { VKEY_HOME, ShiftKey, | 398 { VKEY_HOME, ShiftKey, |
393 "MoveToBeginningOfLineAndModifySelection" }, | 399 "MoveToBeginningOfLineAndModifySelection" }, |
394 #if OS(DARWIN) | 400 #if OS(DARWIN) |
395 { VKEY_LEFT, CommandKey, "MoveToBeginningOfLine" }, | 401 { VKEY_LEFT, CommandKey, "MoveToBeginningOfLine" }, |
396 { VKEY_LEFT, CommandKey | ShiftKey, | 402 { VKEY_LEFT, CommandKey | ShiftKey, |
397 "MoveToBeginningOfLineAndModifySelection" }, | 403 "MoveToBeginningOfLineAndModifySelection" }, |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
759 #endif | 765 #endif |
760 } | 766 } |
761 | 767 |
762 void EditorClientImpl::willSetInputMethodState() | 768 void EditorClientImpl::willSetInputMethodState() |
763 { | 769 { |
764 if (m_webView->client()) | 770 if (m_webView->client()) |
765 m_webView->client()->resetInputMethod(); | 771 m_webView->client()->resetInputMethod(); |
766 } | 772 } |
767 | 773 |
768 } // namesace WebKit | 774 } // namesace WebKit |
OLD | NEW |