Make AccessiblityActivationObserver separate of RWHV

It is a global control anyway, and with future Chromium headers, there
are conflicts with qaccessibility.h.

Change-Id: Ife43340684b8b9498b1f4cd3f6fbe450d88794ec
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

7 files changed, 168 insertions, 44 deletions

diff --git a/src/core/accessibility_activation_observer.cpp b/src/core/accessibility_activation_observer.cpp
new file mode 100644
index 000000000..75ad90c54
--- /dev/null
+++ b/src/core/accessibility_activation_observer.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "accessibility_activation_observer.h"
+
+#ifndef QT_NO_ACCESSIBILITY
+
+#include "content/browser/accessibility/browser_accessibility_state_impl.h"
+
+namespace QtWebEngineCore {
+
+namespace {
+
+bool isAccessibilityEnabled() {
+    // On Linux accessibility is disabled by default due to performance issues,
+    // and can be re-enabled by setting the QTWEBENGINE_ENABLE_LINUX_ACCESSIBILITY environment
+    // variable. For details, see QTBUG-59922.
+#ifdef Q_OS_LINUX
+    static bool accessibility_enabled
+            = qEnvironmentVariableIsSet("QTWEBENGINE_ENABLE_LINUX_ACCESSIBILITY");
+#else
+    const bool accessibility_enabled = true;
+#endif
+    return accessibility_enabled;
+}
+
+} // namespace
+
+AccessibilityActivationObserver::AccessibilityActivationObserver()
+{
+    if (isAccessibilityEnabled()) {
+        QAccessible::installActivationObserver(this);
+        if (QAccessible::isActive())
+            content::BrowserAccessibilityStateImpl::GetInstance()->EnableAccessibility();
+    }
+}
+
+AccessibilityActivationObserver::~AccessibilityActivationObserver()
+{
+    QAccessible::removeActivationObserver(this);
+}
+
+void AccessibilityActivationObserver::accessibilityActiveChanged(bool active)
+{
+    if (active)
+        content::BrowserAccessibilityStateImpl::GetInstance()->EnableAccessibility();
+    else
+        content::BrowserAccessibilityStateImpl::GetInstance()->DisableAccessibility();
+}
+
+} // namespace QtWebEngineCore
+
+#endif  // QT_NO_ACCESSIBILITY
diff --git a/src/core/accessibility_activation_observer.h b/src/core/accessibility_activation_observer.h
new file mode 100644
index 000000000..e42c83eb5
--- /dev/null
+++ b/src/core/accessibility_activation_observer.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ACCESSIBILITY_ACTIVATION_OBSERVER_H
+#define ACCESSIBILITY_ACTIVATION_OBSERVER_H
+
+#ifndef QT_NO_ACCESSIBILITY
+#include <QtGui/qaccessible.h>
+
+namespace QtWebEngineCore {
+
+class RenderWidgetHostViewQt;
+
+class AccessibilityActivationObserver : public QAccessible::ActivationObserver
+{
+public:
+    AccessibilityActivationObserver();
+    ~AccessibilityActivationObserver();
+
+    void accessibilityActiveChanged(bool active) override;
+};
+
+} // namespace QtWebEngineCore
+
+#endif // QT_NO_ACCESSIBILITY
+
+#endif // ACCESSIBILITY_ACTIVATION_OBSERVER_H
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index f8d97c123..fcde6cd30 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -38,6 +38,7 @@ qtConfig(egl): CONFIG += egl
 INCLUDEPATH += $$PWD $$PWD/api
 
 SOURCES = \
+        accessibility_activation_observer.cpp \
         accessibility_tree_formatter_qt.cpp \
         authentication_dialog_controller.cpp \
         browser_accessibility_manager_qt.cpp \
@@ -128,6 +129,7 @@ SOURCES = \
         web_event_factory.cpp
 
 HEADERS = \
+        accessibility_activation_observer.h \
         authentication_dialog_controller_p.h \
         authentication_dialog_controller.h \
         build_config_qt.h \
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 4bb41a303..61b1e2a09 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -93,7 +93,6 @@
 #include <QWheelEvent>
 #include <QWindow>
 #include <QtGui/private/qinputcontrol_p.h>
-#include <QtGui/qaccessible.h>
 
 namespace QtWebEngineCore {
 
@@ -244,19 +243,6 @@ private:
     float dpiScale;
 };
 
-bool isAccessibilityEnabled() {
-    // On Linux accessibility is disabled by default due to performance issues,
-    // and can be re-enabled by setting the QTWEBENGINE_ENABLE_LINUX_ACCESSIBILITY environment
-    // variable. For details, see QTBUG-59922.
-#ifdef Q_OS_LINUX
-    static bool accessibility_enabled
-            = qEnvironmentVariableIsSet("QTWEBENGINE_ENABLE_LINUX_ACCESSIBILITY");
-#else
-    const bool accessibility_enabled = true;
-#endif
-    return accessibility_enabled;
-}
-
 RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget)
     : content::RenderWidgetHostViewBase::RenderWidgetHostViewBase(widget)
     , m_gestureProvider(QtGestureProviderConfig(), this)
