Add stub implementation for accessibility objects
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Oct 2018 00:46:37 +0000 (00:46 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Oct 2018 00:46:37 +0000 (00:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=190608

Reviewed by Michael Catanzaro.

No new tests. No change in behavior.

Add default implementation to associated cpp file. Removes the WPE
specific stubs.

* SourcesWPE.txt:
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::detachWrapper):
(WebCore::AXObjectCache::attachWrapper):
(WebCore::AXObjectCache::postPlatformNotification):
(WebCore::AXObjectCache::nodeTextChangePlatformNotification):
(WebCore::AXObjectCache::frameLoadingEventPlatformNotification):
(WebCore::AXObjectCache::platformHandleFocusedUIElementChanged):
(WebCore::AXObjectCache::handleScrolledToAnchor):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::accessibilityIgnoreAttachment const):
(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject const):
* accessibility/AccessibilityObject.h:
* accessibility/wpe/AXObjectCacheWPE.cpp: Removed.
* accessibility/wpe/AccessibilityObjectWPE.cpp: Removed.

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

Source/WebCore/ChangeLog
Source/WebCore/SourcesWPE.txt
Source/WebCore/accessibility/AXObjectCache.cpp
Source/WebCore/accessibility/AccessibilityObject.cpp
Source/WebCore/accessibility/AccessibilityObject.h
Source/WebCore/accessibility/wpe/AXObjectCacheWPE.cpp [deleted file]
Source/WebCore/accessibility/wpe/AccessibilityObjectWPE.cpp [deleted file]

index e471f23..25ccea5 100644 (file)
@@ -1,3 +1,31 @@
+2018-10-15  Don Olmstead  <don.olmstead@sony.com>
+
+        Add stub implementation for accessibility objects
+        https://bugs.webkit.org/show_bug.cgi?id=190608
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests. No change in behavior.
+
+        Add default implementation to associated cpp file. Removes the WPE
+        specific stubs.
+
+        * SourcesWPE.txt:
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::detachWrapper):
+        (WebCore::AXObjectCache::attachWrapper):
+        (WebCore::AXObjectCache::postPlatformNotification):
+        (WebCore::AXObjectCache::nodeTextChangePlatformNotification):
+        (WebCore::AXObjectCache::frameLoadingEventPlatformNotification):
+        (WebCore::AXObjectCache::platformHandleFocusedUIElementChanged):
+        (WebCore::AXObjectCache::handleScrolledToAnchor):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::accessibilityIgnoreAttachment const):
+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject const):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/wpe/AXObjectCacheWPE.cpp: Removed.
+        * accessibility/wpe/AccessibilityObjectWPE.cpp: Removed.
+
 2018-10-15  Alex Christensen  <achristensen@webkit.org>
 
         Modernize BackForwardClient.h
index 5e8502f..a61ba7e 100644 (file)
@@ -21,9 +21,6 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 // THE POSSIBILITY OF SUCH DAMAGE.
 
-accessibility/wpe/AXObjectCacheWPE.cpp
-accessibility/wpe/AccessibilityObjectWPE.cpp
-
 editing/wpe/EditorWPE.cpp
 
 loader/soup/ResourceLoaderSoup.cpp
index 312250a..dd5aba5 100644 (file)
 #include "MediaControlElements.h"
 #endif
 
+#if !(PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN))
+#include "NotImplemented.h"
+#endif
+
 #if COMPILER(MSVC)
 // See https://msdn.microsoft.com/en-us/library/1wea5zwe.aspx
 #pragma warning(disable: 4701)
@@ -3034,6 +3038,45 @@ AXTextChange AXObjectCache::textChangeForEditType(AXTextEditType type)
     return AXTextInserted;
 }
 #endif
+
+#if !(PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN))
+
+void AXObjectCache::detachWrapper(AccessibilityObject*, AccessibilityDetachmentType)
+{
+    notImplemented();
+}
+
+void AXObjectCache::attachWrapper(AccessibilityObject*)
+{
+    notImplemented();
+}
+
+void AXObjectCache::postPlatformNotification(AccessibilityObject*, AXNotification)
+{
+    notImplemented();
+}
+
+void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&)
+{
+    notImplemented();
+}
+
+void AXObjectCache::frameLoadingEventPlatformNotification(AccessibilityObject*, AXLoadingEvent)
+{
+    notImplemented();
+}
+
+void AXObjectCache::platformHandleFocusedUIElementChanged(Node*, Node*)
+{
+    notImplemented();
+}
+
+void AXObjectCache::handleScrolledToAnchor(const Node*)
+{
+    notImplemented();
+}
+
+#endif
     
 } // namespace WebCore
 
