From 1df15a830112bb6df104a94453105c74ada0fbf5 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 7 Jul 2014 17:51:13 +0200 Subject: Implement functions of BrowserAccessibilityDelegate This is in line with how other platforms do it. Change-Id: Ia258511d3fa35387a69c81c9c02c181fc2995e6c Reviewed-by: Andras Becsi --- src/core/render_widget_host_view_qt.cpp | 52 +++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 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 21de24d45..f29e36ae5 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -273,11 +273,10 @@ void RenderWidgetHostViewQt::CreateBrowserAccessibilityManagerIfNeeded() if (GetBrowserAccessibilityManager()) return; - m_accessibilityDelegate = scoped_ptr(new BrowserAccessibilityDelegateQt(this)); SetBrowserAccessibilityManager(new content::BrowserAccessibilityManagerQt( m_adapterClient->accessibilityParentObject(), content::BrowserAccessibilityManagerQt::GetEmptyDocument(), - m_accessibilityDelegate.get())); + this)); } // Set focus to the associated View component. @@ -969,6 +968,55 @@ void RenderWidgetHostViewQt::handleInputMethodEvent(QInputMethodEvent *ev) } } +void RenderWidgetHostViewQt::SetAccessibilityFocus(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, gfx::Rect subfocus) +{ + if (!m_host) + return; + m_host->AccessibilityScrollToMakeVisible(acc_obj_id, subfocus); +} + +void RenderWidgetHostViewQt::AccessibilityScrollToPoint(int acc_obj_id, 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); +} + +gfx::Point RenderWidgetHostViewQt::GetLastTouchEventLocation() const +{ + QT_NOT_YET_IMPLEMENTED + return gfx::Point(); +} + +void RenderWidgetHostViewQt::FatalAccessibilityTreeError() +{ + if (!m_host) + return; + m_host->FatalAccessibilityTreeError(); + SetBrowserAccessibilityManager(NULL); +} + void RenderWidgetHostViewQt::handleWheelEvent(QWheelEvent *ev) { m_host->ForwardWheelEvent(WebEventFactory::toWebWheelEvent(ev, dpiScale())); -- cgit v1.2.3