| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 | 705 |
| 706 return handlingOptionTab; | 706 return handlingOptionTab; |
| 707 } | 707 } |
| 708 | 708 |
| 709 bool EventHandler::needsKeyboardEventDisambiguationQuirks() const | 709 bool EventHandler::needsKeyboardEventDisambiguationQuirks() const |
| 710 { | 710 { |
| 711 Settings* settings = m_frame->settings(); | 711 Settings* settings = m_frame->settings(); |
| 712 if (!settings) | 712 if (!settings) |
| 713 return false; | 713 return false; |
| 714 | 714 |
| 715 #if ENABLE(DASHBOARD_SUPPORT) | |
| 716 if (settings->usesDashboardBackwardCompatibilityMode()) | |
| 717 return true; | |
| 718 #endif | |
| 719 | |
| 720 if (settings->needsKeyboardEventDisambiguationQuirks()) | 715 if (settings->needsKeyboardEventDisambiguationQuirks()) |
| 721 return true; | 716 return true; |
| 722 | 717 |
| 723 return false; | 718 return false; |
| 724 } | 719 } |
| 725 | 720 |
| 726 unsigned EventHandler::accessKeyModifiers() | 721 unsigned EventHandler::accessKeyModifiers() |
| 727 { | 722 { |
| 728 // Control+Option key combinations are usually unused on Mac OS X, but not w
hen VoiceOver is enabled. | 723 // Control+Option key combinations are usually unused on Mac OS X, but not w
hen VoiceOver is enabled. |
| 729 // So, we use Control in this case, even though it conflicts with Emacs-styl
e key bindings. | 724 // So, we use Control in this case, even though it conflicts with Emacs-styl
e key bindings. |
| 730 // See <https://bugs.webkit.org/show_bug.cgi?id=21107> for more detail. | 725 // See <https://bugs.webkit.org/show_bug.cgi?id=21107> for more detail. |
| 731 if (AXObjectCache::accessibilityEnhancedUserInterfaceEnabled()) | 726 if (AXObjectCache::accessibilityEnhancedUserInterfaceEnabled()) |
| 732 return PlatformEvent::CtrlKey; | 727 return PlatformEvent::CtrlKey; |
| 733 | 728 |
| 734 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 729 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 735 } | 730 } |
| 736 | 731 |
| 737 } | 732 } |
| OLD | NEW |