index 61be5d4..428f8cb 100644 (file)
 #include <wtf/text/WTFString.h>
 #include <wtf/unicode/CharacterNames.h>
 
+#if HAVE(ACCESSIBILITY) && !(PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN))
+#include "NotImplemented.h"
+#endif
+
 namespace WebCore {
 
 using namespace HTMLNames;
@@ -3625,4 +3629,20 @@ void AccessibilityObject::setIsIgnoredFromParentDataForChild(AccessibilityObject
     child->setIsIgnoredFromParentData(result);
 }
 
+#if HAVE(ACCESSIBILITY) && !(PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN))
+
+bool AccessibilityObject::accessibilityIgnoreAttachment() const
+{
+    notImplemented();
+    return false;
+}
+
+AccessibilityObjectInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
+{
+    notImplemented();
+    return AccessibilityObjectInclusion::DefaultBehavior;
+}
+
+#endif
+
 } // namespace WebCore
index 3933507..f9ae282 100644 (file)
@@ -67,10 +67,8 @@ typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
 #elif PLATFORM(GTK)
 typedef struct _AtkObject AtkObject;
 typedef struct _AtkObject AccessibilityObjectWrapper;
-#elif PLATFORM(WPE)
-class AccessibilityObjectWrapper : public RefCounted<AccessibilityObjectWrapper> { };
 #else
-class AccessibilityObjectWrapper;
+class AccessibilityObjectWrapper : public RefCounted<AccessibilityObjectWrapper> { };
 #endif
 
 namespace WebCore {
@@ -1197,7 +1195,7 @@ protected:
     COMPtr<AccessibilityObjectWrapper> m_wrapper;
 #elif PLATFORM(GTK)
     AtkObject* m_wrapper { nullptr };
-#elif PLATFORM(WPE)
+#else
     RefPtr<AccessibilityObjectWrapper> m_wrapper;
 #endif
 };
diff --git a/Source/WebCore/accessibility/wpe/AXObjectCacheWPE.cpp b/Source/WebCore/accessibility/wpe/AXObjectCacheWPE.cpp
deleted file mode 100644 (file)
index 1541594..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 Igalia, S.L.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "config.h"
-#include "AXObjectCache.h"
-
-#if HAVE(ACCESSIBILITY)
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-void AXObjectCache::detachWrapper(AccessibilityObject*, AccessibilityDetachmentType)
-{
-    notImplemented();
-}
-
-void AXObjectCache::attachWrapper(AccessibilityObject*)
-{
-    notImplemented();
-}
-
-void AXObjectCache::postPlatformNotification(AccessibilityObject*, AXNotification)
-{
-    notImplemented();
-}
-
-void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&)
-{
-    notImplemented();
-}
-
-void AXObjectCache::frameLoadingEventPlatformNotification(AccessibilityObject*, AXLoadingEvent)
-{
-    notImplemented();
-}
-
-void AXObjectCache::platformHandleFocusedUIElementChanged(Node*, Node*)
-{
-    notImplemented();
-}
-
-void AXObjectCache::handleScrolledToAnchor(const Node*)
-{
-    notImplemented();
-}
-
-} // namespace WebCore
-
-#endif // HAVE(ACCESSIBILITY)
diff --git a/Source/WebCore/accessibility/wpe/AccessibilityObjectWPE.cpp b/Source/WebCore/accessibility/wpe/AccessibilityObjectWPE.cpp
deleted file mode 100644 (file)
index 866a2ab..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 Igalia, S.L.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "config.h"
-#include "AXObjectCache.h"
-
-#if HAVE(ACCESSIBILITY)
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-bool AccessibilityObject::accessibilityIgnoreAttachment() const
-{
-    notImplemented();
-    return false;
-}
-
-AccessibilityObjectInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
-{
-    notImplemented();
-    return AccessibilityObjectInclusion::DefaultBehavior;
-}
-
-} // namespace WebCore
-
-#endif // HAVE(ACCESSIBILITY)