[WPE][GTK] Build failure with ENABLE_ACCESSIBILITY=OFF
authorpsaavedra@igalia.com <psaavedra@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Jul 2019 21:51:24 +0000 (21:51 +0000)
committerpsaavedra@igalia.com <psaavedra@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Jul 2019 21:51:24 +0000 (21:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=199625

Added ENABLE(ACCESSIBILITY) and replaced HAVE(ACCESSIBILITY)
with ENABLE(ACCESSIBILITY) in the code.

Additionally, the TestRunner code generator now honors the
Conditional IDL format.

.:

Reviewed by Konstantin Tokarev.

* Source/cmake/OptionsWPE.cmake:
* Source/cmake/WebKitFeatures.cmake:

Source/WebCore:

No new tests as there is no intended functional change

Reviewed by Konstantin Tokarev.

* accessibility/AXObjectCache.cpp:
* accessibility/AXObjectCache.h:
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::detach):
(WebCore::AccessibilityObject::isDetached const):
* accessibility/AccessibilityObject.h:
* accessibility/atk/AXObjectCacheAtk.cpp:
* accessibility/atk/AccessibilityObjectAtk.cpp:
* accessibility/atk/WebKitAccessible.cpp:
* accessibility/atk/WebKitAccessible.h:
* accessibility/atk/WebKitAccessibleHyperlink.cpp:
* accessibility/atk/WebKitAccessibleHyperlink.h:
* accessibility/atk/WebKitAccessibleInterfaceAction.cpp:
* accessibility/atk/WebKitAccessibleInterfaceAction.h:
* accessibility/atk/WebKitAccessibleInterfaceComponent.cpp:
* accessibility/atk/WebKitAccessibleInterfaceComponent.h:
* accessibility/atk/WebKitAccessibleInterfaceDocument.cpp:
* accessibility/atk/WebKitAccessibleInterfaceDocument.h:
* accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp:
* accessibility/atk/WebKitAccessibleInterfaceEditableText.h:
* accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp:
* accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h:
* accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp:
* accessibility/atk/WebKitAccessibleInterfaceHypertext.h:
* accessibility/atk/WebKitAccessibleInterfaceImage.cpp:
* accessibility/atk/WebKitAccessibleInterfaceImage.h:
* accessibility/atk/WebKitAccessibleInterfaceSelection.cpp:
* accessibility/atk/WebKitAccessibleInterfaceSelection.h:
* accessibility/atk/WebKitAccessibleInterfaceTable.cpp:
* accessibility/atk/WebKitAccessibleInterfaceTable.h:
* accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp:
* accessibility/atk/WebKitAccessibleInterfaceTableCell.h:
* accessibility/atk/WebKitAccessibleInterfaceText.cpp:
* accessibility/atk/WebKitAccessibleInterfaceText.h:
* accessibility/atk/WebKitAccessibleInterfaceValue.cpp:
* accessibility/atk/WebKitAccessibleInterfaceValue.h:
* accessibility/atk/WebKitAccessibleUtil.cpp:
* accessibility/atk/WebKitAccessibleUtil.h:
* accessibility/ios/AXObjectCacheIOS.mm:
* accessibility/ios/AccessibilityObjectIOS.mm:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.h:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
* accessibility/mac/AXObjectCacheMac.mm:
* accessibility/mac/AccessibilityObjectBase.mm:
* accessibility/mac/AccessibilityObjectMac.mm:
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* accessibility/win/AccessibilityObjectWin.cpp:
* accessibility/win/AccessibilityObjectWrapperWin.cpp:
* dom/Document.cpp:
(WebCore::Document::prepareForDestruction):
* editing/FrameSelection.h:
* editing/atk/FrameSelectionAtk.cpp:
* html/HTMLTextFormControlElement.cpp:
(WebCore::HTMLTextFormControlElement::setInnerTextValue):
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):

Source/WebKit:

Reviewed by Konstantin Tokarev.

* UIProcess/API/glib/WebKitWebViewAccessible.cpp:
* UIProcess/API/glib/WebKitWebViewAccessible.h:
* UIProcess/API/wpe/PageClientImpl.cpp:
* UIProcess/API/wpe/PageClientImpl.h:
* UIProcess/API/wpe/WPEView.cpp:
(WKWPE::m_backend):
(WKWPE::View::~View):
* UIProcess/API/wpe/WPEView.h:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKAccessibilityRootObject):
(WKAccessibilityFocusedObject):
(WKAccessibilityEnableEnhancedAccessibility):
(WKAccessibilityEnhancedAccessibilityEnabled):
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/atk/WebKitWebPageAccessibilityObject.cpp:
* WebProcess/WebPage/atk/WebKitWebPageAccessibilityObject.h:
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
(WebKit::WebPage::platformInitialize):
* WebProcess/WebPage/wpe/WebPageWPE.cpp:
(WebKit::WebPage::platformInitialize):
* WebProcess/wpe/WebProcessMainWPE.cpp:

Source/WebKitLegacy/mac:

Reviewed by Konstantin Tokarev.

* WebView/WebFrame.mm:
(-[WebFrame setAccessibleName:]):
(-[WebFrame enhancedAccessibilityEnabled]):
(-[WebFrame setEnhancedAccessibility:]):
(-[WebFrame accessibilityRoot]):

Source/WTF:

Reviewed by Konstantin Tokarev.

* wtf/FeatureDefines.h:
* wtf/Platform.h:

Tools:

Reviewed by Konstantin Tokarev.

* WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
* WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.cpp:
* WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.cpp:
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityTextMarker.idl:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityTextMarkerRange.idl:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
* WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm:
(_generateImplementationFile):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247367 268f45cc-cd09-0410-ab3c-d52691b4dbfc

