Title: [260573] trunk/Source/WebCore
- Revision
- 260573
- Author
- [email protected]
- Date
- 2020-04-23 09:12:04 -0700 (Thu, 23 Apr 2020)
Log Message
Correction for patch 397001.
https://bugs.webkit.org/show_bug.cgi?id=210914
Reviewed by Chris Fleizach.
- No need to check for isEmpty when retrieving the primary screen size,
as pointed out by Darin Adler in bug 210760, patch 397001.
- Added some helpful AXLOGing.
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper primaryScreenHeight]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
(-[WebAccessibilityObjectWrapper accessibilityArrayAttributeValues:index:maxCount:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (260572 => 260573)
--- trunk/Source/WebCore/ChangeLog 2020-04-23 15:49:47 UTC (rev 260572)
+++ trunk/Source/WebCore/ChangeLog 2020-04-23 16:12:04 UTC (rev 260573)
@@ -1,3 +1,20 @@
+2020-04-23 Andres Gonzalez <[email protected]>
+
+ Correction for patch 397001.
+ https://bugs.webkit.org/show_bug.cgi?id=210914
+
+ Reviewed by Chris Fleizach.
+
+ - No need to check for isEmpty when retrieving the primary screen size,
+ as pointed out by Darin Adler in bug 210760, patch 397001.
+ - Added some helpful AXLOGing.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper primaryScreenHeight]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
+ (-[WebAccessibilityObjectWrapper accessibilityArrayAttributeValues:index:maxCount:]):
+
2020-04-23 Don Olmstead <[email protected]>
[CMake] Add WebKit::WebCoreTestSupport target
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (260572 => 260573)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2020-04-23 15:49:47 UTC (rev 260572)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2020-04-23 16:12:04 UTC (rev 260573)
@@ -31,6 +31,7 @@
#if ENABLE(ACCESSIBILITY) && PLATFORM(MAC)
+#import "AXLogger.h"
#import "AXObjectCache.h"
#import "AccessibilityARIAGridRow.h"
#import "AccessibilityLabel.h"
@@ -1944,12 +1945,9 @@
{
// The rect for primary screen should not change in normal use. So cache it
// here to avoid hitting the main thread repeatedly.
- static FloatRect screenRect;
- if (screenRect.isEmpty()) {
- screenRect = Accessibility::retrieveValueFromMainThread<FloatRect>([] () -> FloatRect {
- return screenRectForPrimaryScreen();
- });
- }
+ static FloatRect screenRect = Accessibility::retrieveValueFromMainThread<FloatRect>([] () -> FloatRect {
+ return screenRectForPrimaryScreen();
+ });
return [NSNumber numberWithFloat:screenRect.height()];
}
@@ -2288,12 +2286,18 @@
- (id)accessibilityAttributeValue:(NSString*)attributeName
ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
+ AXTRACE(String("WebAccessibilityObjectWrapper accessibilityAttributeValue:") + String(attributeName));
auto* backingObject = self.updateObjectBackingStore;
- if (!backingObject)
+ if (!backingObject) {
+ AXLOG("No backingObject!!!");
return nil;
+ }
+ AXLOG(*backingObject);
- if (backingObject->isDetachedFromParent())
+ if (backingObject->isDetachedFromParent()) {
+ AXLOG("backingObject is detached from parent!!!");
return nil;
+ }
if ([attributeName isEqualToString: NSAccessibilityRoleAttribute])
return [self role];
@@ -3865,6 +3869,7 @@
- (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)parameter
ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
+ AXTRACE(String("WebAccessibilityObjectWrapper accessibilityAttributeValue:") + String(attribute));
auto* backingObject = self.updateObjectBackingStore;
if (!backingObject)
return nil;
@@ -4469,6 +4474,7 @@
- (NSArray *)accessibilityArrayAttributeValues:(NSString *)attribute index:(NSUInteger)index maxCount:(NSUInteger)maxCount
{
+ AXTRACE(String("WebAccessibilityObjectWrapper accessibilityArrayAttributeValue:") + String(attribute));
auto* backingObject = self.updateObjectBackingStore;
if (!backingObject)
return nil;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
