Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Side by Side Diff: content/renderer/accessibility/render_accessibility_impl.cc

Issue 2317323002: Re-land (2): Fix loading accessibility tree for child frame that's already loaded. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/accessibility/dump_accessibility_tree_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/render_accessibility_impl.h" 5 #include "content/renderer/accessibility/render_accessibility_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <queue> 10 #include <queue>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 RenderAccessibilityImpl::RenderAccessibilityImpl(RenderFrameImpl* render_frame) 71 RenderAccessibilityImpl::RenderAccessibilityImpl(RenderFrameImpl* render_frame)
72 : RenderFrameObserver(render_frame), 72 : RenderFrameObserver(render_frame),
73 render_frame_(render_frame), 73 render_frame_(render_frame),
74 tree_source_(render_frame), 74 tree_source_(render_frame),
75 serializer_(&tree_source_), 75 serializer_(&tree_source_),
76 pdf_tree_source_(nullptr), 76 pdf_tree_source_(nullptr),
77 last_scroll_offset_(gfx::Size()), 77 last_scroll_offset_(gfx::Size()),
78 ack_pending_(false), 78 ack_pending_(false),
79 reset_token_(0), 79 reset_token_(0),
80 weak_factory_(this) { 80 weak_factory_(this) {
81 // There's only one AXObjectCache for the root of a local frame tree,
82 // so if this frame's parent is local we can safely do nothing.
83 if (render_frame_ &&
84 render_frame_->GetWebFrame() &&
85 render_frame_->GetWebFrame()->parent() &&
86 render_frame_->GetWebFrame()->parent()->isWebLocalFrame()) {
87 return;
88 }
89
90 WebView* web_view = render_frame_->GetRenderView()->GetWebView(); 81 WebView* web_view = render_frame_->GetRenderView()->GetWebView();
91 WebSettings* settings = web_view->settings(); 82 WebSettings* settings = web_view->settings();
92 settings->setAccessibilityEnabled(true); 83 settings->setAccessibilityEnabled(true);
93 84
94 #if defined(OS_ANDROID) 85 #if defined(OS_ANDROID)
95 // Password values are only passed through on Android. 86 // Password values are only passed through on Android.
96 settings->setAccessibilityPasswordValuesEnabled(true); 87 settings->setAccessibilityPasswordValuesEnabled(true);
97 #endif 88 #endif
98 89
99 #if !defined(OS_ANDROID) 90 #if !defined(OS_ANDROID)
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 size_t new_count = pdf_update.nodes.size(); 683 size_t new_count = pdf_update.nodes.size();
693 update->nodes.resize(old_count + new_count); 684 update->nodes.resize(old_count + new_count);
694 for (size_t i = 0; i < new_count; ++i) 685 for (size_t i = 0; i < new_count; ++i)
695 update->nodes[old_count + i] = pdf_update.nodes[i]; 686 update->nodes[old_count + i] = pdf_update.nodes[i];
696 break; 687 break;
697 } 688 }
698 } 689 }
699 } 690 }
700 691
701 } // namespace content 692 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/accessibility/dump_accessibility_tree_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698