87 files changed:
ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/WTF/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/accessibility/AXObjectCache.cpp
Source/WebCore/accessibility/AXObjectCache.h
Source/WebCore/accessibility/AccessibilityObject.cpp
Source/WebCore/accessibility/AccessibilityObject.h
Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp
Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp
Source/WebCore/accessibility/atk/WebKitAccessible.cpp
Source/WebCore/accessibility/atk/WebKitAccessible.h
Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceAction.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceAction.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceComponent.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHypertext.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTableCell.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.h
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceValue.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceValue.h
Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleUtil.h
Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm
Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm
Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.h
Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
Source/WebCore/accessibility/mac/AccessibilityObjectBase.mm
Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
Source/WebCore/accessibility/win/AccessibilityObjectWin.cpp
Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/editing/FrameSelection.h
Source/WebCore/editing/atk/FrameSelectionAtk.cpp
Source/WebCore/html/HTMLTextFormControlElement.cpp
Source/WebCore/testing/Internals.cpp
Source/WebKit/ChangeLog
Source/WebKit/UIProcess/API/glib/WebKitWebViewAccessible.cpp
Source/WebKit/UIProcess/API/glib/WebKitWebViewAccessible.h
Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
Source/WebKit/UIProcess/API/wpe/WPEView.cpp
Source/WebKit/UIProcess/API/wpe/WPEView.h
Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
Source/WebKit/WebProcess/WebPage/WebPage.cpp
Source/WebKit/WebProcess/WebPage/WebPage.h
Source/WebKit/WebProcess/WebPage/atk/WebKitWebPageAccessibilityObject.cpp
Source/WebKit/WebProcess/WebPage/atk/WebKitWebPageAccessibilityObject.h
Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp
Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp
Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/WebView/WebFrame.mm
Source/cmake/OptionsPlayStation.cmake
Source/cmake/OptionsWPE.cmake
Source/cmake/WebKitFeatures.cmake
Tools/ChangeLog
Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.cpp
Tools/WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.cpp
Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl
Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityTextMarker.idl
Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityTextMarkerRange.idl
Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl
Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm

index efff300..7234aa0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2019-07-11  Pablo Saavedra  <psaavedra@igalia.com>
+
+        [WPE][GTK] Build failure with ENABLE_ACCESSIBILITY=OFF
+        https://bugs.webkit.org/show_bug.cgi?id=199625
+
+        Added ENABLE(ACCESSIBILITY) and replaced HAVE(ACCESSIBILITY)
+        with ENABLE(ACCESSIBILITY) in the code.
+
+        Additionally, the TestRunner code generator now honors the
+        Conditional IDL format.
+
+        Reviewed by Konstantin Tokarev.
+
+        * Source/cmake/OptionsWPE.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+
 2019-07-10  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 
         [GTK][WPE] Enable support for CSS_COMPOSITING
index 9bb23cd..83c3c86 100644 (file)
@@ -1,3 +1,19 @@
+2019-07-11  Pablo Saavedra  <psaavedra@igalia.com>
+
+        [WPE][GTK] Build failure with ENABLE_ACCESSIBILITY=OFF
+        https://bugs.webkit.org/show_bug.cgi?id=199625
+
+        Added ENABLE(ACCESSIBILITY) and replaced HAVE(ACCESSIBILITY)
+        with ENABLE(ACCESSIBILITY) in the code.
+
+        Additionally, the TestRunner code generator now honors the
+        Conditional IDL format.
+
+        Reviewed by Konstantin Tokarev.
+
+        * wtf/FeatureDefines.h:
+        * wtf/Platform.h:
+
 2019-07-10  Ryan Haddad  <ryanhaddad@apple.com>
 
         Unreviewed, rolling out r247286.
index 53243af..1ea4637 100644 (file)
@@ -404,6 +404,10 @@ the public iOS SDK. See <https://webkit.org/b/179167>. */
 #define ENABLE_3D_TRANSFORMS 0
 #endif
 
+#if !defined(ENABLE_ACCESSIBILITY)
+#define ENABLE_ACCESSIBILITY 1
+#endif
+
 #if !defined(ENABLE_ACCELERATED_2D_CANVAS)
 #define ENABLE_ACCELERATED_2D_CANVAS 0
 #endif
index b6cf6bc..eaa365e 100644 (file)
 
 #define USE_METAL 1
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 #define USE_ACCESSIBILITY_CONTEXT_MENUS 1
 #endif
 
index f2e722a..2342774 100644 (file)
@@ -1,3 +1,76 @@
+2019-07-11  Pablo Saavedra  <psaavedra@igalia.com>
+
+        [WPE][GTK] Build failure with ENABLE_ACCESSIBILITY=OFF
+        https://bugs.webkit.org/show_bug.cgi?id=199625
+
+        Added ENABLE(ACCESSIBILITY) and replaced HAVE(ACCESSIBILITY)
+        with ENABLE(ACCESSIBILITY) in the code.
+
+        Additionally, the TestRunner code generator now honors the
+        Conditional IDL format.
+
+        No new tests as there is no intended functional change
+
+        Reviewed by Konstantin Tokarev.
+
+        * accessibility/AXObjectCache.cpp:
+        * accessibility/AXObjectCache.h:
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::detach):
+        (WebCore::AccessibilityObject::isDetached const):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/atk/AXObjectCacheAtk.cpp:
+        * accessibility/atk/AccessibilityObjectAtk.cpp:
+        * accessibility/atk/WebKitAccessible.cpp:
+        * accessibility/atk/WebKitAccessible.h:
+        * accessibility/atk/WebKitAccessibleHyperlink.cpp:
+        * accessibility/atk/WebKitAccessibleHyperlink.h:
+        * accessibility/atk/WebKitAccessibleInterfaceAction.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceAction.h:
+        * accessibility/atk/WebKitAccessibleInterfaceComponent.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceComponent.h:
+        * accessibility/atk/WebKitAccessibleInterfaceDocument.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceDocument.h:
+        * accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceEditableText.h:
+        * accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h:
+        * accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceHypertext.h:
+        * accessibility/atk/WebKitAccessibleInterfaceImage.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceImage.h:
+        * accessibility/atk/WebKitAccessibleInterfaceSelection.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceSelection.h:
+        * accessibility/atk/WebKitAccessibleInterfaceTable.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceTable.h:
+        * accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceTableCell.h:
+        * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceText.h:
+        * accessibility/atk/WebKitAccessibleInterfaceValue.cpp:
+        * accessibility/atk/WebKitAccessibleInterfaceValue.h:
+        * accessibility/atk/WebKitAccessibleUtil.cpp:
+        * accessibility/atk/WebKitAccessibleUtil.h:
+        * accessibility/ios/AXObjectCacheIOS.mm:
+        * accessibility/ios/AccessibilityObjectIOS.mm:
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.h:
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        * accessibility/mac/AXObjectCacheMac.mm:
+        * accessibility/mac/AccessibilityObjectBase.mm:
+        * accessibility/mac/AccessibilityObjectMac.mm:
+        * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        * accessibility/win/AccessibilityObjectWin.cpp:
+        * accessibility/win/AccessibilityObjectWrapperWin.cpp:
+        * dom/Document.cpp:
+        (WebCore::Document::prepareForDestruction):
+        * editing/FrameSelection.h:
+        * editing/atk/FrameSelectionAtk.cpp:
+        * html/HTMLTextFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::setInnerTextValue):
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState):
+
 2019-07-11  Justin Fan  <justin_fan@apple.com>
 
         [WebGPU] Implement GPUError and error scopes
