From e12f31e21f5397de0e208d81ea4e7d6d1408968c Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Wed, 19 Nov 2014 02:08:25 +0100
Subject: BrowserAccessibilityDelegate has been implemented in
 RenderFrameHostImpl.

Adopt Accessibility functions from render_frame_host_impl.cc

Change-Id: Ifa6752fd9daa3429d4016a91b85d7145b1fc2775
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
---
 src/core/render_widget_host_view_qt.cpp | 66 ++-------------------------------
 1 file changed, 3 insertions(+), 63 deletions(-)

(limited to 'src/core/render_widget_host_view_qt.cpp')

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 1e9d2bbf7..9555c85a5 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -305,15 +305,12 @@ gfx::NativeViewAccessible RenderWidgetHostViewQt::GetNativeViewAccessible()
     return 0;
 }
 
-void RenderWidgetHostViewQt::CreateBrowserAccessibilityManagerIfNeeded()
+content::BrowserAccessibilityManager* RenderWidgetHostViewQt::CreateBrowserAccessibilityManager(content::BrowserAccessibilityDelegate* delegate)
 {
-    if (GetBrowserAccessibilityManager())
-        return;
-
-    SetBrowserAccessibilityManager(new content::BrowserAccessibilityManagerQt(
+    return new content::BrowserAccessibilityManagerQt(
         m_adapterClient->accessibilityParentObject(),
         content::BrowserAccessibilityManagerQt::GetEmptyDocument(),
-        this));
+        delegate);
 }
 
 // Set focus to the associated View component.
@@ -904,53 +901,6 @@ void RenderWidgetHostViewQt::handleInputMethodEvent(QInputMethodEvent *ev)
     }
 }
 
-void RenderWidgetHostViewQt::AccessibilitySetFocus(int acc_obj_id)
-{
-    if (!m_host)
-        return;
-    m_host->AccessibilitySetFocus(acc_obj_id);
-}
-
-void RenderWidgetHostViewQt::AccessibilityDoDefaultAction(int acc_obj_id)
-{
-    if (!m_host)
-      return;
-    m_host->AccessibilityDoDefaultAction(acc_obj_id);
-}
-void RenderWidgetHostViewQt::AccessibilityScrollToMakeVisible(int acc_obj_id, const gfx::Rect& subfocus)
-{
-    if (!m_host)
-        return;
-    m_host->AccessibilityScrollToMakeVisible(acc_obj_id, subfocus);
-}
-
-void RenderWidgetHostViewQt::AccessibilityScrollToPoint(int acc_obj_id, const gfx::Point& point)
-{
-    if (!m_host)
-      return;
-    m_host->AccessibilityScrollToPoint(acc_obj_id, point);
-}
-
-void RenderWidgetHostViewQt::AccessibilitySetTextSelection(int acc_obj_id, int start_offset, int end_offset)
-{
-    if (!m_host)
-        return;
-    m_host->AccessibilitySetTextSelection(acc_obj_id, start_offset, end_offset);
-}
-
-bool RenderWidgetHostViewQt::AccessibilityViewHasFocus() const
-{
-    return HasFocus();
-}
-
-void RenderWidgetHostViewQt::AccessibilityFatalError()
-{
-    if (!m_host)
-        return;
-    m_host->AccessibilityFatalError();
-    SetBrowserAccessibilityManager(NULL);
-}
-
 void RenderWidgetHostViewQt::accessibilityActiveChanged(bool active)
 {
     if (active)
@@ -1040,16 +990,6 @@ void RenderWidgetHostViewQt::handleFocusEvent(QFocusEvent *ev)
     }
 }
 
-QAccessibleInterface *RenderWidgetHostViewQt::GetQtAccessible()
-{
-    // Assume we have a screen reader doing stuff
-    CreateBrowserAccessibilityManagerIfNeeded();
-    content::BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
-    content::BrowserAccessibility *acc = GetBrowserAccessibilityManager()->GetRoot();
-    content::BrowserAccessibilityQt *accQt = static_cast<content::BrowserAccessibilityQt*>(acc);
-    return accQt;
-}
-
 void RenderWidgetHostViewQt::didFirstVisuallyNonEmptyLayout()
 {
     m_didFirstVisuallyNonEmptyLayout = true;
-- 
cgit v1.2.3