Skip to content

GitLab

T
tangled
Commit ead48028 authored by jcivelli@chromium.org's avatar jcivelli@chromium.org
Browse files
Options

Revert 49339 - Enable renderer accessibility by default. 

It seems to be breaking the ExtensionAPIClientTest.CreateWindowW unit-test.

BUG=25564
TEST=none

Review URL: http://codereview.chromium.org/2358003

TBR=ctguil@chromium.org
Review URL: http://codereview.chromium.org/2782003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49343 0039d316-1c4b-4281-b951-d872f2087c98
parent 66225627
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 126 deletions
chrome/browser/accessibility_win_browsertest.cc
View file @ ead48028
......@@ -19,6 +19,13 @@
namespace {
class AccessibilityWinBrowserTest : public InProcessBrowserTest {
public:
void SetUpCommandLine(CommandLine* command_line) {
// Turns on the accessibility in the renderer. Off by default until
// http://crbug.com/25564 is fixed.
command_line->AppendSwitch(switches::kEnableRendererAccessibility);
}
protected:
IAccessible* GetRenderWidgetHostViewClientAccessible();
};
......@@ -174,20 +181,6 @@ void AccessibleChecker::CheckAccessibleChildren(IAccessible* parent) {
IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
TestRendererAccessibilityTree) {
// By requesting an accessible chrome will believe a screen reader has been
// detected.
ScopedComPtr<IAccessible> document_accessible(
GetRenderWidgetHostViewClientAccessible());
// The initial accessible returned should have state STATE_SYSTEM_BUSY while
// the accessibility tree is being requested from the renderer.
VARIANT var_state;
HRESULT hr = document_accessible->
get_accState(CreateI4Variant(CHILDID_SELF), &var_state);
EXPECT_EQ(hr, S_OK);
EXPECT_EQ(V_VT(&var_state), VT_I4);
EXPECT_EQ(V_I4(&var_state), STATE_SYSTEM_BUSY);
GURL tree_url(
"data:text/html,<html><head><title>Accessibility Win Test</title></head>"
"<body><input type='button' value='push' /><input type='checkbox' />"
......@@ -196,7 +189,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
ui_test_utils::WaitForNotification(
NotificationType::RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED);
document_accessible = GetRenderWidgetHostViewClientAccessible();
ScopedComPtr<IAccessible> document_accessible(
GetRenderWidgetHostViewClientAccessible());
ASSERT_NE(document_accessible.get(), reinterpret_cast<IAccessible*>(NULL));
AccessibleChecker button_checker(L"push", ROLE_SYSTEM_PUSHBUTTON);
......@@ -214,7 +208,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
// Check that document accessible has a parent accessible.
ScopedComPtr<IDispatch> parent_dispatch;
hr = document_accessible->get_accParent(parent_dispatch.Receive());
HRESULT hr = document_accessible->get_accParent(parent_dispatch.Receive());
EXPECT_EQ(hr, S_OK);
EXPECT_NE(parent_dispatch, reinterpret_cast<IDispatch*>(NULL));
......
chrome/browser/renderer_host/render_widget_host.cc
View file @ ead48028
......@@ -5,7 +5,6 @@
#include "chrome/browser/renderer_host/render_widget_host.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/histogram.h"
#include "base/keyboard_codes.h"
#include "base/message_loop.h"
......@@ -17,7 +16,6 @@
#include "chrome/browser/renderer_host/render_widget_host_painting_observer.h"
#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/renderer_host/video_layer.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/render_messages.h"
#include "webkit/glue/webcursor.h"
......@@ -60,9 +58,6 @@ static const int kHungRendererDelayMs = 20000;
// in trailing scrolls after the user ends their input.
static const int kMaxTimeBetweenWheelMessagesMs = 250;
// static
bool RenderWidgetHost::renderer_accessible_ = false;
///////////////////////////////////////////////////////////////////////////////
// RenderWidgetHost
......@@ -1116,35 +1111,6 @@ void RenderWidgetHost::RequestAccessibilityTree() {
Send(new ViewMsg_GetAccessibilityTree(routing_id()));
}
void RenderWidgetHost::SetDocumentLoaded(bool document_loaded) {
document_loaded_ = document_loaded;
if (!document_loaded_)
requested_accessibility_tree_ = false;
if (renderer_accessible_ && document_loaded_) {
RequestAccessibilityTree();
requested_accessibility_tree_ = true;
}
}
void RenderWidgetHost::EnableRendererAccessibility() {
if (renderer_accessible_)
return;
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableRendererAccessibility)) {
return;
}
renderer_accessible_ = true;
if (document_loaded_ && !requested_accessibility_tree_) {
RequestAccessibilityTree();
requested_accessibility_tree_ = true;
}
}
void RenderWidgetHost::SetAccessibilityFocus(int acc_obj_id) {
Send(new ViewMsg_SetAccessibilityFocus(routing_id(), acc_obj_id));
}
......
chrome/browser/renderer_host/render_widget_host.h
View file @ ead48028
......@@ -6,8 +6,6 @@
#define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
#include <deque>
#include <string>
#include <vector>
#include "app/surface/transport_dib.h"
#include "base/gtest_prod_util.h"
......@@ -372,14 +370,6 @@ class RenderWidgetHost : public IPC::Channel::Listener,
// Requests a snapshot of an accessible DOM tree from the renderer.
void RequestAccessibilityTree();
// Aid for determining when an accessibility tree request can be made. Set by
// TabContents to true on document load and to false on page nativigation.
void SetDocumentLoaded(bool document_loaded);
// Enable renderer accessibility. This should only be called when a
// screenreader is detected.
void EnableRendererAccessibility();
// Relays a request from assistive technology to set focus to the
// node with this accessibility object id.
void SetAccessibilityFocus(int acc_obj_id);
......@@ -540,10 +530,6 @@ class RenderWidgetHost : public IPC::Channel::Listener,
// input messages to be coalesced.
void ProcessWheelAck();
// True if renderer accessibility is enabled. This should only be set when a
// screenreader is detected as it can potentially slow down Chrome.
static bool renderer_accessible_;
// The View associated with the RenderViewHost. The lifetime of this object
// is associated with the lifetime of the Render process. If the Renderer
// crashes, its View is destroyed and this pointer becomes NULL, even though
......@@ -681,14 +667,6 @@ class RenderWidgetHost : public IPC::Channel::Listener,
// changed.
bool suppress_next_char_events_;
// Keep track of if we have a loaded document so that we can request an
// accessibility tree on demand when renderer accessibility is enabled.
bool document_loaded_;
// Keep track of if we've already requested the accessibility tree so
// we don't do it more than once.
bool requested_accessibility_tree_;
// Optional video YUV layer for used for out-of-process compositing.
scoped_ptr<VideoLayer> video_layer_;
......
chrome/browser/renderer_host/render_widget_host_view_win.cc
View file @ ead48028
......@@ -252,6 +252,7 @@ void DrawDeemphasized(const gfx::Rect& paint_rect,
paint_rect.width(), paint_rect.height());
canvas.getTopPlatformDevice().drawToHDC(paint_dc, paint_rect.x(),
paint_rect.y(), NULL);
}
} // namespace
......@@ -283,15 +284,12 @@ RenderWidgetHostViewWin::RenderWidgetHostViewWin(RenderWidgetHost* widget)
is_loading_(false),
visually_deemphasized_(false) {
render_widget_host_->set_view(this);
renderer_accessible_ =
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableRendererAccessibility);
registrar_.Add(this,
NotificationType::RENDERER_PROCESS_TERMINATED,
NotificationService::AllSources());
BOOL screenreader_running = FALSE;
if (SystemParametersInfo(SPI_GETSCREENREADER, 0, &screenreader_running, 0) &&
screenreader_running) {
render_widget_host_->EnableRendererAccessibility();
}
}
RenderWidgetHostViewWin::~RenderWidgetHostViewWin() {
......@@ -1485,9 +1483,6 @@ void RenderWidgetHostViewWin::UpdateAccessibilityTree(
const webkit_glue::WebAccessibility& tree) {
browser_accessibility_manager_.reset(
new BrowserAccessibilityManager(m_hWnd, tree, this));
::NotifyWinEvent(
IA2_EVENT_DOCUMENT_LOAD_COMPLETE, m_hWnd, OBJID_CLIENT, CHILDID_SELF);
}
void RenderWidgetHostViewWin::OnAccessibilityFocusChange(int acc_obj_id) {
......@@ -1547,46 +1542,18 @@ void RenderWidgetHostViewWin::AccessibilityDoDefaultAction(int acc_obj_id) {
LRESULT RenderWidgetHostViewWin::OnGetObject(UINT message, WPARAM wparam,
LPARAM lparam, BOOL& handled) {
if (lparam != OBJID_CLIENT) {
// TODO(dmazzoni): http://crbug.com/25564 Disabling accessibility in the
// renderer is a temporary work-around until that bug is fixed.
if (!renderer_accessible_) {
handled = false;
return static_cast<LRESULT>(0L);
}
if (!browser_accessibility_manager_.get()) {
render_widget_host_->EnableRendererAccessibility();
if (!loading_accessible_.get()) {
// Create IAccessible to return while waiting for the accessibility tree
// from the renderer.
HRESULT hr = ::CreateStdAccessibleObject(
m_hWnd, OBJID_CLIENT, IID_IAccessible,
reinterpret_cast<void **>(&loading_accessible_));
// Annotate with STATE_SYSTEM_BUSY to indicate that the page is loading.
// We annotate the HWND, not the loading_accessible IAccessible, but the
// IAccessible will reflect the state annotation.
ScopedComPtr<IAccPropServices> pAccPropServices;
hr = CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER,
IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
if (SUCCEEDED(hr)) {
VARIANT var;
var.vt = VT_I4;
var.lVal = STATE_SYSTEM_BUSY;
pAccPropServices->SetHwndProp(m_hWnd, OBJID_CLIENT,
CHILDID_SELF, PROPID_ACC_STATE, var);
}
}
if (loading_accessible_.get()) {
return LresultFromObject(
IID_IAccessible, wparam,
static_cast<IAccessible*>(loading_accessible_));
}
} else {
if (lparam == OBJID_CLIENT && browser_accessibility_manager_.get()) {
BrowserAccessibility* root = browser_accessibility_manager_->GetRoot();
if (root) {
return LresultFromObject(IID_IAccessible, wparam,
static_cast<IAccessible*>(root->NewReference()));
static_cast<IAccessible*>(root->NewReference()));
}
}
......
chrome/browser/renderer_host/render_widget_host_view_win.h
View file @ ead48028
......@@ -10,8 +10,6 @@
#include <atlcrack.h>
#include <atlmisc.h>
#include <vector>
#include "base/scoped_comptr_win.h"
#include "base/scoped_ptr.h"
#include "base/task.h"
......@@ -251,9 +249,6 @@ class RenderWidgetHostViewWin
// Whether the window should be activated.
bool IsActivatable() const;
// MSAA IAccessible returned while page contents is loading.
ScopedComPtr<IAccessible> loading_accessible_;
// The associated Model.
RenderWidgetHost* render_widget_host_;
......@@ -325,6 +320,11 @@ class RenderWidgetHostViewWin
// value returns true for is_null() if we are not recording whiteout times.
base::TimeTicks whiteout_start_time_;
// Whether the renderer is made accessible.
// TODO(jcampan): http://b/issue?id=1432077 This is a temporary work-around
// until that bug is fixed.
bool renderer_accessible_;
// The time it took after this view was selected for it to be fully painted.
base::TimeTicks tab_switch_paint_time_;
......
chrome/browser/tab_contents/tab_contents.cc
View file @ ead48028
......@@ -296,6 +296,7 @@ TabContents::TabContents(Profile* profile,
opener_dom_ui_type_(DOMUIFactory::kNoDOMUI),
language_state_(&controller_),
geolocation_settings_state_(profile),
requested_accessibility_tree_(false),
closed_by_user_gesture_(false) {
ClearBlockedContentSettings();
renderer_preferences_util::UpdateFromSystemSettings(
......@@ -354,6 +355,10 @@ TabContents::TabContents(Profile* profile,
// Set-up the showing of the omnibox search infobar if applicable.
if (OmniboxSearchHint::IsEnabled(profile))
omnibox_search_hint_.reset(new OmniboxSearchHint(this));
renderer_accessible_ =
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableRendererAccessibility);
}
TabContents::~TabContents() {
......@@ -2142,8 +2147,10 @@ void TabContents::DidFailProvisionalLoadWithError(
void TabContents::DocumentLoadedInFrame() {
controller_.DocumentLoadedInFrame();
render_view_host()->SetDocumentLoaded(true);
if (renderer_accessible_ && !requested_accessibility_tree_) {
render_view_host()->RequestAccessibilityTree();
requested_accessibility_tree_ = true;
}
}
void TabContents::OnContentBlocked(ContentSettingsType type) {
......@@ -2313,7 +2320,7 @@ void TabContents::DidNavigate(RenderViewHost* rvh,
const ViewHostMsg_FrameNavigate_Params& params) {
int extra_invalidate_flags = 0;
render_view_host()->SetDocumentLoaded(false);
requested_accessibility_tree_ = false;
if (PageTransition::IsMainFrame(params.transition)) {
bool was_bookmark_bar_visible = ShouldShowBookmarkBar();
......
chrome/browser/tab_contents/tab_contents.h
View file @ ead48028
......@@ -1282,6 +1282,15 @@ class TabContents : public PageNavigator,
// Manages information about Geolocation API usage in this page.
GeolocationSettingsState geolocation_settings_state_;
// Whether the renderer is made accessible.
// TODO(dmazzoni): http://crbug.com/25564 This is a temporary work-around
// until that bug is fixed.
bool renderer_accessible_;
// Keep track of if we've already requested the accessibility tree so
// we don't do it more than once.
bool requested_accessibility_tree_;
// See description above setter.
bool closed_by_user_gesture_;
......
chrome/common/chrome_switches.cc
View file @ ead48028
......@@ -186,9 +186,6 @@ const char kDisablePromptOnRepost[] = "disable-prompt-on-repost";
// this option is specified or not.
const char kDisableRemoteFonts[] = "disable-remote-fonts";
// Turns off the accessibility in the renderer.
const char kDisableRendererAccessibility[] = "disable-renderer-accessibility";
// Disable session storage.
const char kDisableSessionStorage[] = "disable-session-storage";
......@@ -342,6 +339,10 @@ const char kEnablePrintPreview[] = "enable-print-preview";
// Enable Privacy Blacklists.
const char kEnablePrivacyBlacklists[] = "enable-privacy-blacklists";
// Turns on the accessibility in the renderer. Off by default until
// http://b/issue?id=1432077 is fixed.
const char kEnableRendererAccessibility[] = "enable-renderer-accessibility";
// Enables StatsTable, logging statistics to a global named shared memory table.
const char kEnableStatsTable[] = "enable-stats-table";
......
chrome/common/chrome_switches.h
View file @ ead48028
......@@ -67,7 +67,6 @@ extern const char kDisablePlugins[];
extern const char kDisablePopupBlocking[];
extern const char kDisablePromptOnRepost[];
extern const char kDisableRemoteFonts[];
extern const char kDisableRendererAccessibility[];
extern const char kDisableSessionStorage[];
extern const char kDisableSharedWorkers[];
extern const char kDisableSiteSpecificQuirks[];
......@@ -113,6 +112,7 @@ extern const char kEnablePreparsedJsCaching[];
extern const char kEnablePreconnect[];
extern const char kEnablePrintPreview[];
extern const char kEnablePrivacyBlacklists[];
extern const char kEnableRendererAccessibility[];
extern const char kEnableStatsTable[];
extern const char kEnableSync[];
extern const char kEnableSyncAutofill[];
......
chrome_frame/chrome_frame_automation.cc
View file @ ead48028
......@@ -296,6 +296,8 @@ void ProxyFactory::CreateProxy(ProxyFactory::ProxyCacheEntry* entry,
command_line->AppendSwitch(switches::kNoErrorDialogs);
#endif
command_line->AppendSwitch(switches::kEnableRendererAccessibility);
// In headless mode runs like reliability test runs we want full crash dumps
// from chrome.
if (IsHeadlessMode())
......
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