index 3c8cd97..cacab85 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AXObjectCache.h"
 
@@ -3102,4 +3102,4 @@ AXTextChange AXObjectCache::textChangeForEditType(AXTextEditType type)
     
 } // namespace WebCore
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 27034fa..e52203b 100644 (file)
@@ -198,7 +198,7 @@ public:
     Ref<AXIsolatedTreeNode> createIsolatedAccessibilityTreeHierarchy(AccessibilityObject&, AXID, AXIsolatedTree&, Vector<Ref<AXIsolatedTreeNode>>&);
 #endif
     
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     WEBCORE_EXPORT static void enableAccessibility();
     WEBCORE_EXPORT static void disableAccessibility();
 
@@ -497,7 +497,7 @@ public:
     explicit AXAttributeCacheEnabler(AXObjectCache *cache);
     ~AXAttributeCacheEnabler();
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 private:
     AXObjectCache* m_cache;
 #endif
@@ -507,7 +507,7 @@ bool nodeHasRole(Node*, const String& role);
 // This will let you know if aria-hidden was explicitly set to false.
 bool isNodeAriaVisible(Node*);
     
-#if !HAVE(ACCESSIBILITY)
+#if !ENABLE(ACCESSIBILITY)
 inline AccessibilityObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID) const { return AccessibilityObjectInclusion::DefaultBehavior; }
 inline AccessibilityReplacedText::AccessibilityReplacedText(const VisibleSelection&) { }
 inline void AccessibilityReplacedText::postTextStateChangeNotification(AXObjectCache*, AXTextEditType, const String&, const VisibleSelection&) { }
index e148ee5..98e2240 100644 (file)
@@ -106,14 +106,14 @@ void AccessibilityObject::detach(AccessibilityDetachmentType detachmentType, AXO
     // no children are left with dangling pointers to their parent.
     clearChildren();
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     setWrapper(nullptr);
 #endif
 }
 
 bool AccessibilityObject::isDetached() const
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     return !wrapper();
 #else
     return true;
@@ -1791,7 +1791,7 @@ bool AccessibilityObject::contentEditableAttributeIsEnabled(Element* element)
     return contentEditableValue.isEmpty() || equalLettersIgnoringASCIICase(contentEditableValue, "true");
 }
     
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 int AccessibilityObject::lineForPosition(const VisiblePosition& visiblePos) const
 {
     if (visiblePos.isNull() || !node())
@@ -1861,7 +1861,7 @@ unsigned AccessibilityObject::doAXLineForIndex(unsigned index)
     return lineForPosition(visiblePositionForIndex(index, false));
 }
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 void AccessibilityObject::updateBackingStore()
 {
     if (!axObjectCache())
@@ -1925,7 +1925,7 @@ FrameView* AccessibilityObject::documentFrameView() const
     return object->documentFrameView();
 }
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 const AccessibilityObject::AccessibilityChildrenVector& AccessibilityObject::children(bool updateChildrenIfNeeded)
 {
     if (updateChildrenIfNeeded)
@@ -2048,7 +2048,7 @@ const String AccessibilityObject::defaultLiveRegionStatusForRole(AccessibilityRo
     }
 }
     
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 const String& AccessibilityObject::actionVerb() const
 {
 #if !PLATFORM(IOS_FAMILY)
index e172f5f..a009ec8 100644 (file)
@@ -949,7 +949,7 @@ public:
     bool isDOMHidden() const;
     bool isHidden() const { return isAXHidden() || isDOMHidden(); }
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     AccessibilityObjectWrapper* wrapper() const override { return m_wrapper.get(); }
     void setWrapper(AccessibilityObjectWrapper* wrapper) { m_wrapper = wrapper; }
 #else
@@ -962,7 +962,7 @@ public:
     void overrideAttachmentParent(AccessibilityObject*) { }
 #endif
     
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     // a platform-specific method for determining if an attachment is ignored
     bool accessibilityIgnoreAttachment() const;
     // gives platforms the opportunity to indicate if and how an object should be included
@@ -1044,7 +1044,7 @@ protected:
 
     AccessibilityObject* radioGroupAncestor() const;
 
-#if HAVE(ACCESSIBILITY) && USE(ATK)
+#if ENABLE(ACCESSIBILITY) && USE(ATK)
     bool allowsTextRanges() const;
     unsigned getLengthForTextRange() const;
 #else
@@ -1061,7 +1061,7 @@ protected:
 #endif
 };
 
-#if !HAVE(ACCESSIBILITY)
+#if !ENABLE(ACCESSIBILITY)
 inline const AccessibilityObject::AccessibilityChildrenVector& AccessibilityObject::children(bool) { return m_children; }
 inline const String& AccessibilityObject::actionVerb() const { return emptyString(); }
 inline int AccessibilityObject::lineForPosition(const VisiblePosition&) const { return -1; }
