Clean up accessibility

Build less when disabled.

Pick-to: 6.5
Change-Id: I196073ce859216a041b3d13ea585fca749a52700
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

12 files changed, 70 insertions, 79 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index c0522869d..fa8a7d18a 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -76,13 +76,11 @@ foreach(arch ${archs})
             CXX_COMPILE_OPTIONS
                 ${gnCxxCompileOptions}
             SOURCES
-                accessibility_activation_observer.cpp accessibility_activation_observer.h
                 accessibility_tree_formatter_qt.cpp
                 authentication_dialog_controller.cpp authentication_dialog_controller.h authentication_dialog_controller_p.h
                 autofill_client_qt.cpp autofill_client_qt.h
                 autofill_popup_controller.cpp autofill_popup_controller.h autofill_popup_controller_p.h
                 browser_accessibility_manager_qt.cpp browser_accessibility_manager_qt.h
-                browser_accessibility_qt.cpp browser_accessibility_qt.h
                 browser_main_parts_qt.cpp browser_main_parts_qt.h
                 browser_message_filter_qt.cpp browser_message_filter_qt.h
                 browsing_data_remover_delegate_qt.cpp browsing_data_remover_delegate_qt.h
@@ -197,6 +195,12 @@ foreach(arch ${archs})
                 web_usb_detector_qt.cpp web_usb_detector_qt.h
         )
 
+        extend_gn_target(${buildGn} CONDITION QT_FEATURE_accessibility
+            SOURCES
+                accessibility_activation_observer.cpp accessibility_activation_observer.h
+                browser_accessibility_qt.cpp browser_accessibility_qt.h
+        )
+
         extend_gn_target(${buildGn} CONDITION QT_FEATURE_webengine_ozone_x11
             SOURCES
                 ozone/gl_ozone_glx_qt.cpp ozone/gl_ozone_glx_qt.h
diff --git a/src/core/accessibility_activation_observer.cpp b/src/core/accessibility_activation_observer.cpp
index 53a5e87fd..179a780d0 100644
--- a/src/core/accessibility_activation_observer.cpp
+++ b/src/core/accessibility_activation_observer.cpp
@@ -3,8 +3,6 @@
 
 #include "accessibility_activation_observer.h"
 
-#if QT_CONFIG(accessibility)
-
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 
 namespace QtWebEngineCore {
@@ -49,5 +47,3 @@ void AccessibilityActivationObserver::accessibilityActiveChanged(bool active)
 }
 
 } // namespace QtWebEngineCore
-
-#endif // QT_CONFIG(accessibility)
diff --git a/src/core/accessibility_activation_observer.h b/src/core/accessibility_activation_observer.h
index 20063c577..81d8b843c 100644
--- a/src/core/accessibility_activation_observer.h
+++ b/src/core/accessibility_activation_observer.h
@@ -6,12 +6,8 @@
 
 #include <QtGui/qaccessible.h>
 
