| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 #include "SkMatrix44.h" | 33 #include "SkMatrix44.h" |
| 34 #include "core/HTMLNames.h" | 34 #include "core/HTMLNames.h" |
| 35 #include "core/css/CSSPrimitiveValueMappings.h" | 35 #include "core/css/CSSPrimitiveValueMappings.h" |
| 36 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
| 37 #include "core/dom/Node.h" | 37 #include "core/dom/Node.h" |
| 38 #include "core/editing/markers/DocumentMarker.h" | 38 #include "core/editing/markers/DocumentMarker.h" |
| 39 #include "core/frame/FrameHost.h" | 39 #include "core/frame/FrameHost.h" |
| 40 #include "core/frame/FrameView.h" | 40 #include "core/frame/FrameView.h" |
| 41 #include "core/frame/VisualViewport.h" | 41 #include "core/frame/VisualViewport.h" |
| 42 #include "core/input/KeyboardEventManager.h" |
| 42 #include "core/style/ComputedStyle.h" | 43 #include "core/style/ComputedStyle.h" |
| 43 #include "core/page/Page.h" | 44 #include "core/page/Page.h" |
| 44 #include "modules/accessibility/AXObject.h" | 45 #include "modules/accessibility/AXObject.h" |
| 45 #include "modules/accessibility/AXObjectCacheImpl.h" | 46 #include "modules/accessibility/AXObjectCacheImpl.h" |
| 46 #include "modules/accessibility/AXTable.h" | 47 #include "modules/accessibility/AXTable.h" |
| 47 #include "modules/accessibility/AXTableCell.h" | 48 #include "modules/accessibility/AXTableCell.h" |
| 48 #include "modules/accessibility/AXTableColumn.h" | 49 #include "modules/accessibility/AXTableColumn.h" |
| 49 #include "modules/accessibility/AXTableRow.h" | 50 #include "modules/accessibility/AXTableRow.h" |
| 50 #include "platform/PlatformKeyboardEvent.h" | |
| 51 #include "public/platform/WebFloatRect.h" | 51 #include "public/platform/WebFloatRect.h" |
| 52 #include "public/platform/WebPoint.h" | 52 #include "public/platform/WebPoint.h" |
| 53 #include "public/platform/WebRect.h" | 53 #include "public/platform/WebRect.h" |
| 54 #include "public/platform/WebString.h" | 54 #include "public/platform/WebString.h" |
| 55 #include "public/platform/WebURL.h" | 55 #include "public/platform/WebURL.h" |
| 56 #include "public/web/WebDocument.h" | 56 #include "public/web/WebDocument.h" |
| 57 #include "public/web/WebElement.h" | 57 #include "public/web/WebElement.h" |
| 58 #include "public/web/WebNode.h" | 58 #include "public/web/WebNode.h" |
| 59 #include "web/WebLocalFrameImpl.h" | 59 #include "web/WebLocalFrameImpl.h" |
| 60 #include "web/WebViewImpl.h" | 60 #include "web/WebViewImpl.h" |
| (...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 { | 763 { |
| 764 if (isDetached()) | 764 if (isDetached()) |
| 765 return WebString(); | 765 return WebString(); |
| 766 | 766 |
| 767 String accessKey = m_private->accessKey(); | 767 String accessKey = m_private->accessKey(); |
| 768 if (accessKey.isNull()) | 768 if (accessKey.isNull()) |
| 769 return WebString(); | 769 return WebString(); |
| 770 | 770 |
| 771 DEFINE_STATIC_LOCAL(String, modifierString, ()); | 771 DEFINE_STATIC_LOCAL(String, modifierString, ()); |
| 772 if (modifierString.isNull()) { | 772 if (modifierString.isNull()) { |
| 773 unsigned modifiers = PlatformKeyboardEvent::accessKeyModifiers(); | 773 unsigned modifiers = KeyboardEventManager::kAccessKeyModifiers; |
| 774 // Follow the same order as Mozilla MSAA implementation: | 774 // Follow the same order as Mozilla MSAA implementation: |
| 775 // Ctrl+Alt+Shift+Meta+key. MSDN states that keyboard shortcut strings | 775 // Ctrl+Alt+Shift+Meta+key. MSDN states that keyboard shortcut strings |
| 776 // should not be localized and defines the separator as "+". | 776 // should not be localized and defines the separator as "+". |
| 777 StringBuilder modifierStringBuilder; | 777 StringBuilder modifierStringBuilder; |
| 778 if (modifiers & PlatformEvent::CtrlKey) | 778 if (modifiers & WebInputEvent::ControlKey) |
| 779 modifierStringBuilder.append("Ctrl+"); | 779 modifierStringBuilder.append("Ctrl+"); |
| 780 if (modifiers & PlatformEvent::AltKey) | 780 if (modifiers & WebInputEvent::AltKey) |
| 781 modifierStringBuilder.append("Alt+"); | 781 modifierStringBuilder.append("Alt+"); |
| 782 if (modifiers & PlatformEvent::ShiftKey) | 782 if (modifiers & WebInputEvent::ShiftKey) |
| 783 modifierStringBuilder.append("Shift+"); | 783 modifierStringBuilder.append("Shift+"); |
| 784 if (modifiers & PlatformEvent::MetaKey) | 784 if (modifiers & WebInputEvent::MetaKey) |
| 785 modifierStringBuilder.append("Win+"); | 785 modifierStringBuilder.append("Win+"); |
| 786 modifierString = modifierStringBuilder.toString(); | 786 modifierString = modifierStringBuilder.toString(); |
| 787 } | 787 } |
| 788 | 788 |
| 789 return String(modifierString + accessKey); | 789 return String(modifierString + accessKey); |
| 790 } | 790 } |
| 791 | 791 |
| 792 WebString WebAXObject::language() const | 792 WebString WebAXObject::language() const |
| 793 { | 793 { |
| 794 if (isDetached()) | 794 if (isDetached()) |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1606 m_private = object; | 1606 m_private = object; |
| 1607 return *this; | 1607 return *this; |
| 1608 } | 1608 } |
| 1609 | 1609 |
| 1610 WebAXObject::operator AXObject*() const | 1610 WebAXObject::operator AXObject*() const |
| 1611 { | 1611 { |
| 1612 return m_private.get(); | 1612 return m_private.get(); |
| 1613 } | 1613 } |
| 1614 | 1614 |
| 1615 } // namespace blink | 1615 } // namespace blink |
| OLD | NEW |