index 6c652f4..284e36d 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "AXObjectCache.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "AccessibilityRenderObject.h"
index 42b8ec2..2640c69 100644 (file)
@@ -30,7 +30,7 @@
 #include "TextControlInnerElements.h"
 #include <glib-object.h>
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 namespace WebCore {
 
@@ -190,4 +190,4 @@ unsigned AccessibilityObject::getLengthForTextRange() const
 
 } // namespace WebCore
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index f6ef9fc..12ae435 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "WebKitAccessible.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AXObjectCache.h"
 #include "AccessibilityList.h"
@@ -1369,4 +1369,4 @@ const char* webkitAccessibleCacheAndReturnAtkProperty(WebKitAccessible* accessib
     return (*propertyPtr).data();
 }
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 16e4462..72e1165 100644 (file)
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 #include <wtf/text/WTFString.h>
@@ -85,4 +85,4 @@ bool webkitAccessibleIsDetached(WebKitAccessible*);
 
 const char* webkitAccessibleCacheAndReturnAtkProperty(WebKitAccessible*, AtkCachedProperty, CString&&);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index abc78a6..7245024 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "WebKitAccessibleHyperlink.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AXObjectCache.h"
 #include "AccessibilityObject.h"
@@ -313,4 +313,4 @@ WebKitAccessibleHyperlink* webkitAccessibleHyperlinkGetOrCreate(AtkHyperlinkImpl
     return hyperlink;
 }
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index ef3f67b..7996b0a 100644 (file)
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
@@ -52,4 +52,4 @@ WebKitAccessibleHyperlink* webkitAccessibleHyperlinkGetOrCreate(AtkHyperlinkImpl
 
 G_END_DECLS
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 58d1223..581759b 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceAction.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "NotImplemented.h"
index 5cd7528..6718b14 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleActionInterfaceInit(AtkActionIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 1de6e40..b7fe55b 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceComponent.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "FrameView.h"
@@ -169,4 +169,4 @@ void webkitAccessibleComponentInterfaceInit(AtkComponentIface* iface)
 #endif
 }
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 209d51e..96923c5 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleComponentInterfaceInit(AtkComponentIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 5a79b12..2b313a0 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceDocument.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "Document.h"
index 6fab32a..c948d19 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleDocumentInterfaceInit(AtkDocumentIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 816c156..ac79383 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceEditableText.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "Document.h"
index 6414e2d..58450e4 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleEditableTextInterfaceInit(AtkEditableTextIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index e5be1ac..2fc4e19 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceHyperlinkImpl.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "WebKitAccessibleHyperlink.h"
 
@@ -34,4 +34,4 @@ void webkitAccessibleHyperlinkImplInterfaceInit(AtkHyperlinkImplIface* iface)
     iface->get_hyperlink = webkitAccessibleHyperlinkImplGetHyperlink;
 }
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index c9eebac..bc7ec17 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleHyperlinkImplInterfaceInit(AtkHyperlinkImplIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index aa08ee3..8a3383d 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceHypertext.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "WebKitAccessible.h"
index da163af..548cd60 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleHypertextInterfaceInit(AtkHypertextIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index f586ee2..633c970 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceImage.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "IntRect.h"
index 4f31640..4d9ce40 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleImageInterfaceInit(AtkImageIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 77e8fe5..39bc98e 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceSelection.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityListBox.h"
 #include "AccessibilityObject.h"
index e0f50aa..2b991d2 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleSelectionInterfaceInit(AtkSelectionIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 62149df..a8a8e92 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceTable.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityListBox.h"
 #include "AccessibilityObject.h"
index eacc4df..4efc2b2 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleTableInterfaceInit(AtkTableIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 98e3611..8a8b41a 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceTableCell.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "AccessibilityTable.h"
@@ -166,4 +166,4 @@ void webkitAccessibleTableCellInterfaceInit(AtkTableCellIface* iface)
     iface->get_table = webkitAccessibleTableCellGetTable;
 }
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 9d28957..2bbc737 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleTableCellInterfaceInit(AtkTableCellIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 3f091d1..496e262 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceText.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "Document.h"
index f9f9de0..112955f 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleTextInterfaceInit(AtkTextIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 7307738..04ee890 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitAccessibleInterfaceValue.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AccessibilityObject.h"
 #include "HTMLNames.h"
index f1b49eb..3696cb0 100644 (file)
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
 void webkitAccessibleValueInterfaceInit(AtkValueIface*);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 3f89ce6..a3b871b 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "WebKitAccessibleUtil.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AXObjectCache.h"
 #include "AccessibilityObject.h"
index a8969cf..f6ac764 100644 (file)
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 #include <wtf/text/WTFString.h>
@@ -68,4 +68,4 @@ bool selectionBelongsToObject(WebCore::AccessibilityObject*, WebCore::VisibleSel
 
 WebCore::AccessibilityObject* objectFocusedAndCaretOffsetUnignored(WebCore::AccessibilityObject*, int& offset);
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 18752be..687f1ae 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "AXObjectCache.h"
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
 
 #import "AccessibilityObject.h"
 #import "WebAccessibilityObjectWrapperIOS.h"
@@ -142,4 +142,4 @@ void AXObjectCache::platformPerformDeferredCacheUpdate()
 
 }
 
-#endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
+#endif // ENABLE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
index bd0c40e..4de3924 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "AccessibilityObject.h"
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
 
 #import "AccessibilityRenderObject.h"
 #import "EventNames.h"
@@ -93,4 +93,4 @@ bool AccessibilityObject::isInputTypePopupButton() const
 
 } // WebCore
 
-#endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
+#endif // ENABLE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
index 321874e..b66717d 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
 
 #import "AXObjectCache.h"
 #import "AccessibilityObject.h"
@@ -71,4 +71,4 @@
 
 @end
 
-#endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
+#endif // ENABLE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
index 482a8ae..63ab042 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "WebAccessibilityObjectWrapperIOS.h"
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
 
 #import "AccessibilityAttachment.h"
 #import "AccessibilityMediaObject.h"
@@ -3174,4 +3174,4 @@ static void AXAttributedStringAppendText(NSMutableAttributedString* attrString,
 
 @end
 
-#endif // HAVE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
+#endif // ENABLE(ACCESSIBILITY) && PLATFORM(IOS_FAMILY)
index 9ed909e..2f75f96 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "AXObjectCache.h"
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(MAC)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(MAC)
 
 #import "AXIsolatedTreeNode.h"
 #import "AccessibilityObject.h"
@@ -559,4 +559,4 @@ void AXObjectCache::platformPerformDeferredCacheUpdate()
 
 }
 
-#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
+#endif // ENABLE(ACCESSIBILITY) && PLATFORM(MAC)
index 6b0c93d..018c6b8 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "AccessibilityObject.h"
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(COCOA)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(COCOA)
 
 #import "WebAccessibilityObjectWrapperBase.h"
 
@@ -203,4 +203,4 @@ String AccessibilityObject::helpTextAttributeValue() const
 
 }; // namespace WebCore
 
-#endif // HAVE(ACCESSIBILITY) && PLATFORM(COCOA)
+#endif // ENABLE(ACCESSIBILITY) && PLATFORM(COCOA)
index 3873179..6b95502 100644 (file)
@@ -30,7 +30,7 @@
 #import "RenderObject.h"
 #import "Settings.h"
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(MAC)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(MAC)
 
 #import "WebAccessibilityObjectWrapperMac.h"
 #import "Widget.h"
@@ -130,4 +130,4 @@ void AccessibilityObject::setCaretBrowsingEnabled(bool on)
 
 } // WebCore
 
-#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
+#endif // ENABLE(ACCESSIBILITY) && PLATFORM(MAC)
index 77fc76e..b53b4ae 100644 (file)
@@ -29,7 +29,7 @@
 #import "config.h"
 #import "WebAccessibilityObjectWrapperBase.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #import "AXIsolatedTree.h"
 #import "AXIsolatedTreeNode.h"
@@ -812,4 +812,4 @@ AccessibilitySearchCriteria accessibilitySearchCriteriaForSearchPredicateParamet
 
 @end
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 2bdb3df..29ff4d0 100644 (file)
@@ -29,7 +29,7 @@
 #import "config.h"
 #import "WebAccessibilityObjectWrapperMac.h"
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(MAC)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(MAC)
 
 #import "AXObjectCache.h"
 #import "AccessibilityARIAGridRow.h"
@@ -4646,4 +4646,4 @@ ALLOW_DEPRECATED_DECLARATIONS_END
 
 @end
 
-#endif // HAVE(ACCESSIBILITY) && PLATFORM(MAC)
+#endif // ENABLE(ACCESSIBILITY) && PLATFORM(MAC)
index 1dc6f83..4304d3b 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "AccessibilityObject.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 namespace WebCore {
 
@@ -45,4 +45,4 @@ AccessibilityObjectInclusion AccessibilityObject::accessibilityPlatformIncludesO
 
 } // namespace WebCore
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 09aa64e..bc0fe81 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "AccessibilityObjectWrapperWin.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AXObjectCache.h"
 #include "AccessibilityObject.h"
@@ -82,4 +82,4 @@ void AccessibilityObjectWrapper::accessibilityAttributeValue(const AtomString& a
 
 } // namespace WebCore
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index a8d3777..83bafc9 100644 (file)
@@ -2478,7 +2478,7 @@ void Document::prepareForDestruction()
 
     m_undoManager->removeAllItems();
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     if (this != &topDocument()) {
         // Let the ax cache know that this subframe goes out of scope.
         if (auto* cache = existingAXObjectCache())
index ac3fada..4484afa 100644 (file)
@@ -313,7 +313,7 @@ private:
     LayoutUnit lineDirectionPointForBlockDirectionNavigation(EPositionType);
 
     AXTextStateChangeIntent textSelectionIntent(EAlteration, SelectionDirection, TextGranularity);
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     void notifyAccessibilityForSelectionChange(const AXTextStateChangeIntent&);
 #else
     void notifyAccessibilityForSelectionChange(const AXTextStateChangeIntent&) { }
@@ -387,7 +387,7 @@ inline void FrameSelection::clearTypingStyle()
 }
 
 #if !(PLATFORM(COCOA) || USE(ATK))
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 inline void FrameSelection::notifyAccessibilityForSelectionChange(const AXTextStateChangeIntent&)
 {
 }
index 796eb5c..2935473 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "FrameSelection.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "AXObjectCache.h"
 #include "Document.h"
@@ -116,4 +116,4 @@ void FrameSelection::notifyAccessibilityForSelectionChange(const AXTextStateChan
 
 } // namespace WebCore
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 9722ff0..145eb0f 100644 (file)
@@ -559,7 +559,7 @@ void HTMLTextFormControlElement::setInnerTextValue(const String& value)
     String previousValue = innerTextValueFrom(*innerText);
     bool textIsChanged = value != previousValue;
     if (textIsChanged || !innerText->hasChildNodes()) {
-#if HAVE(ACCESSIBILITY) && !PLATFORM(COCOA)
+#if ENABLE(ACCESSIBILITY) && !PLATFORM(COCOA)
         if (textIsChanged && renderer()) {
             if (AXObjectCache* cache = document().existingAXObjectCache())
                 cache->postNotification(this, AXObjectCache::AXValueChanged, TargetObservableParent);
@@ -576,7 +576,7 @@ void HTMLTextFormControlElement::setInnerTextValue(const String& value)
                 innerText->appendChild(HTMLBRElement::create(document()));
         }
 
-#if HAVE(ACCESSIBILITY) && PLATFORM(COCOA)
+#if ENABLE(ACCESSIBILITY) && PLATFORM(COCOA)
         if (textIsChanged && renderer()) {
             if (AXObjectCache* cache = document().existingAXObjectCache())
                 cache->deferTextReplacementNotificationForTextControl(*this, previousValue);
index 8834ffb..e147d59 100644 (file)
@@ -496,7 +496,7 @@ void Internals::resetToConsistentState(Page& page)
     PlatformMediaSessionManager::sharedManager().setWillIgnoreSystemInterruptions(true);
 #endif
     PlatformMediaSessionManager::sharedManager().setIsPlayingToAutomotiveHeadUnit(false);
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     AXObjectCache::setEnhancedUserInterfaceAccessibility(false);
     AXObjectCache::disableAccessibility();
 #endif
index 8e61056..61095a5 100644 (file)
@@ -1,3 +1,39 @@
+2019-07-11  Pablo Saavedra  <psaavedra@igalia.com>
+
+        [WPE][GTK] Build failure with ENABLE_ACCESSIBILITY=OFF
+        https://bugs.webkit.org/show_bug.cgi?id=199625
+
+        Added ENABLE(ACCESSIBILITY) and replaced HAVE(ACCESSIBILITY)
+        with ENABLE(ACCESSIBILITY) in the code.
+
+        Additionally, the TestRunner code generator now honors the
+        Conditional IDL format.
+
+        Reviewed by Konstantin Tokarev.
+
+        * UIProcess/API/glib/WebKitWebViewAccessible.cpp:
+        * UIProcess/API/glib/WebKitWebViewAccessible.h:
+        * UIProcess/API/wpe/PageClientImpl.cpp:
+        * UIProcess/API/wpe/PageClientImpl.h:
+        * UIProcess/API/wpe/WPEView.cpp:
+        (WKWPE::m_backend):
+        (WKWPE::View::~View):
+        * UIProcess/API/wpe/WPEView.h:
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKAccessibilityRootObject):
+        (WKAccessibilityFocusedObject):
+        (WKAccessibilityEnableEnhancedAccessibility):
+        (WKAccessibilityEnhancedAccessibilityEnabled):
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/atk/WebKitWebPageAccessibilityObject.cpp:
+        * WebProcess/WebPage/atk/WebKitWebPageAccessibilityObject.h:
+        * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+        (WebKit::WebPage::platformInitialize):
+        * WebProcess/WebPage/wpe/WebPageWPE.cpp:
+        (WebKit::WebPage::platformInitialize):
+        * WebProcess/wpe/WebProcessMainWPE.cpp:
+
 2019-07-11  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r247314.
index 3862886..de9fa18 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitWebViewAccessible.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <wtf/glib/WTFGType.h>
 
@@ -113,4 +113,4 @@ void webkitWebViewAccessibleSetWebView(WebKitWebViewAccessible* accessible, gpoi
         atk_object_notify_state_change(ATK_OBJECT(accessible), ATK_STATE_DEFUNCT, FALSE);
 }
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 3037d48..6cb3aec 100644 (file)
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
@@ -53,4 +53,4 @@ void webkitWebViewAccessibleSetWebView(WebKitWebViewAccessible*, gpointer);
 
 G_END_DECLS
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 82d2c15..85129a5 100644 (file)
@@ -37,7 +37,7 @@
 #include <WebCore/DOMPasteAccess.h>
 #include <WebCore/NotImplemented.h>
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 #include <atk/atk.h>
 #endif
 
@@ -413,7 +413,7 @@ void PageClientImpl::requestDOMPasteAccess(const WebCore::IntRect&, const String
     completionHandler(WebCore::DOMPasteAccessResponse::DeniedForGesture);
 }
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 AtkObject* PageClientImpl::accessible()
 {
     return ATK_OBJECT(m_view.accessible());
index 7be9b3e..1682037 100644 (file)
@@ -56,7 +56,7 @@ public:
 
     struct wpe_view_backend* viewBackend();
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     AtkObject* accessible();
 #endif
 
index 9aa6340..be50f12 100644 (file)
@@ -104,7 +104,7 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC
         // get_accessible
         [](void* data) -> void*
         {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
             auto& view = *reinterpret_cast<View*>(data);
             return view.accessible();
 #else
@@ -175,7 +175,7 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC
 
 View::~View()
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     if (m_accessible)
         webkitWebViewAccessibleSetWebView(m_accessible.get(), nullptr);
 #endif
@@ -225,7 +225,7 @@ void View::close()
     m_pageProxy->close();
 }
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 WebKitWebViewAccessible* View::accessible() const
 {
     if (!m_accessible)
index 75ca857..2445861 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/OptionSet.h>
 #include <wtf/RefPtr.h>
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 #include "WebKitWebViewAccessible.h"
 #include <wtf/glib/GRefPtr.h>
 #endif
@@ -83,7 +83,7 @@ public:
     void setFullScreen(bool fullScreenState) { m_fullScreenModeActive = fullScreenState; };
 #endif
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     WebKitWebViewAccessible* accessible() const;
 #endif
 
@@ -106,7 +106,7 @@ private:
     bool m_fullScreenModeActive { false };
 #endif
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     mutable GRefPtr<WebKitWebViewAccessible> m_accessible;
 #endif
 };
index 32eae27..f12a5ba 100644 (file)
@@ -234,7 +234,7 @@ void WKBundlePageInsertNewlineInQuotedContent(WKBundlePageRef pageRef)
 
 void* WKAccessibilityRootObject(WKBundlePageRef pageRef)
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     if (!pageRef)
         return 0;
     
@@ -261,7 +261,7 @@ void* WKAccessibilityRootObject(WKBundlePageRef pageRef)
 
 void* WKAccessibilityFocusedObject(WKBundlePageRef pageRef)
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     if (!pageRef)
         return 0;
     
@@ -284,14 +284,14 @@ void* WKAccessibilityFocusedObject(WKBundlePageRef pageRef)
 
 void WKAccessibilityEnableEnhancedAccessibility(bool enable)
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility(enable);
 #endif
 }
 
 bool WKAccessibilityEnhancedAccessibilityEnabled()
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     return WebCore::AXObjectCache::accessibilityEnhancedUserInterfaceEnabled();
 #else
     return false;
index 65e15ef..9bdb764 100644 (file)
@@ -384,7 +384,7 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
 #endif
 #if PLATFORM(COCOA) || PLATFORM(GTK)
     , m_viewGestureGeometryCollector(std::make_unique<ViewGestureGeometryCollector>(*this))
-#elif HAVE(ACCESSIBILITY) && PLATFORM(GTK)
+#elif ENABLE(ACCESSIBILITY) && PLATFORM(GTK)
     , m_accessibilityObject(nullptr)
 #endif
     , m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
index 4e0ce4a..abfad62 100644 (file)
@@ -86,7 +86,7 @@
 #include <wtf/WallTime.h>
 #include <wtf/text/WTFString.h>
 
-#if HAVE(ACCESSIBILITY) && USE(ATK)
+#if ENABLE(ACCESSIBILITY) && USE(ATK)
 typedef struct _AtkObject AtkObject;
 #include <wtf/glib/GRefPtr.h>
 #endif
@@ -1678,7 +1678,7 @@ private:
     RetainPtr<NSDictionary> m_dataDetectionContext;
 #endif
 
-#if HAVE(ACCESSIBILITY) && USE(ATK)
+#if ENABLE(ACCESSIBILITY) && USE(ATK)
     GRefPtr<AtkObject> m_accessibilityObject;
 #endif
 
index 814947d..07bc35b 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "WebKitWebPageAccessibilityObject.h"
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include "WebPage.h"
 #include <WebCore/AXObjectCache.h>
@@ -157,4 +157,4 @@ AtkObject* webkitWebPageAccessibilityObjectNew(WebPage* page)
     return object;
 }
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index d6ffe03..6d56134 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 
 #include <atk/atk.h>
 
@@ -62,4 +62,4 @@ AtkObject* webkitWebPageAccessibilityObjectNew(WebKit::WebPage*);
 
 G_END_DECLS
 
-#endif // HAVE(ACCESSIBILITY)
+#endif // ENABLE(ACCESSIBILITY)
index 6a957cb..1c0a3d1 100644 (file)
@@ -57,7 +57,7 @@ using namespace WebCore;
 
 void WebPage::platformInitialize()
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     // Create the accessible object (the plug) that will serve as the
     // entry point to the Web process, and send a message to the UI
     // process to connect the two worlds through the accessibility
index 1005f3e..c2b5265 100644 (file)
@@ -39,7 +39,7 @@ using namespace WebCore;
 
 void WebPage::platformInitialize()
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     // Create the accessible object (the plug) that will serve as the
     // entry point to the web process, and send a message to the UI
     // process to connect the two worlds through the accessibility
index 14912ce..0e0dd20 100644 (file)
@@ -31,7 +31,7 @@
 #include "WebProcess.h"
 #include <glib.h>
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 #include <atk-bridge.h>
 #include <atk/atk.h>
 #endif
@@ -39,7 +39,7 @@
 namespace WebKit {
 using namespace WebCore;
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
 static void initializeAccessibility()
 {
     auto* atkUtilClass = ATK_UTIL_CLASS(g_type_class_ref(ATK_TYPE_UTIL));
@@ -85,7 +85,7 @@ public:
         // FIXME: This should be probably called in other processes as well.
         g_set_prgname("WPEWebProcess");
 
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
         initializeAccessibility();
 #endif
 
index 37026d1..ce7f215 100644 (file)
@@ -1,3 +1,22 @@
+2019-07-11  Pablo Saavedra  <psaavedra@igalia.com>
+
+        [WPE][GTK] Build failure with ENABLE_ACCESSIBILITY=OFF
+        https://bugs.webkit.org/show_bug.cgi?id=199625
+
+        Added ENABLE(ACCESSIBILITY) and replaced HAVE(ACCESSIBILITY)
+        with ENABLE(ACCESSIBILITY) in the code.
+
+        Additionally, the TestRunner code generator now honors the
+        Conditional IDL format.
+
+        Reviewed by Konstantin Tokarev.
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame setAccessibleName:]):
+        (-[WebFrame enhancedAccessibilityEnabled]):
+        (-[WebFrame setEnhancedAccessibility:]):
+        (-[WebFrame accessibilityRoot]):
+
 2019-07-08  Antoine Quint  <graouts@apple.com>
 
         [Pointer Events] Enable only on the most recent version of the supported iOS family
index cb73d81..585aea6 100644 (file)
@@ -2160,7 +2160,7 @@ static WebFrameLoadType toWebFrameLoadType(FrameLoadType frameLoadType)
 
 - (void)setAccessibleName:(NSString *)name
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     if (!AXObjectCache::accessibilityEnabled())
         return;
     
@@ -2177,7 +2177,7 @@ static WebFrameLoadType toWebFrameLoadType(FrameLoadType frameLoadType)
 
 - (BOOL)enhancedAccessibilityEnabled
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     return AXObjectCache::accessibilityEnhancedUserInterfaceEnabled();
 #else
     return NO;
@@ -2186,7 +2186,7 @@ static WebFrameLoadType toWebFrameLoadType(FrameLoadType frameLoadType)
 
 - (void)setEnhancedAccessibility:(BOOL)enable
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     AXObjectCache::setEnhancedUserInterfaceAccessibility(enable);
 #endif
 }
@@ -2202,7 +2202,7 @@ static WebFrameLoadType toWebFrameLoadType(FrameLoadType frameLoadType)
 
 - (id)accessibilityRoot
 {
-#if HAVE(ACCESSIBILITY)
+#if ENABLE(ACCESSIBILITY)
     if (!AXObjectCache::accessibilityEnabled()) {
         AXObjectCache::enableAccessibility();
 #if !PLATFORM(IOS_FAMILY)
index 82f8fbe..207d85a 100644 (file)
@@ -12,6 +12,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DFG_JIT PRIVATE OFF)
 
 # Enabled features
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON)
 
@@ -98,9 +99,6 @@ find_package(ZLIB REQUIRED)
 list(APPEND CAIRO_LIBRARIES ${PIXMAN_LIBRARIES})
 list(APPEND CURL_LIBRARIES ${NGHTTP2_LIBRARIES})
 
-# Temporarily turn off Accessibility support
-SET_AND_EXPOSE_TO_BUILD(HAVE_ACCESSIBILITY OFF)
-
 SET_AND_EXPOSE_TO_BUILD(HAVE_PTHREAD_SETNAME_NP ON)
 
 SET_AND_EXPOSE_TO_BUILD(USE_EXPORT_MACROS ON)
index 6cb8c0c..adab35d 100644 (file)
@@ -38,6 +38,7 @@ include(GStreamerDefinitions)
 # without approval from a WPE reviewer. There must be strong reason to support
 # changing the value of the option.
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON)
@@ -62,7 +63,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FE
 # Public options specific to the WPE port. Do not add any options here unless
 # there is a strong reason we should support changing the value of the option,
 # and the option is not relevant to any other WebKit ports.
-WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Whether to enable support for accessibility" PUBLIC ON)
 WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
 WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON)
index bb5eab0..871be29 100644 (file)
@@ -90,6 +90,7 @@ macro(WEBKIT_OPTION_BEGIN)
 
     WEBKIT_OPTION_DEFINE(ENABLE_3D_TRANSFORMS "Toggle 3D transforms support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle Accelerated 2D Canvas support" PRIVATE OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Whether to enable support for accessibility" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY_STATIC_TREE "Toggle static accessibility tree support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_APPLE_PAY "Toggle Apply Pay support" PRIVATE OFF)
index c73c457..73298c6 100644 (file)
@@ -1,3 +1,27 @@
+2019-07-11  Pablo Saavedra  <psaavedra@igalia.com>
+
+        [WPE][GTK] Build failure with ENABLE_ACCESSIBILITY=OFF
+        https://bugs.webkit.org/show_bug.cgi?id=199625
+
+        Added ENABLE(ACCESSIBILITY) and replaced HAVE(ACCESSIBILITY)
+        with ENABLE(ACCESSIBILITY) in the code.
+
+        Additionally, the TestRunner code generator now honors the
+        Conditional IDL format.
+
+        Reviewed by Konstantin Tokarev.
+
+        * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
+        * WebKitTestRunner/InjectedBundle/AccessibilityTextMarker.cpp:
+        * WebKitTestRunner/InjectedBundle/AccessibilityTextMarkerRange.cpp:
+        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+        * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl:
+        * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityTextMarker.idl:
+        * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityTextMarkerRange.idl:
+        * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+        * WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm:
+        (_generateImplementationFile):
+
 2019-07-11  Aakash Jain  <aakash_jain@apple.com>
 
         [ews-build] Add build step to clean up .git/index.lock file
index bf8f555..bedb3c4 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "AccessibilityController.h"
 
+#if ENABLE(ACCESSIBILITY)
+
 #include "AccessibilityUIElement.h"
 #include "InjectedBundle.h"
 #include "InjectedBundlePage.h"
@@ -95,3 +97,5 @@ RefPtr<AccessibilityUIElement> AccessibilityController::elementAtPoint(int x, in
 }
 
 } // namespace WTR
+#endif // ENABLE(ACCESSIBILITY)
+
index 6533604..333f8ed 100644 (file)
@@ -24,6 +24,9 @@
  */
 
 #include "config.h"
+
+#if ENABLE(ACCESSIBILITY)
+
 #include "AccessibilityTextMarker.h"
 
 #include "AccessibilityUIElement.h"
@@ -71,4 +74,5 @@ JSClassRef AccessibilityTextMarker::wrapperClass()
 }
 
 } // namespace WTR
