Attachment 340662 Details for Bug 185742 – patch

[patch] patch

patch.txt (text/plain), 12.46 KB, created by Nan Wang on 2018-05-17 15:37:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nan Wang

Created: 2018-05-17 15:37:58 PDT

Size: 12.46 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 231816)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,24 @@
>+2018-05-17  Nan Wang  <n_wang@apple.com>
>+
>+        AX: [macOS] Expose the primary screen height through AX API
>+        https://bugs.webkit.org/show_bug.cgi?id=185742
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added a new attribute to expose the primary screen size on both 
>+        WebAccessibilityObjectWrapper and WKAccessibilityWebPageObject.
>+
>+        Test: accessibility/mac/primary-screen-height.html
>+
>+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
>+        (+[WebAccessibilityObjectWrapper accessibilityPrimaryScreenHeightAttributeName]):
>+        (-[WebAccessibilityObjectWrapper accessibilityAttributeNames]):
>+        (-[WebAccessibilityObjectWrapper primaryScreenHeight]):
>+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
>+        * platform/PlatformScreen.h:
>+        * platform/mac/PlatformScreenMac.mm:
>+        (WebCore::screenRectForPrimaryScreen):
>+
> 2018-05-15  Charles Vazac  <cvazac@gmail.com>
> 
>         Add the PerformanceServerTiming Interface which makes Server-Timing header timing values available to JavaScript running in the browser.
>Index: Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
>===================================================================
>--- Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm	(revision 231816)
>+++ Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm	(working copy)
>@@ -368,6 +368,10 @@ using namespace HTMLNames;
> #define NSAccessibilitySelectTextWithCriteriaParameterizedAttribute @"AXSelectTextWithCriteria"
> #endif
> 
>+#ifndef NSAccessibilityPrimaryScreenHeightAttribute
>+#define NSAccessibilityPrimaryScreenHeightAttribute @"_AXPrimaryScreenHeight"
>+#endif
>+
> // Math attributes
> #define NSAccessibilityMathRootRadicandAttribute @"AXMathRootRadicand"
> #define NSAccessibilityMathRootIndexAttribute @"AXMathRootIndex"
>@@ -1248,6 +1252,11 @@ - (NSArray*)additionalAccessibilityAttri
>     return additional;
> }
> 
>++ (NSString *)accessibilityPrimaryScreenHeightAttributeName
>+{
>+    return NSAccessibilityPrimaryScreenHeightAttribute;
>+}
>+
> - (NSArray*)accessibilityAttributeNames
> {
>     if (![self updateObjectBackingStore])
>@@ -1656,6 +1665,9 @@ - (NSArray*)accessibilityAttributeNames
>     if (m_object->currentState() != AccessibilityCurrentState::False)
>         objectAttributes = [objectAttributes arrayByAddingObjectsFromArray:@[ NSAccessibilityARIACurrentAttribute ]];
>     
>+    // AppKit needs to know the screen height in order to do the coordinate conversion.
>+    objectAttributes = [objectAttributes arrayByAddingObjectsFromArray:@[ NSAccessibilityPrimaryScreenHeightAttribute ]];
>+    
>     return objectAttributes;
> }
> 
>@@ -1819,6 +1831,12 @@ - (NSBezierPath *)path
>     return [self bezierPathFromPath:transformedPath];
> }
> 
>+- (NSNumber *)primaryScreenHeight
>+{
>+    FloatRect screenRect = screenRectForPrimaryScreen();
>+    return [NSNumber numberWithFloat:screenRect.height()];
>+}
>+
> - (NSValue *)position
> {
>     IntRect rect = snappedIntRect(m_object->elementRect());
>@@ -2700,6 +2718,8 @@ - (id)accessibilityAttributeValue:(NSStr
>         return [NSValue valueWithSize: NSMakeSize(s.width(), s.height())];
>     }
>     
>+    if ([attributeName isEqualToString: NSAccessibilityPrimaryScreenHeightAttribute])
>+        return [self primaryScreenHeight];
>     if ([attributeName isEqualToString: NSAccessibilityPositionAttribute])
>         return [self position];
>     if ([attributeName isEqualToString:NSAccessibilityPathAttribute])
>Index: Source/WebCore/platform/PlatformScreen.h
>===================================================================
>--- Source/WebCore/platform/PlatformScreen.h	(revision 231816)
>+++ Source/WebCore/platform/PlatformScreen.h	(working copy)
>@@ -85,6 +85,7 @@ NSScreen *screen(NSWindow *);
> NSScreen *screen(PlatformDisplayID);
> 
> FloatRect screenRectForDisplay(PlatformDisplayID);
>+WEBCORE_EXPORT FloatRect screenRectForPrimaryScreen();
> 
> WEBCORE_EXPORT FloatRect toUserSpace(const NSRect&, NSWindow *destination);
> FloatRect toUserSpaceForPrimaryScreen(const NSRect&);
>Index: Source/WebCore/platform/mac/PlatformScreenMac.mm
>===================================================================
>--- Source/WebCore/platform/mac/PlatformScreenMac.mm	(revision 231816)
>+++ Source/WebCore/platform/mac/PlatformScreenMac.mm	(working copy)
>@@ -221,6 +221,11 @@ FloatRect screenRectForDisplay(PlatformD
>     return screen(displayID).frame;
> }
> 
>+FloatRect screenRectForPrimaryScreen()
>+{
>+    return screenRectForDisplay(primaryScreenDisplayID());
>+}
>+
> FloatRect screenRect(Widget* widget)
> {
>     if (!screenProperties().isEmpty())
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 231918)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2018-05-17  Nan Wang  <n_wang@apple.com>
>+
>+        AX: [macOS] Expose the primary screen height through AX API
>+        https://bugs.webkit.org/show_bug.cgi?id=185742
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
>+        (webAccessibilityObjectWrapperClass):
>+        (-[WKAccessibilityWebPageObject accessibilityAttributeNames]):
>+        (-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):
>+
> 2018-05-17  Carlos Alberto Lopez Perez  <clopez@igalia.com>
> 
>         [WPE] Implement and enable FULLSCREEN_API
>Index: Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm	(revision 231816)
>+++ Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm	(working copy)
>@@ -47,6 +47,10 @@
> #import <pal/spi/mac/NSAccessibilitySPI.h>
> #import <wtf/ObjcRuntimeExtras.h>
> 
>+@interface NSObject (WebAccessibilityObjectWrapperAdditions)
>++ (NSString *)accessibilityPrimaryScreenHeightAttributeName;
>+@end
>+
> using namespace WebCore;
> using namespace WebKit;
> 
>@@ -64,13 +68,20 @@ - (BOOL)accessibilityIsIgnored
>     return NO;
> }
> 
>+static Class webAccessibilityObjectWrapperClass()
>+{
>+    static Class cls = objc_getClass("WebAccessibilityObjectWrapper");
>+    ASSERT(cls);
>+    return cls;
>+}
>+
> - (NSArray *)accessibilityAttributeNames
> {
>     if (!m_attributeNames)
>         m_attributeNames = adoptNS([[NSArray alloc] initWithObjects:
>                             NSAccessibilityRoleAttribute, NSAccessibilityRoleDescriptionAttribute, NSAccessibilityFocusedAttribute,
>                             NSAccessibilityParentAttribute, NSAccessibilityWindowAttribute, NSAccessibilityTopLevelUIElementAttribute,
>-                            NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, nil]);
>+                            NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, [webAccessibilityObjectWrapperClass() accessibilityPrimaryScreenHeightAttributeName], nil]);
>     
>     return m_attributeNames.get();
> }
>@@ -147,6 +158,9 @@ - (id)accessibilityAttributeValue:(NSStr
>         return [NSValue valueWithPoint:NSMakePoint(point.x(), point.y())];
>     }
>     
>+    if ([attribute isEqualToString:[webAccessibilityObjectWrapperClass() accessibilityPrimaryScreenHeightAttributeName]])
>+        return [[self accessibilityRootObjectWrapper] accessibilityAttributeValue:attribute];
>+    
>     if ([attribute isEqualToString:NSAccessibilitySizeAttribute]) {
>         const IntSize& s = m_page->size();
>         return [NSValue valueWithSize:NSMakeSize(s.width(), s.height())];
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 231927)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2018-05-17  Nan Wang  <n_wang@apple.com>
>+
>+        AX: [macOS] Expose the primary screen height through AX API
>+        https://bugs.webkit.org/show_bug.cgi?id=185742
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
>+        (attributesOfElement):
>+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
>+        (WTR::attributesOfElement):
>+
> 2018-05-17  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r231912.
>Index: Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
>===================================================================
>--- Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm	(revision 231816)
>+++ Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm	(working copy)
>@@ -158,6 +158,10 @@ static NSString* attributesOfElement(id 
>         if ([attribute isEqualToString:@"AXPosition"])
>             continue;
>         
>+        // Skip screen-specific information.
>+        if ([attribute isEqualToString:@"_AXPrimaryScreenHeight"])
>+            continue;
>+        
>         // accessibilityAttributeValue: can throw an if an attribute is not returned.
>         // For DumpRenderTree's purpose, we should ignore those exceptions
>         BEGIN_AX_OBJC_EXCEPTIONS
>Index: Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
>===================================================================
>--- Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm	(revision 231816)
>+++ Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm	(working copy)
>@@ -172,6 +172,10 @@ static NSString* attributesOfElement(id 
>         if ([attribute isEqualToString:@"AXPosition"])
>             continue;
>         
>+        // Skip screen-specific information.
>+        if ([attribute isEqualToString:@"_AXPrimaryScreenHeight"])
>+            continue;
>+        
>         // accessibilityAttributeValue: can throw an if an attribute is not returned.
>         // For DumpRenderTree's purpose, we should ignore those exceptions
>         BEGIN_AX_OBJC_EXCEPTIONS
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 231816)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-05-17  Nan Wang  <n_wang@apple.com>
>+
>+        AX: [macOS] Expose the primary screen height through AX API
>+        https://bugs.webkit.org/show_bug.cgi?id=185742
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * accessibility/mac/primary-screen-height-expected.txt: Added.
>+        * accessibility/mac/primary-screen-height.html: Added.
>+
> 2018-05-15  Charles Vazac  <cvazac@gmail.com>
> 
>         Add the PerformanceServerTiming Interface which makes Server-Timing header timing values available to JavaScript running in the browser.
>Index: LayoutTests/accessibility/mac/primary-screen-height-expected.txt
>===================================================================
>--- LayoutTests/accessibility/mac/primary-screen-height-expected.txt	(nonexistent)
>+++ LayoutTests/accessibility/mac/primary-screen-height-expected.txt	(working copy)
>@@ -0,0 +1,12 @@
>+Click
>+This tests the primary screen height is exposed to AX API from web process.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS screenHeightFromRootElement > 0 is true
>+PASS screenHeightFromWebArea > 0 is true
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>Index: LayoutTests/accessibility/mac/primary-screen-height.html
>===================================================================
>--- LayoutTests/accessibility/mac/primary-screen-height.html	(nonexistent)
>+++ LayoutTests/accessibility/mac/primary-screen-height.html	(working copy)
>@@ -0,0 +1,29 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+
>+<button id="button1">Click</button>
>+
>+<p id="description"></p>
>+<div id="console"></div>
>+
>+<script>
>+    description("This tests the primary screen height is exposed to AX API from web process.");
>+    if (window.accessibilityController) {
>+    	var rootElement = accessibilityController.rootElement;
>+        var webArea = accessibilityController.rootElement.childAtIndex(0);
>+
>+        var screenHeightFromRootElement = rootElement.numberAttributeValue("_AXPrimaryScreenHeight");
>+        shouldBeTrue("screenHeightFromRootElement > 0");
>+
>+        var screenHeightFromWebArea = webArea.numberAttributeValue("_AXPrimaryScreenHeight");
>+        shouldBeTrue("screenHeightFromWebArea > 0");
>+    }
>+
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 185742: 340632 | 340652 | 340662 | 340667