@@ -280,13 +266,6 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget
                     base::checked_cast<uint32_t>(widget->GetRoutingID()))
 {
     host()->SetView(this);
-#ifndef QT_NO_ACCESSIBILITY
-    if (isAccessibilityEnabled()) {
-        QAccessible::installActivationObserver(this);
-        if (QAccessible::isActive())
-            content::BrowserAccessibilityStateImpl::GetInstance()->EnableAccessibility();
-    }
-#endif // QT_NO_ACCESSIBILITY
 
     if (GetTextInputManager())
         GetTextInputManager()->AddObserver(this);
@@ -303,9 +282,6 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget
 RenderWidgetHostViewQt::~RenderWidgetHostViewQt()
 {
     QObject::disconnect(m_adapterClientDestroyedConnection);
-#ifndef QT_NO_ACCESSIBILITY
-    QAccessible::removeActivationObserver(this);
-#endif // QT_NO_ACCESSIBILITY
 
     if (text_input_manager_)
         text_input_manager_->RemoveObserver(this);
@@ -1393,16 +1369,6 @@ void RenderWidgetHostViewQt::handleInputMethodQueryEvent(QInputMethodQueryEvent
     ev->accept();
 }
 
-#ifndef QT_NO_ACCESSIBILITY
-void RenderWidgetHostViewQt::accessibilityActiveChanged(bool active)
-{
-    if (active)
-        content::BrowserAccessibilityStateImpl::GetInstance()->EnableAccessibility();
-    else
-        content::BrowserAccessibilityStateImpl::GetInstance()->DisableAccessibility();
-}
-#endif // QT_NO_ACCESSIBILITY
-
 void RenderWidgetHostViewQt::handleWheelEvent(QWheelEvent *ev)
 {
     if (!m_wheelAckPending) {
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index a12ffe636..3d51731d2 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -57,7 +57,6 @@
 #include <QMap>
 #include <QPoint>
 #include <QtGlobal>
-#include <QtGui/qaccessible.h>
 #include <QtGui/QTouchEvent>
 
 QT_BEGIN_NAMESPACE
@@ -94,9 +93,6 @@ class RenderWidgetHostViewQt
     , public ui::GestureProviderClient
     , public RenderWidgetHostViewQtDelegateClient
     , public base::SupportsWeakPtr<RenderWidgetHostViewQt>
-#ifndef QT_NO_ACCESSIBILITY
-    , public QAccessible::ActivationObserver
-#endif // QT_NO_ACCESSIBILITY
     , public content::TextInputManager::Observer
 {
 public:
@@ -209,9 +205,6 @@ public:
 
     // Overridden from content::BrowserAccessibilityDelegate
     content::BrowserAccessibilityManager* CreateBrowserAccessibilityManager(content::BrowserAccessibilityDelegate* delegate, bool for_root_frame) override;
-#ifndef QT_NO_ACCESSIBILITY
-    void accessibilityActiveChanged(bool active) override;
-#endif // QT_NO_ACCESSIBILITY
     LoadVisuallyCommittedState getLoadVisuallyCommittedState() const { return m_loadVisuallyCommittedState; }
     void setLoadVisuallyCommittedState(LoadVisuallyCommittedState state) { m_loadVisuallyCommittedState = state; }
 
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 0763b9dac..912a6128e 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -80,16 +80,19 @@
 #include "content/public/app/sandbox_helper_win.h"
 #endif // OS_WIN
 
+#ifndef QT_NO_ACCESSIBILITY
+#include "accessibility_activation_observer.h"
+#endif
 #include "api/qwebengineurlscheme.h"
-#include "profile_adapter.h"
 #include "content_browser_client_qt.h"
 #include "content_client_qt.h"
 #include "content_main_delegate_qt.h"
 #include "devtools_manager_delegate_qt.h"
 #include "media_capture_devices_dispatcher.h"
 #include "net/webui_controller_factory_qt.h"
-#include "type_conversion.h"
 #include "ozone/gl_context_qt.h"
+#include "profile_adapter.h"
+#include "type_conversion.h"
 #include "web_engine_library_info.h"
 
 #include <QFileInfo>
@@ -608,6 +611,10 @@ void WebEngineContext::initialize()
     m_printJobManager.reset(new printing::PrintJobManager());
 #endif
 
+#ifndef QT_NO_ACCESSIBILITY
+    m_accessibilityActivationObserver.reset(new AccessibilityActivationObserver());
+#endif
+
     content::WebUIControllerFactory::RegisterFactory(WebUIControllerFactoryQt::GetInstance());
 }
 
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index 647f28f55..cf6834ec4 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -72,9 +72,10 @@ QT_FORWARD_DECLARE_CLASS(QObject)
 
 namespace QtWebEngineCore {
 
-class ProfileAdapter;
+class AccessibilityActivationObserver;
 class ContentMainDelegateQt;
 class DevToolsServerQt;
+class ProfileAdapter;
 
 bool usingSoftwareDynamicGL();
 
@@ -116,6 +117,9 @@ private:
     std::unique_ptr<DevToolsServerQt> m_devtoolsServer;
     std::unique_ptr<gpu::SyncPointManager> m_syncPointManager;
     QVector<ProfileAdapter*> m_profileAdapters;
+#ifndef QT_NO_ACCESSIBILITY
+    std::unique_ptr<AccessibilityActivationObserver> m_accessibilityActivationObserver;
+#endif
 
 #if QT_CONFIG(webengine_printing_and_pdf)
     std::unique_ptr<printing::PrintJobManager> m_printJobManager;