-#if QT_CONFIG(accessibility)
-
 namespace QtWebEngineCore {
 
-class RenderWidgetHostViewQt;
-
 class AccessibilityActivationObserver : public QAccessible::ActivationObserver
 {
 public:
@@ -23,6 +19,4 @@ public:
 
 } // namespace QtWebEngineCore
 
-#endif // QT_CONFIG(accessibility)
-
 #endif // ACCESSIBILITY_ACTIVATION_OBSERVER_H
diff --git a/src/core/accessibility_tree_formatter_qt.cpp b/src/core/accessibility_tree_formatter_qt.cpp
index 021ef0546..3a3b30cb4 100644
--- a/src/core/accessibility_tree_formatter_qt.cpp
+++ b/src/core/accessibility_tree_formatter_qt.cpp
@@ -1,20 +1,27 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#include "ui/accessibility/platform/inspect/ax_tree_formatter_base.h"
+#include "content/browser/accessibility/browser_accessibility_manager.h"
+#include "content/browser/accessibility/accessibility_tree_formatter_blink.h"
+#include "content/public/browser/ax_inspect_factory.h"
+#include "ui/accessibility/platform/inspect/ax_event_recorder.h"
 
+#include <QtGui/qtguiglobal.h>
+
+#include <memory>
+#include <string>
 #include <utility>
 
+#if QT_CONFIG(accessibility)
+#include "browser_accessibility_qt.h"
+
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
-#include "content/browser/accessibility/accessibility_tree_formatter_blink.h"
 #include "content/browser/accessibility/browser_accessibility.h"
-#include "content/public/browser/ax_inspect_factory.h"
-#include "ui/accessibility/platform/inspect/ax_event_recorder.h"
-
-#include "browser_accessibility_qt.h"
+#include "ui/accessibility/platform/inspect/ax_tree_formatter_base.h"
 
 #include <QtGui/qaccessible.h>
+#endif
 
 namespace content {
 
diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp
index 205ca6edf..f89110036 100644
--- a/src/core/browser_accessibility_manager_qt.cpp
+++ b/src/core/browser_accessibility_manager_qt.cpp
@@ -1,23 +1,26 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
+#include "qtwebenginecoreglobal.h"
+
+#include "content/browser/accessibility/browser_accessibility_manager.h"
+
+#include <QtGui/qtguiglobal.h>
+
+#if QT_CONFIG(accessibility)
+#include "browser_accessibility_qt.h"
 #include "browser_accessibility_manager_qt.h"
-#include "qtwebenginecoreglobal_p.h"
+#include "render_widget_host_view_qt.h" // WebContentsAccessibilityQt
 
 #include "content/browser/accessibility/browser_accessibility.h"
-#include "ui/accessibility/ax_enums.mojom.h"
-
 #if QT_CONFIG(webengine_extensions)
 #include "content/browser/renderer_host/render_frame_host_impl.h"
 #include "content/public/browser/web_contents.h"
 #endif // QT_CONFIG(webengine_extensions)
-
-#include "browser_accessibility_qt.h"
-#include "render_widget_host_view_qt.h"
+#include "ui/accessibility/ax_enums.mojom.h"
 
 #include <QtGui/qaccessible.h>
-
-using namespace blink;
+#endif // QT_CONFIG(accessibility)
 
 namespace content {
 
@@ -43,6 +46,8 @@ BrowserAccessibilityManager *BrowserAccessibilityManager::Create(
 
     return new BrowserAccessibilityManagerQt(access, initialTree, delegate);
 #else
+    Q_UNUSED(initialTree);
+    Q_UNUSED(delegate);
     return nullptr;
 #endif // QT_CONFIG(accessibility)
 }
@@ -54,6 +59,7 @@ BrowserAccessibilityManager *BrowserAccessibilityManager::Create(
 #if QT_CONFIG(accessibility)
     return BrowserAccessibilityManager::Create(BrowserAccessibilityManagerQt::GetEmptyDocument(), delegate);
 #else
+    Q_UNUSED(delegate);
     return nullptr;
 #endif
 }
diff --git a/src/core/browser_accessibility_manager_qt.h b/src/core/browser_accessibility_manager_qt.h
index 839f6da20..e36edd979 100644
--- a/src/core/browser_accessibility_manager_qt.h
+++ b/src/core/browser_accessibility_manager_qt.h
@@ -6,10 +6,8 @@
 
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 
-#include <QtCore/qobject.h>
-#include <QtGui/qtgui-config.h>
-
-#if QT_CONFIG(accessibility)
+#include <QtCore/qtclasshelpermacros.h>
+#include <QtCore/qtconfigmacros.h>
 
 QT_FORWARD_DECLARE_CLASS(QAccessibleInterface)
 
@@ -43,5 +41,4 @@ private:
 
 }
 
-#endif // QT_CONFIG(accessibility)
-#endif
+#endif // BROWSER_ACCESSIBILITY_MANAGER_QT_H
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp
index 7c9111c56..844d77492 100644
--- a/src/core/browser_accessibility_qt.cpp
+++ b/src/core/browser_accessibility_qt.cpp
@@ -6,16 +6,13 @@
 // found in the LICENSE.Chromium file.
 
 #include "browser_accessibility_qt.h"
-
-#if QT_CONFIG(accessibility)
-
-#include "content/browser/accessibility/browser_accessibility.h"
-#include "ui/accessibility/ax_enums.mojom.h"
-
 #include "browser_accessibility_manager_qt.h"
 #include "qtwebenginecoreglobal_p.h"
 #include "type_conversion.h"
 
+#include "content/browser/accessibility/browser_accessibility.h"
+#include "ui/accessibility/ax_enums.mojom.h"
+
 #include <QtGui/qaccessible.h>
 
 namespace QtWebEngineCore {
@@ -802,7 +799,8 @@ void BrowserAccessibilityInterface::doAction(const QString &actionName)
         q->manager()->SetFocus(*q);
 }
 
-QStringList BrowserAccessibilityInterface::keyBindingsForAction(const QString &actionName) const
+QStringList
+BrowserAccessibilityInterface::keyBindingsForAction(const QString & /*actionName*/) const
 {
     QT_NOT_YET_IMPLEMENTED
     return QStringList();
@@ -1139,6 +1137,3 @@ const QAccessibleInterface *toQAccessibleInterface(const BrowserAccessibility *o
 }
 
 } // namespace content
-
-
-#endif // QT_CONFIG(accessibility)
diff --git a/src/core/browser_accessibility_qt.h b/src/core/browser_accessibility_qt.h
index 478ce0f62..455478247 100644
--- a/src/core/browser_accessibility_qt.h
+++ b/src/core/browser_accessibility_qt.h
@@ -4,9 +4,8 @@
 #ifndef BROWSER_ACCESSIBILITY_QT_H
 #define BROWSER_ACCESSIBILITY_QT_H
 
-#include <QtGui/qtguiglobal.h>
+#include <QtCore/qtconfigmacros.h>
 
-#if QT_CONFIG(accessibility)
 QT_FORWARD_DECLARE_CLASS(QAccessibleInterface)
 
 namespace content {
@@ -17,6 +16,4 @@ const QAccessibleInterface *toQAccessibleInterface(const BrowserAccessibility *o
 
 } // namespace content
 
-#endif // QT_CONFIG(accessibility)
-
 #endif // BROWSER_ACCESSIBILITY_QT_H
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 177e3c56e..19b9f462c 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -3,7 +3,6 @@
 
 #include "render_widget_host_view_qt.h"
 
-#include "browser_accessibility_manager_qt.h"
 #include "qtwebenginecoreglobal_p.h"
 #include "render_widget_host_view_qt_delegate.h"
 #include "render_widget_host_view_qt_delegate_client.h"
@@ -289,11 +288,6 @@ gfx::NativeView RenderWidgetHostViewQt::GetNativeView()
     return gfx::NativeView();
 }
 
-gfx::NativeViewAccessible RenderWidgetHostViewQt::GetNativeViewAccessible()
-{
-    return 0;
-}
-
 content::WebContentsAccessibility *RenderWidgetHostViewQt::GetWebContentsAccessibility()
 {
     if (!m_webContentsAccessibility)
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index a1addd1b6..aebf59ddb 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -12,15 +12,12 @@
 #include "components/viz/common/resources/transferable_resource.h"
 #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
 #include "components/viz/host/host_frame_sink_client.h"
-#include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/web_contents_accessibility.h"
 #include "content/browser/renderer_host/input/mouse_wheel_phase_handler.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/text_input_manager.h"
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
 
-QT_FORWARD_DECLARE_CLASS(QAccessibleInterface)
-
 namespace content {
 class RenderFrameHost;
 class RenderWidgetHostImpl;
@@ -56,12 +53,13 @@ public:
     RenderWidgetHostViewQtDelegateClient *delegateClient() const { return m_delegateClient.get(); }
     void addGuest(content::RenderWidgetHost *);
 
+    // Overridden from RenderWidgetHostView:
     void InitAsChild(gfx::NativeView) override;
     void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&, const gfx::Rect&) override;
     void SetSize(const gfx::Size& size) override;
     void SetBounds(const gfx::Rect&) override;
     gfx::NativeView GetNativeView() override;
-    gfx::NativeViewAccessible GetNativeViewAccessible() override;
+    gfx::NativeViewAccessible GetNativeViewAccessible() override { return nullptr; }
     void Focus() override;
     bool HasFocus() override;
     bool IsMouseLocked() override;
@@ -119,6 +117,7 @@ public:
     ui::Compositor *GetCompositor() override;
     absl::optional<content::DisplayFeature> GetDisplayFeature() override;
     void SetDisplayFeatureForTesting(const content::DisplayFeature*) override;
+    content::WebContentsAccessibility *GetWebContentsAccessibility() override;
 #if BUILDFLAG(IS_MAC)
     void ShowSharePicker(
         const std::string &title,
@@ -144,9 +143,6 @@ public:
     void OnSelectionBoundsChanged(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view) override;
     void OnTextSelectionChanged(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view) override;
 
-    // Overridden from content::BrowserAccessibilityDelegate
-    content::WebContentsAccessibility *GetWebContentsAccessibility() override;
-
     // Overridden from content::RenderFrameMetadataProvider::Observer
     void OnRenderFrameMetadataChangedAfterActivation(base::TimeTicks activation_time) override;
     void OnRenderFrameMetadataChangedBeforeActivation(const cc::RenderFrameMetadata &) override {}
diff --git a/src/core/render_widget_host_view_qt_delegate_item.cpp b/src/core/render_widget_host_view_qt_delegate_item.cpp
index fca02055c..dcf7e104c 100644
--- a/src/core/render_widget_host_view_qt_delegate_item.cpp
+++ b/src/core/render_widget_host_view_qt_delegate_item.cpp
@@ -5,10 +5,14 @@
 
 #include "render_widget_host_view_qt_delegate_client.h"
 
-#include <QGuiApplication>
-#include <QMouseEvent>
-#include <QSGImageNode>
-#include <QWindow>
+#include <QtGui/qevent.h>
+#include <QtGui/qguiapplication.h>
+#include <QtGui/qwindow.h>
+#include <QtQuick/qsgimagenode.h>
+
+#if QT_CONFIG(accessibility)
+#include <QtGui/qaccessible.h>
+#endif
 
 namespace QtWebEngineCore {
 
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 467266ee6..868cca06c 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -62,6 +62,23 @@
 #include "ui/gfx/font_render_params.h"
 #include "qtwebengine/browser/qtwebenginepage.mojom.h"
 
+#include <QtCore/QVariant>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QMimeData>
+#include <QtCore/QTemporaryDir>
+#include <QtGui/QDrag>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPageLayout>
+#include <QtGui/QPixmap>
+#include <QtGui/QStyleHints>
+
+#if QT_CONFIG(accessibility)
+#include "browser_accessibility_qt.h"
+#include "content/browser/accessibility/browser_accessibility_manager.h"
+#include <QtGui/qaccessible.h>
+#endif
+
 #if QT_CONFIG(webengine_printing_and_pdf)
 #include "components/pdf/browser/pdf_web_contents_helper.h"
 #include "printing/pdf_web_contents_helper_client_qt.h"
@@ -77,22 +94,6 @@
 #include "extensions/extension_web_contents_observer_qt.h"
 #endif
 
-#include <QtCore/QVariant>
-#include <QtCore/QElapsedTimer>
-#include <QtCore/QMimeData>
-#include <QtCore/QTemporaryDir>
-#include <QtGui/QDrag>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QPageLayout>
-#include <QtGui/QPixmap>
-#include <QtGui/QStyleHints>
-
-// Can't include headers as qaccessible.h conflicts with Chromium headers.
-namespace content {
-extern QAccessibleInterface *toQAccessibleInterface(BrowserAccessibility *acc);
-}
-
 namespace QtWebEngineCore {
 
 #define CHECK_INITIALIZED(return_value)         \