Title: [282448] trunk/Source/WebCore
- Revision
- 282448
- Author
- [email protected]
- Date
- 2021-09-15 05:20:25 -0700 (Wed, 15 Sep 2021)
Log Message
AX: Remove AXCoreObject::containsText
https://bugs.webkit.org/show_bug.cgi?id=230299
<rdar://problem/83134668>
Patch by Carlos Garcia Campos <[email protected]> on 2021-09-15
Reviewed by Adrian Perez de Castro.
It's only used by isAccessibilityTextSearchMatch() in AccessibilityObject.cpp. We can move the implementation
there and avoid to include TextIterator.h in AccessibilityObjectInterface.h.
* accessibility/AccessibilityObject.cpp:
(WebCore::Accessibility::isAccessibilityTextSearchMatch):
* accessibility/AccessibilityObjectInterface.h:
(WebCore::AXCoreObject::containsText const): Deleted.
* accessibility/isolatedtree/AXIsolatedTree.cpp:
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
* page/mac/ServicesOverlayController.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (282447 => 282448)
--- trunk/Source/WebCore/ChangeLog 2021-09-15 12:09:40 UTC (rev 282447)
+++ trunk/Source/WebCore/ChangeLog 2021-09-15 12:20:25 UTC (rev 282448)
@@ -1,3 +1,22 @@
+2021-09-15 Carlos Garcia Campos <[email protected]>
+
+ AX: Remove AXCoreObject::containsText
+ https://bugs.webkit.org/show_bug.cgi?id=230299
+ <rdar://problem/83134668>
+
+ Reviewed by Adrian Perez de Castro.
+
+ It's only used by isAccessibilityTextSearchMatch() in AccessibilityObject.cpp. We can move the implementation
+ there and avoid to include TextIterator.h in AccessibilityObjectInterface.h.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::Accessibility::isAccessibilityTextSearchMatch):
+ * accessibility/AccessibilityObjectInterface.h:
+ (WebCore::AXCoreObject::containsText const): Deleted.
+ * accessibility/isolatedtree/AXIsolatedTree.cpp:
+ * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+ * page/mac/ServicesOverlayController.mm:
+
2021-09-15 Martin Robinson <[email protected]>
offsetLeft on display:inline element in vertical-rl parent can return a negative number
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (282447 => 282448)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2021-09-15 12:09:40 UTC (rev 282447)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2021-09-15 12:20:25 UTC (rev 282448)
@@ -3782,7 +3782,14 @@
{
if (!axObject)
return false;
- return axObject->containsText(criteria.searchText);
+
+ // If text is empty we return true.
+ if (criteria.searchText.isEmpty())
+ return true;
+
+ return containsPlainText(axObject->title(), criteria.searchText, CaseInsensitive)
+ || containsPlainText(axObject->accessibilityDescription(), criteria.searchText, CaseInsensitive)
+ || containsPlainText(axObject->stringValue(), criteria.searchText, CaseInsensitive);
}
static bool objectMatchesSearchCriteriaWithResultLimit(AXCoreObject* object, AccessibilitySearchCriteria const& criteria, AXCoreObject::AccessibilityChildrenVector& results)
Modified: trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h (282447 => 282448)
--- trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h 2021-09-15 12:09:40 UTC (rev 282447)
+++ trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h 2021-09-15 12:20:25 UTC (rev 282448)
@@ -30,7 +30,8 @@
#include "FrameLoaderClient.h"
#include "HTMLTextFormControlElement.h"
#include "LayoutRect.h"
-#include "TextIterator.h"
+#include "SimpleRange.h"
+#include "TextIteratorBehavior.h"
#include "VisibleSelection.h"
#include "Widget.h"
#include <wtf/HashSet.h>
@@ -1126,14 +1127,6 @@
virtual String accessibilityDescription() const = 0;
virtual String title() const = 0;
virtual String helpText() const = 0;
- bool containsText(String const& text) const
- {
- // If text is empty we return true.
- return text.isEmpty()
- || containsPlainText(title(), text, CaseInsensitive)
- || containsPlainText(accessibilityDescription(), text, CaseInsensitive)
- || containsPlainText(stringValue(), text, CaseInsensitive);
- }
// Methods for determining accessibility text.
virtual bool isARIAStaticText() const = 0;
Modified: trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp (282447 => 282448)
--- trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp 2021-09-15 12:09:40 UTC (rev 282447)
+++ trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp 2021-09-15 12:20:25 UTC (rev 282448)
@@ -30,6 +30,7 @@
#include "AXIsolatedObject.h"
#include "AXLogger.h"
+#include "FrameView.h"
#include "Page.h"
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (282447 => 282448)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2021-09-15 12:09:40 UTC (rev 282447)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2021-09-15 12:20:25 UTC (rev 282448)
@@ -58,6 +58,7 @@
#import "RenderWidget.h"
#import "ScrollView.h"
#import "TextCheckerClient.h"
+#import "TextIterator.h"
#import "VisibleUnits.h"
#import <wtf/cocoa/VectorCocoa.h>
Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (282447 => 282448)
--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2021-09-15 12:09:40 UTC (rev 282447)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2021-09-15 12:20:25 UTC (rev 282448)
@@ -46,6 +46,7 @@
#import "Page.h"
#import "PageOverlayController.h"
#import "Settings.h"
+#import "TextIterator.h"
#import <QuartzCore/QuartzCore.h>
#import <pal/mac/DataDetectorsSoftLink.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
