| 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/EventHandler.h" | |
| 43 #include "core/style/ComputedStyle.h" | 42 #include "core/style/ComputedStyle.h" |
| 44 #include "core/page/Page.h" | 43 #include "core/page/Page.h" |
| 45 #include "modules/accessibility/AXObject.h" | 44 #include "modules/accessibility/AXObject.h" |
| 46 #include "modules/accessibility/AXObjectCacheImpl.h" | 45 #include "modules/accessibility/AXObjectCacheImpl.h" |
| 47 #include "modules/accessibility/AXTable.h" | 46 #include "modules/accessibility/AXTable.h" |
| 48 #include "modules/accessibility/AXTableCell.h" | 47 #include "modules/accessibility/AXTableCell.h" |
| 49 #include "modules/accessibility/AXTableColumn.h" | 48 #include "modules/accessibility/AXTableColumn.h" |
| 50 #include "modules/accessibility/AXTableRow.h" | 49 #include "modules/accessibility/AXTableRow.h" |
| 51 #include "platform/PlatformKeyboardEvent.h" | 50 #include "platform/PlatformKeyboardEvent.h" |
| 52 #include "public/platform/WebPoint.h" | 51 #include "public/platform/WebPoint.h" |
| (...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 744 { | 743 { |
| 745 if (isDetached()) | 744 if (isDetached()) |
| 746 return WebString(); | 745 return WebString(); |
| 747 | 746 |
| 748 String accessKey = m_private->accessKey(); | 747 String accessKey = m_private->accessKey(); |
| 749 if (accessKey.isNull()) | 748 if (accessKey.isNull()) |
| 750 return WebString(); | 749 return WebString(); |
| 751 | 750 |
| 752 DEFINE_STATIC_LOCAL(String, modifierString, ()); | 751 DEFINE_STATIC_LOCAL(String, modifierString, ()); |
| 753 if (modifierString.isNull()) { | 752 if (modifierString.isNull()) { |
| 754 unsigned modifiers = EventHandler::accessKeyModifiers(); | 753 unsigned modifiers = PlatformKeyboardEvent::accessKeyModifiers(); |
| 755 // Follow the same order as Mozilla MSAA implementation: | 754 // Follow the same order as Mozilla MSAA implementation: |
| 756 // Ctrl+Alt+Shift+Meta+key. MSDN states that keyboard shortcut strings | 755 // Ctrl+Alt+Shift+Meta+key. MSDN states that keyboard shortcut strings |
| 757 // should not be localized and defines the separator as "+". | 756 // should not be localized and defines the separator as "+". |
| 758 StringBuilder modifierStringBuilder; | 757 StringBuilder modifierStringBuilder; |
| 759 if (modifiers & PlatformEvent::CtrlKey) | 758 if (modifiers & PlatformEvent::CtrlKey) |
| 760 modifierStringBuilder.append("Ctrl+"); | 759 modifierStringBuilder.append("Ctrl+"); |
| 761 if (modifiers & PlatformEvent::AltKey) | 760 if (modifiers & PlatformEvent::AltKey) |
| 762 modifierStringBuilder.append("Alt+"); | 761 modifierStringBuilder.append("Alt+"); |
| 763 if (modifiers & PlatformEvent::ShiftKey) | 762 if (modifiers & PlatformEvent::ShiftKey) |
| 764 modifierStringBuilder.append("Shift+"); | 763 modifierStringBuilder.append("Shift+"); |
| (...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1563 m_private = object; | 1562 m_private = object; |
| 1564 return *this; | 1563 return *this; |
| 1565 } | 1564 } |
| 1566 | 1565 |
| 1567 WebAXObject::operator AXObject*() const | 1566 WebAXObject::operator AXObject*() const |
| 1568 { | 1567 { |
| 1569 return m_private.get(); | 1568 return m_private.get(); |
| 1570 } | 1569 } |
| 1571 | 1570 |
| 1572 } // namespace blink | 1571 } // namespace blink |
| OLD | NEW |