| Index: content/browser/renderer_host/render_widget_host_view_win.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
|
| index c8078147bf2db6fae268370cb58a5c5243b2a6d1..f65c3ede39756e33fb02adccd0d652c6d31548fb 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_win.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_win.cc
|
| @@ -1082,8 +1082,8 @@ LRESULT RenderWidgetHostViewWin::OnSetCursor(HWND window, UINT hittest_code,
|
| }
|
|
|
| void RenderWidgetHostViewWin::OnSetFocus(HWND window) {
|
| - if (browser_accessibility_manager_.get())
|
| - browser_accessibility_manager_->GotFocus();
|
| + if (browser_accessibility_manager())
|
| + browser_accessibility_manager()->GotFocus();
|
| if (render_widget_host_) {
|
| render_widget_host_->GotFocus();
|
| render_widget_host_->SetActive(true);
|
| @@ -1815,12 +1815,12 @@ LRESULT RenderWidgetHostViewWin::OnGestureEvent(
|
|
|
| void RenderWidgetHostViewWin::OnAccessibilityNotifications(
|
| const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params) {
|
| - if (!browser_accessibility_manager_.get()) {
|
| - browser_accessibility_manager_.reset(
|
| + if (!browser_accessibility_manager()) {
|
| + browser_accessibility_manager(
|
| BrowserAccessibilityManager::CreateEmptyDocument(
|
| m_hWnd, static_cast<WebAccessibility::State>(0), this));
|
| }
|
| - browser_accessibility_manager_->OnAccessibilityNotifications(params);
|
| + browser_accessibility_manager()->OnAccessibilityNotifications(params);
|
| }
|
|
|
| bool RenderWidgetHostViewWin::LockMouse() {
|
| @@ -1888,7 +1888,7 @@ void RenderWidgetHostViewWin::Observe(
|
| // If it was our RenderProcessHost that posted the notification,
|
| // clear the BrowserAccessibilityManager, because the renderer is
|
| // dead and any accessibility information we have is now stale.
|
| - browser_accessibility_manager_.reset(NULL);
|
| + browser_accessibility_manager(NULL);
|
| }
|
|
|
| static void PaintCompositorHostWindow(HWND hWnd) {
|
| @@ -2090,16 +2090,17 @@ IAccessible* RenderWidgetHostViewWin::GetIAccessible() {
|
| NotifyWinEvent(EVENT_SYSTEM_ALERT, m_hWnd, kIdCustom, CHILDID_SELF);
|
| }
|
|
|
| - if (!browser_accessibility_manager_.get()) {
|
| + if (!browser_accessibility_manager()) {
|
| // Return busy document tree while renderer accessibility tree loads.
|
| WebAccessibility::State busy_state =
|
| static_cast<WebAccessibility::State>(1 << WebAccessibility::STATE_BUSY);
|
| - browser_accessibility_manager_.reset(
|
| + browser_accessibility_manager(
|
| BrowserAccessibilityManager::CreateEmptyDocument(
|
| m_hWnd, busy_state, this));
|
| }
|
|
|
| - return browser_accessibility_manager_->GetRoot()->toBrowserAccessibilityWin();
|
| + return browser_accessibility_manager()->GetRoot()->
|
| + toBrowserAccessibilityWin();
|
| }
|
|
|
| LRESULT RenderWidgetHostViewWin::OnGetObject(UINT message, WPARAM wparam,
|
|
|