OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1961 // IPC doesn't have the matching token ID, or if we're not waiting on a | 1961 // IPC doesn't have the matching token ID, or if we're not waiting on a |
1962 // reset but this message includes a reset token. | 1962 // reset but this message includes a reset token. |
1963 if (accessibility_reset_token_ != reset_token) { | 1963 if (accessibility_reset_token_ != reset_token) { |
1964 Send(new AccessibilityMsg_Events_ACK(routing_id_, ack_token)); | 1964 Send(new AccessibilityMsg_Events_ACK(routing_id_, ack_token)); |
1965 return; | 1965 return; |
1966 } | 1966 } |
1967 accessibility_reset_token_ = 0; | 1967 accessibility_reset_token_ = 0; |
1968 | 1968 |
1969 RenderWidgetHostViewBase* view = GetViewForAccessibility(); | 1969 RenderWidgetHostViewBase* view = GetViewForAccessibility(); |
1970 | 1970 |
1971 if (frame_tree_node_->IsMainFrame() && view) | |
1972 view->UpdateAXTreeID(GetAXTreeID()); | |
sky
2017/03/09 01:04:44
SetMainFrameAXTreeID
dmazzoni
2017/03/10 21:47:09
Done.
| |
1973 | |
1971 AccessibilityMode accessibility_mode = delegate_->GetAccessibilityMode(); | 1974 AccessibilityMode accessibility_mode = delegate_->GetAccessibilityMode(); |
1972 if ((accessibility_mode != AccessibilityModeOff) && view && is_active()) { | 1975 if ((accessibility_mode != AccessibilityModeOff) && view && is_active()) { |
1973 if (accessibility_mode & ACCESSIBILITY_MODE_FLAG_NATIVE_APIS) | 1976 if (accessibility_mode & ACCESSIBILITY_MODE_FLAG_NATIVE_APIS) |
1974 GetOrCreateBrowserAccessibilityManager(); | 1977 GetOrCreateBrowserAccessibilityManager(); |
1975 | 1978 |
1976 std::vector<AXEventNotificationDetails> details; | 1979 std::vector<AXEventNotificationDetails> details; |
1977 details.reserve(params.size()); | 1980 details.reserve(params.size()); |
1978 for (size_t i = 0; i < params.size(); ++i) { | 1981 for (size_t i = 0; i < params.size(); ++i) { |
1979 const AccessibilityHostMsg_EventParams& param = params[i]; | 1982 const AccessibilityHostMsg_EventParams& param = params[i]; |
1980 AXEventNotificationDetails detail; | 1983 AXEventNotificationDetails detail; |
(...skipping 1480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3461 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3464 // There is no pending NavigationEntry in these cases, so pass 0 as the |
3462 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3465 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
3463 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3466 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
3464 return NavigationHandleImpl::Create( | 3467 return NavigationHandleImpl::Create( |
3465 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, | 3468 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, |
3466 params.was_within_same_page, base::TimeTicks::Now(), | 3469 params.was_within_same_page, base::TimeTicks::Now(), |
3467 entry_id_for_data_nav, false); // started_from_context_menu | 3470 entry_id_for_data_nav, false); // started_from_context_menu |
3468 } | 3471 } |
3469 | 3472 |
3470 } // namespace content | 3473 } // namespace content |
OLD | NEW |