diff options
Diffstat (limited to 'chromium/content/browser/accessibility')
| -rw-r--r-- | chromium/content/browser/accessibility/browser_accessibility.cc | 22 | ||||
| -rw-r--r-- | chromium/content/browser/accessibility/browser_accessibility_manager.cc | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/chromium/content/browser/accessibility/browser_accessibility.cc b/chromium/content/browser/accessibility/browser_accessibility.cc index 9ba15631190..b10fe9f9ca2 100644 --- a/chromium/content/browser/accessibility/browser_accessibility.cc +++ b/chromium/content/browser/accessibility/browser_accessibility.cc @@ -1384,12 +1384,12 @@ const ui::AXTree::Selection BrowserAccessibility::GetUnignoredSelection() manager()->GetFromID(selection.anchor_object_id); if (anchor_object && !anchor_object->PlatformIsLeaf()) { DCHECK_GE(selection.anchor_offset, 0); - if (size_t{selection.anchor_offset} < + if (size_t(selection.anchor_offset) < anchor_object->node()->children().size()) { const ui::AXNode* anchor_child = anchor_object->node()->children()[selection.anchor_offset]; DCHECK(anchor_child); - selection.anchor_offset = int{anchor_child->GetUnignoredIndexInParent()}; + selection.anchor_offset = int(anchor_child->GetUnignoredIndexInParent()); } else { selection.anchor_offset = anchor_object->GetChildCount(); } @@ -1399,12 +1399,12 @@ const ui::AXTree::Selection BrowserAccessibility::GetUnignoredSelection() manager()->GetFromID(selection.focus_object_id); if (focus_object && !focus_object->PlatformIsLeaf()) { DCHECK_GE(selection.focus_offset, 0); - if (size_t{selection.focus_offset} < + if (size_t(selection.focus_offset) < focus_object->node()->children().size()) { const ui::AXNode* focus_child = focus_object->node()->children()[selection.focus_offset]; DCHECK(focus_child); - selection.focus_offset = int{focus_child->GetUnignoredIndexInParent()}; + selection.focus_offset = int(focus_child->GetUnignoredIndexInParent()); } else { selection.focus_offset = focus_object->GetChildCount(); } @@ -1440,7 +1440,7 @@ gfx::NativeViewAccessible BrowserAccessibility::GetParent() { } int BrowserAccessibility::GetChildCount() const { - return int{PlatformChildCount()}; + return int(PlatformChildCount()); } gfx::NativeViewAccessible BrowserAccessibility::ChildAtIndex(int index) { @@ -1818,16 +1818,16 @@ bool BrowserAccessibility::AccessibilityPerformAction( if (!anchor_object->PlatformIsLeaf()) { DCHECK_GE(selection.anchor_offset, 0); const BrowserAccessibility* anchor_child = - anchor_object->InternalGetChild(uint32_t{selection.anchor_offset}); + anchor_object->InternalGetChild(uint32_t(selection.anchor_offset)); if (anchor_child) { selection.anchor_offset = - int{anchor_child->node()->index_in_parent()}; + int(anchor_child->node()->index_in_parent()); selection.anchor_node_id = anchor_child->node()->parent()->id(); } else { // Since the child was not found, the only alternative is that this is // an "after children" position. selection.anchor_offset = - int{anchor_object->node()->children().size()}; + int(anchor_object->node()->children().size()); } } @@ -1837,14 +1837,14 @@ bool BrowserAccessibility::AccessibilityPerformAction( if (!focus_object->PlatformIsLeaf()) { DCHECK_GE(selection.focus_offset, 0); const BrowserAccessibility* focus_child = - focus_object->InternalGetChild(uint32_t{selection.focus_offset}); + focus_object->InternalGetChild(uint32_t(selection.focus_offset)); if (focus_child) { - selection.focus_offset = int{focus_child->node()->index_in_parent()}; + selection.focus_offset = int(focus_child->node()->index_in_parent()); selection.focus_node_id = focus_child->node()->parent()->id(); } else { // Since the child was not found, the only alternative is that this is // an "after children" position. - selection.focus_offset = int{focus_object->node()->children().size()}; + selection.focus_offset = int(focus_object->node()->children().size()); } } diff --git a/chromium/content/browser/accessibility/browser_accessibility_manager.cc b/chromium/content/browser/accessibility/browser_accessibility_manager.cc index 572b0e94433..e891c6ea4d1 100644 --- a/chromium/content/browser/accessibility/browser_accessibility_manager.cc +++ b/chromium/content/browser/accessibility/browser_accessibility_manager.cc @@ -438,7 +438,7 @@ bool BrowserAccessibilityManager::OnAccessibilityEvents( // means a node just got repeated or something harmless like that, // but it should still be investigated and could be the sign of a // performance issue. - DCHECK_LE(int{tree_update.nodes.size()}, ax_tree()->size()); + DCHECK_LE(int(tree_update.nodes.size()), ax_tree()->size()); } // If this page is hidden by an interstitial, suppress all events. |