Commit efb9ce72 authored by aboxhall's avatar aboxhall Committed by Commit bot

Switch to using WebSettings only for accessibilityEnabled and inlineTextBoxAccess

Depends on https://codereview.chromium.org/495763005/

BUG=406622

Review URL: https://codereview.chromium.org/497273002

Cr-Commit-Position: refs/heads/master@{#292803}
parent 8e3c0419
...@@ -40,7 +40,6 @@ RendererAccessibilityComplete::RendererAccessibilityComplete( ...@@ -40,7 +40,6 @@ RendererAccessibilityComplete::RendererAccessibilityComplete(
serializer_(&tree_source_), serializer_(&tree_source_),
last_scroll_offset_(gfx::Size()), last_scroll_offset_(gfx::Size()),
ack_pending_(false) { ack_pending_(false) {
WebAXObject::enableAccessibility();
WebView* web_view = render_frame_->GetRenderView()->GetWebView(); WebView* web_view = render_frame_->GetRenderView()->GetWebView();
WebSettings* settings = web_view->settings(); WebSettings* settings = web_view->settings();
settings->setAccessibilityEnabled(true); settings->setAccessibilityEnabled(true);
...@@ -49,7 +48,6 @@ RendererAccessibilityComplete::RendererAccessibilityComplete( ...@@ -49,7 +48,6 @@ RendererAccessibilityComplete::RendererAccessibilityComplete(
// Skip inline text boxes on Android - since there are no native Android // Skip inline text boxes on Android - since there are no native Android
// APIs that compute the bounds of a range of text, it's a waste to // APIs that compute the bounds of a range of text, it's a waste to
// include these in the AX tree. // include these in the AX tree.
WebAXObject::enableInlineTextBoxAccessibility();
settings->setInlineTextBoxAccessibilityEnabled(true); settings->setInlineTextBoxAccessibilityEnabled(true);
#endif #endif
......
...@@ -147,10 +147,7 @@ void AccessibilityController::Reset() { ...@@ -147,10 +147,7 @@ void AccessibilityController::Reset() {
} }
void AccessibilityController::Install(blink::WebFrame* frame) { void AccessibilityController::Install(blink::WebFrame* frame) {
blink::WebAXObject::enableAccessibility();
frame->view()->settings()->setAccessibilityEnabled(true); frame->view()->settings()->setAccessibilityEnabled(true);
blink::WebAXObject::enableInlineTextBoxAccessibility();
frame->view()->settings()->setInlineTextBoxAccessibilityEnabled(true); frame->view()->settings()->setInlineTextBoxAccessibilityEnabled(true);
AccessibilityControllerBindings::Install(weak_factory_.GetWeakPtr(), frame); AccessibilityControllerBindings::Install(weak_factory_.GetWeakPtr(), frame);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment