| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/accessibility/blink_ax_tree_source.h" | 5 #include "content/renderer/accessibility/blink_ax_tree_source.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 | 537 |
| 538 if (src.AccessKey().length()) { | 538 if (src.AccessKey().length()) { |
| 539 dst->AddStringAttribute(ui::AX_ATTR_ACCESS_KEY, src.AccessKey().Utf8()); | 539 dst->AddStringAttribute(ui::AX_ATTR_ACCESS_KEY, src.AccessKey().Utf8()); |
| 540 } | 540 } |
| 541 | 541 |
| 542 if (src.AriaAutoComplete().length()) { | 542 if (src.AriaAutoComplete().length()) { |
| 543 dst->AddStringAttribute(ui::AX_ATTR_AUTO_COMPLETE, | 543 dst->AddStringAttribute(ui::AX_ATTR_AUTO_COMPLETE, |
| 544 src.AriaAutoComplete().Utf8()); | 544 src.AriaAutoComplete().Utf8()); |
| 545 } | 545 } |
| 546 | 546 |
| 547 if (src.Action() != blink::WebAXSupportedAction::kNone) { | 547 if (src.Action() != blink::WebAXDefaultActionVerb::kNone) { |
| 548 dst->AddIntAttribute(ui::AX_ATTR_ACTION, | 548 dst->AddIntAttribute(ui::AX_ATTR_DEFAULT_ACTION_VERB, |
| 549 AXSupportedActionFromBlink(src.Action())); | 549 AXDefaultActionVerbFromBlink(src.Action())); |
| 550 } | 550 } |
| 551 | 551 |
| 552 if (src.IsAriaReadOnly()) | 552 if (src.IsAriaReadOnly()) |
| 553 dst->AddBoolAttribute(ui::AX_ATTR_ARIA_READONLY, true); | 553 dst->AddBoolAttribute(ui::AX_ATTR_ARIA_READONLY, true); |
| 554 | 554 |
| 555 if (src.HasComputedStyle()) { | 555 if (src.HasComputedStyle()) { |
| 556 dst->AddStringAttribute(ui::AX_ATTR_DISPLAY, | 556 dst->AddStringAttribute(ui::AX_ATTR_DISPLAY, |
| 557 src.ComputedStyleDisplay().Utf8()); | 557 src.ComputedStyleDisplay().Utf8()); |
| 558 } | 558 } |
| 559 | 559 |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 890 return WebAXObject(); | 890 return WebAXObject(); |
| 891 | 891 |
| 892 WebDocument document = render_frame_->GetWebFrame()->GetDocument(); | 892 WebDocument document = render_frame_->GetWebFrame()->GetDocument(); |
| 893 if (!document.IsNull()) | 893 if (!document.IsNull()) |
| 894 return document.AccessibilityObject(); | 894 return document.AccessibilityObject(); |
| 895 | 895 |
| 896 return WebAXObject(); | 896 return WebAXObject(); |
| 897 } | 897 } |
| 898 | 898 |
| 899 } // namespace content | 899 } // namespace content |
| OLD | NEW |