+#endif // ENABLE(ACCESSIBILITY)
 
index 2b21e8a..9a68a74 100644 (file)
@@ -24,6 +24,9 @@
  */
 
 #include "config.h"
+
+#if ENABLE(ACCESSIBILITY)
+
 #include "AccessibilityTextMarker.h"
 
 #include "AccessibilityUIElement.h"
@@ -71,4 +74,5 @@ JSClassRef AccessibilityTextMarkerRange::wrapperClass()
 }
     
 } // namespace WTR
+#endif // ENABLE(ACCESSIBILITY)
 
index 73c1610..74a7188 100644 (file)
@@ -24,6 +24,9 @@
  */
 
 #include "config.h"
+
+#if ENABLE(ACCESSIBILITY)
+
 #include "AccessibilityUIElement.h"
 
 #include "JSAccessibilityUIElement.h"
@@ -108,3 +111,4 @@ RefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousSentenceStartTex
 #endif
 
 } // namespace WTR
+#endif // ENABLE(ACCESSIBILITY)
index d50a203..cc3d9ec 100644 (file)
@@ -23,7 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-interface AccessibilityController {
+[
+    Conditional=ACCESSIBILITY,
+] interface AccessibilityController {
     void enableEnhancedAccessibility(boolean enable);
     readonly attribute boolean enhancedAccessibilityEnabled;
 
index 149c95f..9273552 100644 (file)
@@ -23,7 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-interface AccessibilityTextMarker {
+[
+    Conditional=ACCESSIBILITY,
+] interface AccessibilityTextMarker {
     boolean isEqual(AccessibilityTextMarker otherMarker);
 };
-
index 962c584..1f32c04 100644 (file)
@@ -23,7 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-interface AccessibilityTextMarkerRange {
+[
+    Conditional=ACCESSIBILITY,
+] interface AccessibilityTextMarkerRange {
     boolean isEqual(AccessibilityTextMarkerRange otherMarkerRange);
 };
 
index b60bf17..1c2bd46 100644 (file)
@@ -23,7 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-interface AccessibilityUIElement {
+[
+    Conditional=ACCESSIBILITY,
+] interface AccessibilityUIElement {
     boolean isEqual(AccessibilityUIElement otherElement);
 
     // Document information
index 0e0a17d..3967b4d 100644 (file)
@@ -399,9 +399,14 @@ EOF
 EOF
 
     unshift(@contents, map { "#include \"$_\"\n" } sort keys(%contentsIncludes));
+    my $conditionalString = $$self{codeGenerator}->GenerateConditionalString($interface);
+    unshift(@contents, "\n#if ${conditionalString}\n\n") if $conditionalString;
+
     unshift(@contents, "#include \"config.h\"\n");
     unshift(@contents, @contentsPrefix);
 
+    push(@contents, "\n#endif // ${conditionalString}\n") if $conditionalString;
+
     return { name => $filename, contents => \@contents };
 }