Diff
Modified: trunk/ChangeLog (289028 => 289029)
--- trunk/ChangeLog 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/ChangeLog 2022-02-03 07:05:30 UTC (rev 289029)
@@ -1,3 +1,12 @@
+2022-02-02 Pablo Saavedra <[email protected]>
+
+ [WPE] Fix for non-unified builds with ACCESSIBILITY=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=236024
+
+ Reviewed by Darin Adler.
+
+ * Source/cmake/OptionsWPE.cmake:
+
2022-02-02 Adrian Perez de Castro <[email protected]>
[CMake] Stop defaulting to ld.gold
Modified: trunk/Source/WebCore/ChangeLog (289028 => 289029)
--- trunk/Source/WebCore/ChangeLog 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/ChangeLog 2022-02-03 07:05:30 UTC (rev 289029)
@@ -1,3 +1,34 @@
+2022-02-02 Pablo Saavedra <[email protected]>
+
+ [WPE] Fix for non-unified builds with ACCESSIBILITY=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=236024
+
+ Reviewed by Darin Adler.
+
+ * accessibility/atspi/AXObjectCacheAtspi.cpp:
+ * accessibility/atspi/AccessibilityAtspi.cpp:
+ * accessibility/atspi/AccessibilityAtspi.h:
+ * accessibility/atspi/AccessibilityAtspiEnums.h:
+ * accessibility/atspi/AccessibilityObjectActionAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectAtspi.h:
+ * accessibility/atspi/AccessibilityObjectComponentAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectDocumentAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectHyperlinkAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectImageAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectSelectionAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectTableAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectTableCellAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectTextAtspi.cpp:
+ * accessibility/atspi/AccessibilityObjectValueAtspi.cpp:
+ * accessibility/atspi/AccessibilityRootAtspi.cpp:
+ * accessibility/atspi/AccessibilityRootAtspi.h:
+ * editing/atspi/FrameSelectionAtspi.cpp:
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::setSelectedState):
+ * page/Page.h:
+
2022-02-02 Chris Dumez <[email protected]>
Move connect event dispatch logic to SharedWorkerGlobalScope
Modified: trunk/Source/WebCore/accessibility/atspi/AXObjectCacheAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AXObjectCacheAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AXObjectCacheAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AXObjectCache.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AXTextStateChangeIntent.h"
#include "AccessibilityObject.h"
#include "AccessibilityObjectAtspi.h"
@@ -331,4 +331,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -21,7 +21,7 @@
#include "config.h"
#include "AccessibilityAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AXObjectCache.h"
#include "AccessibilityAtspiEnums.h"
#include "AccessibilityAtspiInterfaces.h"
@@ -921,4 +921,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h 2022-02-03 07:05:30 UTC (rev 289029)
@@ -19,7 +19,7 @@
#pragma once
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include <wtf/CompletionHandler.h>
#include <wtf/FastMalloc.h>
#include <wtf/HashMap.h>
@@ -144,4 +144,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspiEnums.h (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspiEnums.h 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspiEnums.h 2022-02-03 07:05:30 UTC (rev 289029)
@@ -19,7 +19,7 @@
#pragma once
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
namespace WebCore {
namespace Atspi {
@@ -279,4 +279,4 @@
} // namespace Atspi
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectActionAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectActionAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectActionAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityRootAtspi.h"
#include <gio/gio.h>
@@ -93,4 +93,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AXObjectCache.h"
#include "AccessibilityAtspiEnums.h"
#include "AccessibilityAtspiInterfaces.h"
@@ -1500,4 +1500,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h 2022-02-03 07:05:30 UTC (rev 289029)
@@ -19,7 +19,7 @@
#pragma once
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspi.h"
#include "AccessibilityObjectInterface.h"
#include "IntRect.h"
@@ -252,4 +252,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectComponentAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectComponentAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectComponentAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspi.h"
#include "AccessibilityAtspiEnums.h"
#include "AccessibilityObjectInterface.h"
@@ -211,4 +211,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectDocumentAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectDocumentAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectDocumentAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "Document.h"
#include "DocumentInlines.h"
@@ -140,4 +140,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHyperlinkAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHyperlinkAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHyperlinkAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspi.h"
#include <gio/gio.h>
@@ -104,4 +104,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspi.h"
#include <gio/gio.h>
@@ -106,4 +106,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectImageAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectImageAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectImageAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspiEnums.h"
#include "AccessibilityObject.h"
@@ -99,4 +99,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectSelectionAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectSelectionAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectSelectionAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspi.h"
#include "AccessibilityObject.h" // NOLINT: check-webkit-style has problems with files that do not have primary header
@@ -198,4 +198,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTableAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTableAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTableAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspi.h"
#include "AccessibilityObject.h" // NOLINT: check-webkit-style has problems with files that do not have primary header
@@ -363,4 +363,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTableCellAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTableCellAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTableCellAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspi.h"
#include "AccessibilityAtspiEnums.h"
@@ -130,4 +130,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AXObjectCache.h"
#include "AccessibilityAtspi.h"
#include "AccessibilityAtspiEnums.h"
@@ -1028,4 +1028,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectValueAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectValueAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectValueAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityObjectAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityAtspi.h"
#include "AccessibilityObject.h"
@@ -114,4 +114,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "AccessibilityRootAtspi.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AXObjectCache.h"
#include "AccessibilityAtspiEnums.h"
#include "AccessibilityAtspiInterfaces.h"
@@ -318,4 +318,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.h (289028 => 289029)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.h 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.h 2022-02-03 07:05:30 UTC (rev 289029)
@@ -19,7 +19,7 @@
#pragma once
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "IntRect.h"
#include <wtf/FastMalloc.h>
#include <wtf/RefCounted.h>
@@ -70,4 +70,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/editing/atspi/FrameSelectionAtspi.cpp (289028 => 289029)
--- trunk/Source/WebCore/editing/atspi/FrameSelectionAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/editing/atspi/FrameSelectionAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -20,7 +20,7 @@
#include "config.h"
#include "FrameSelection.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AXObjectCache.h"
#include "DocumentInlines.h"
@@ -41,4 +41,4 @@
} // namespace WebCore
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Source/WebCore/html/HTMLOptionElement.cpp (289028 => 289029)
--- trunk/Source/WebCore/html/HTMLOptionElement.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/html/HTMLOptionElement.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -237,7 +237,7 @@
m_isSelected = selected;
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
if (auto* cache = document().existingAXObjectCache())
cache->postNotification(this, AXObjectCache::AXSelectedStateChanged);
#endif
Modified: trunk/Source/WebCore/page/Page.h (289028 => 289029)
--- trunk/Source/WebCore/page/Page.h 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/WebCore/page/Page.h 2022-02-03 07:05:30 UTC (rev 289029)
@@ -927,7 +927,7 @@
ModelPlayerProvider& modelPlayerProvider();
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
AccessibilityRootAtspi* accessibilityRootObject() const { return m_accessibilityRootObject; }
void setAccessibilityRootObject(AccessibilityRootAtspi* rootObject) { m_accessibilityRootObject = rootObject; }
#endif
@@ -1288,7 +1288,7 @@
WeakHashMap<HTMLElement, CachedTextRecognitionResult> m_textRecognitionResults;
#endif
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
AccessibilityRootAtspi* m_accessibilityRootObject { nullptr };
#endif
};
Modified: trunk/Source/cmake/OptionsWPE.cmake (289028 => 289029)
--- trunk/Source/cmake/OptionsWPE.cmake 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Source/cmake/OptionsWPE.cmake 2022-02-03 07:05:30 UTC (rev 289029)
@@ -293,8 +293,15 @@
SET_AND_EXPOSE_TO_BUILD(USE_CAPSTONE ${ENABLE_DEVELOPER_MODE})
endif ()
-if (ENABLE_ACCESSIBILITY AND NOT USE_ATSPI)
- SET_AND_EXPOSE_TO_BUILD(USE_ATK TRUE)
+if (ENABLE_ACCESSIBILITY)
+ if (USE_ATSPI)
+ SET_AND_EXPOSE_TO_BUILD(USE_ATK FALSE)
+ else ()
+ SET_AND_EXPOSE_TO_BUILD(USE_ATK TRUE)
+ endif ()
+else ()
+ SET_AND_EXPOSE_TO_BUILD(USE_ATK FALSE)
+ SET_AND_EXPOSE_TO_BUILD(USE_ATSPI FALSE)
endif ()
SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
Modified: trunk/Tools/ChangeLog (289028 => 289029)
--- trunk/Tools/ChangeLog 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Tools/ChangeLog 2022-02-03 07:05:30 UTC (rev 289029)
@@ -1,3 +1,16 @@
+2022-02-02 Pablo Saavedra <[email protected]>
+
+ [WPE] Fix for non-unified builds with ACCESSIBILITY=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=236024
+
+ Reviewed by Darin Adler.
+
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/atspi/AccessibilityControllerAtspi.cpp:
+ * WebKitTestRunner/InjectedBundle/atspi/AccessibilityNotificationHandler.cpp:
+ * WebKitTestRunner/InjectedBundle/atspi/AccessibilityNotificationHandler.h:
+ * WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp:
+
2022-02-02 Carlos Garcia Campos <[email protected]>
[GTK][a11y] Set platform name to atspi in WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (289028 => 289029)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2022-02-03 07:05:30 UTC (rev 289029)
@@ -47,7 +47,7 @@
#include <atk/atk.h>
#include <wtf/glib/GRefPtr.h>
typedef GRefPtr<AtkObject> PlatformUIElement;
-#elif ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#elif USE(ATSPI)
namespace WebCore {
class AccessibilityObjectAtspi;
}
@@ -78,7 +78,7 @@
#if PLATFORM(COCOA)
id platformUIElement() { return m_element.get(); }
-#elif ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#elif USE(ATSPI)
PlatformUIElement platformUIElement() { return m_element.get(); }
#else
PlatformUIElement platformUIElement() { return m_element; }
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityControllerAtspi.cpp (289028 => 289029)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityControllerAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityControllerAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -28,7 +28,7 @@
#include "config.h"
#include "AccessibilityController.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityNotificationHandler.h"
#include "AccessibilityUIElement.h"
#include "InjectedBundle.h"
@@ -122,4 +122,4 @@
} // namespace WTR
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityNotificationHandler.cpp (289028 => 289029)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityNotificationHandler.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityNotificationHandler.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -28,7 +28,7 @@
#include "config.h"
#include "AccessibilityNotificationHandler.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "InjectedBundlePage.h"
#include "JSWrapper.h"
#include <_javascript_Core/OpaqueJSString.h>
@@ -101,4 +101,4 @@
} // namespace WTR
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityNotificationHandler.h (289028 => 289029)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityNotificationHandler.h 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityNotificationHandler.h 2022-02-03 07:05:30 UTC (rev 289029)
@@ -27,7 +27,7 @@
#pragma once
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityUIElement.h"
#include <_javascript_Core/JSObjectRef.h>
@@ -48,4 +48,4 @@
} // namespace WTR
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp (289028 => 289029)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp 2022-02-03 06:36:08 UTC (rev 289028)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp 2022-02-03 07:05:30 UTC (rev 289029)
@@ -26,7 +26,7 @@
#include "config.h"
#include "AccessibilityUIElement.h"
-#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#if USE(ATSPI)
#include "AccessibilityNotificationHandler.h"
#include "InjectedBundle.h"
#include "InjectedBundlePage.h"
@@ -1760,4 +1760,4 @@
} // namespace WTR
-#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
+#endif // USE(ATSPI)
