@devicelab/maestro-runner-darwin-arm64 1.1.29 → 1.1.30

package/drivers/ios/WebDriverAgent/WebDriverAgentLib/Utilities/FBXPath.m

@@ -175,154 +175,175 @@ static NSString *const topNodeIndexPath = @"top";
 + (nullable NSString *)xmlStringWithRootElement:(id<FBElement>)root
                                         options:(nullable FBXMLGenerationOptions *)options
 {
-  xmlDocPtr doc;
-  xmlTextWriterPtr writer = xmlNewTextWriterDoc(&doc, 0);
-  int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
-  if (rc < 0) {
-    [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
-  } else {
-    BOOL hasScope = nil != options.scope && [options.scope length] > 0;
-    if (hasScope) {
-      rc = xmlTextWriterStartElement(writer,
-                                     (xmlChar *)[[self safeXmlStringWithString:options.scope] UTF8String]);
-      if (rc < 0) {
-        [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartElement for the tag value '%@'. Error code: %d", options.scope, rc];
-      }
+  xmlBufferPtr buffer = NULL;
+  xmlTextWriterPtr writer = NULL;
+  @try {
+    buffer = xmlBufferCreate();
+    if (NULL == buffer) {
+      [FBLogger log:@"Failed to invoke libxml2>xmlBufferCreate"];
+      return nil;
     }
-
-    if (rc >= 0) {
-      [self waitUntilStableWithElement:root];
-      // If 'includeHittableInPageSource' setting is enabled, then use native snapshots
-      // to calculate a more accurate value for the 'hittable' attribute.
-      rc = [self xmlRepresentationWithRootElement:[self snapshotWithRoot:root
-                                                        useNative:FBConfiguration.sharedInstance.includeHittableInPageSource]
-                                           writer:writer
-                                     elementStore:nil
-                                            query:nil
-                              excludingAttributes:options.excludedAttributes];
+    writer = xmlNewTextWriterMemory(buffer, 0);
+    if (NULL == writer) {
+      [FBLogger log:@"Failed to invoke libxml2>xmlNewTextWriterMemory"];
+      return nil;
     }
+    xmlTextWriterSetIndent(writer, 1);
+    xmlTextWriterSetIndentString(writer, BAD_CAST "  ");
+    int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
+    if (rc < 0) {
+      [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
+    } else {
+      BOOL hasScope = nil != options.scope && [options.scope length] > 0;
+      if (hasScope) {
+        rc = xmlTextWriterStartElement(writer,
+                                       (xmlChar *)[[self safeXmlStringWithString:options.scope] UTF8String]);
+        if (rc < 0) {
+          [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartElement for the tag value '%@'. Error code: %d", options.scope, rc];
+        }
+      }
 
-    if (rc >= 0 && hasScope) {
-      rc = xmlTextWriterEndElement(writer);
-      if (rc < 0) {
-        [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterEndElement. Error code: %d", rc];
+      if (rc >= 0) {
+        [self waitUntilStableWithElement:root];
+        // If 'includeHittableInPageSource' setting is enabled, then use native snapshots
+        // to calculate a more accurate value for the 'hittable' attribute.
+        rc = [self xmlRepresentationWithRootElement:[self snapshotWithRoot:root
+                                                          useNative:FBConfiguration.sharedInstance.includeHittableInPageSource]
+                                             writer:writer
+                                       elementStore:nil
+                                              query:nil
+                                excludingAttributes:options.excludedAttributes];
       }
-    }
 
-    if (rc >= 0) {
-      rc = xmlTextWriterEndDocument(writer);
-      if (rc < 0) {
-        [FBLogger logFmt:@"Failed to invoke libxml2>xmlXPathNewContext. Error code: %d", rc];
+      if (rc >= 0 && hasScope) {
+        rc = xmlTextWriterEndElement(writer);
+        if (rc < 0) {
+          [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterEndElement. Error code: %d", rc];
+        }
+      }
+
+      if (rc >= 0) {
+        rc = xmlTextWriterEndDocument(writer);
+        if (rc < 0) {
+          [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterEndDocument. Error code: %d", rc];
+        }
       }
     }
+    if (rc < 0) {
+      return nil;
+    }
+    return [[NSString alloc] initWithBytes:xmlBufferContent(buffer)
+                                  length:(NSUInteger)xmlBufferLength(buffer)
+                                encoding:NSUTF8StringEncoding];
+  } @finally {
+    if (NULL != writer) {
+      xmlFreeTextWriter(writer);
+    }
+    if (NULL != buffer) {
+      xmlBufferFree(buffer);
+    }
   }
-  if (rc < 0) {
-    xmlFreeTextWriter(writer);
-    xmlFreeDoc(doc);
-    return nil;
-  }
-  int buffersize;
-  xmlChar *xmlbuff;
-  xmlDocDumpFormatMemory(doc, &xmlbuff, &buffersize, 1);
-  xmlFreeTextWriter(writer);
-  xmlFreeDoc(doc);
-  NSString *result = [NSString stringWithCString:(const char *)xmlbuff encoding:NSUTF8StringEncoding];
-  xmlFree(xmlbuff);
-  return result;
 }
 
 + (NSArray<id<FBXCElementSnapshot>> *)matchesWithRootElement:(id<FBElement>)root
                                                     forQuery:(NSString *)xpathQuery
 {
-  xmlDocPtr doc;
-
-  xmlTextWriterPtr writer = xmlNewTextWriterDoc(&doc, 0);
-  if (NULL == writer) {
-    [FBLogger logFmt:@"Failed to invoke libxml2>xmlNewTextWriterDoc for XPath query \"%@\"", xpathQuery];
-    return [self throwException:FBXPathQueryEvaluationException forQuery:xpathQuery];
-  }
-  NSMutableDictionary *elementStore = [NSMutableDictionary dictionary];
-  int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
-  id<FBXCElementSnapshot> lookupScopeSnapshot = nil;
-  id<FBXCElementSnapshot> contextRootSnapshot = nil;
-  BOOL useNativeSnapshot = nil == xpathQuery
-    ? NO
-    : [[self.class elementAttributesWithXPathQuery:xpathQuery] containsObject:FBHittableAttribute.class];
-  if (rc < 0) {
-    [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
-  } else {
-    [self waitUntilStableWithElement:root];
-    if (FBConfiguration.sharedInstance.limitXpathContextScope) {
-      lookupScopeSnapshot = [self snapshotWithRoot:root useNative:useNativeSnapshot];
+  xmlDocPtr doc = NULL;
+  xmlTextWriterPtr writer = NULL;
+  xmlXPathObjectPtr contextNodeQueryResult = NULL;
+  xmlXPathObjectPtr queryResult = NULL;
+  @try {
+    writer = xmlNewTextWriterDoc(&doc, 0);
+    if (NULL == writer) {
+      [FBLogger logFmt:@"Failed to invoke libxml2>xmlNewTextWriterDoc for XPath query \"%@\"", xpathQuery];
+      return [self throwException:FBXPathQueryEvaluationException forQuery:xpathQuery];
+    }
+    NSMutableDictionary *elementStore = [NSMutableDictionary dictionary];
+    int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
+    id<FBXCElementSnapshot> lookupScopeSnapshot = nil;
+    id<FBXCElementSnapshot> contextRootSnapshot = nil;
+    BOOL useNativeSnapshot = nil == xpathQuery
+      ? NO
+      : [[self.class elementAttributesWithXPathQuery:xpathQuery] containsObject:FBHittableAttribute.class];
+    if (rc < 0) {
+      [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
     } else {
-      if ([root isKindOfClass:XCUIElement.class]) {
-        lookupScopeSnapshot = [self snapshotWithRoot:[(XCUIElement *)root application]
-                                           useNative:useNativeSnapshot];
-        // root.lastSnapshot may be stale leftover from an unrelated earlier command.
-        contextRootSnapshot = [root isKindOfClass:XCUIApplication.class]
-          ? nil
-          : ([(XCUIElement *)root fb_cachedSnapshot] ?: [self snapshotWithRoot:(XCUIElement *)root
-                                                                     useNative:useNativeSnapshot]);
+      [self waitUntilStableWithElement:root];
+      if (FBConfiguration.sharedInstance.limitXpathContextScope) {
+        lookupScopeSnapshot = [self snapshotWithRoot:root useNative:useNativeSnapshot];
       } else {
-        lookupScopeSnapshot = (id<FBXCElementSnapshot>)root;
-        contextRootSnapshot = nil == lookupScopeSnapshot.parent ? nil : (id<FBXCElementSnapshot>)root;
-        while (nil != lookupScopeSnapshot.parent) {
-          lookupScopeSnapshot = lookupScopeSnapshot.parent;
+        if ([root isKindOfClass:XCUIElement.class]) {
+          lookupScopeSnapshot = [self snapshotWithRoot:[(XCUIElement *)root application]
+                                             useNative:useNativeSnapshot];
+          // root.lastSnapshot may be stale leftover from an unrelated earlier command.
+          contextRootSnapshot = [root isKindOfClass:XCUIApplication.class]
+            ? nil
+            : ([(XCUIElement *)root fb_cachedSnapshot] ?: [self snapshotWithRoot:(XCUIElement *)root
+                                                                       useNative:useNativeSnapshot]);
+        } else {
+          lookupScopeSnapshot = (id<FBXCElementSnapshot>)root;
+          contextRootSnapshot = nil == lookupScopeSnapshot.parent ? nil : (id<FBXCElementSnapshot>)root;
+          while (nil != lookupScopeSnapshot.parent) {
+            lookupScopeSnapshot = lookupScopeSnapshot.parent;
+          }
         }
       }
-    }
 
-    rc = [self xmlRepresentationWithRootElement:lookupScopeSnapshot
-                                         writer:writer
-                                   elementStore:elementStore
-                                          query:xpathQuery
-                            excludingAttributes:nil];
-    if (rc >= 0) {
-      rc = xmlTextWriterEndDocument(writer);
-      if (rc < 0) {
-        [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterEndDocument. Error code: %d", rc];
+      rc = [self xmlRepresentationWithRootElement:lookupScopeSnapshot
+                                           writer:writer
+                                     elementStore:elementStore
+                                            query:xpathQuery
+                              excludingAttributes:nil];
+      if (rc >= 0) {
+        rc = xmlTextWriterEndDocument(writer);
+        if (rc < 0) {
+          [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterEndDocument. Error code: %d", rc];
+        }
       }
     }
-  }
-  if (rc < 0) {
-    xmlFreeTextWriter(writer);
-    xmlFreeDoc(doc);
-    return [self throwException:FBXPathQueryEvaluationException forQuery:xpathQuery];
-  }
+    if (rc < 0) {
+      return [self throwException:FBXPathQueryEvaluationException forQuery:xpathQuery];
+    }
 
-  xmlXPathObjectPtr contextNodeQueryResult = [self matchNodeInDocument:doc
-                                                          elementStore:elementStore.copy
-                                                           forSnapshot:contextRootSnapshot];
-  xmlNodePtr contextNode = NULL;
-  if (NULL != contextNodeQueryResult) {
-    xmlNodeSetPtr nodeSet = contextNodeQueryResult->nodesetval;
-    if (!xmlXPathNodeSetIsEmpty(nodeSet)) {
-      contextNode = nodeSet->nodeTab[0];
+    contextNodeQueryResult = [self matchNodeInDocument:doc
+                                                            elementStore:elementStore.copy
+                                                             forSnapshot:contextRootSnapshot];
+    xmlNodePtr contextNode = NULL;
+    if (NULL != contextNodeQueryResult) {
+      xmlNodeSetPtr nodeSet = contextNodeQueryResult->nodesetval;
+      if (!xmlXPathNodeSetIsEmpty(nodeSet)) {
+        contextNode = nodeSet->nodeTab[0];
+      }
+    }
+    NSString *evaluationError = nil;
+    queryResult = [self evaluate:xpathQuery
+                                          document:doc
+                                       contextNode:contextNode
+                                      errorMessage:&evaluationError];
+    if (NULL == queryResult) {
+      return [self throwException:FBInvalidXPathException forQuery:xpathQuery detail:evaluationError];
     }
-  }
-  NSString *evaluationError = nil;
-  xmlXPathObjectPtr queryResult = [self evaluate:xpathQuery
-                                        document:doc
-                                     contextNode:contextNode
-                                    errorMessage:&evaluationError];
-  if (NULL != contextNodeQueryResult) {
-    xmlXPathFreeObject(contextNodeQueryResult);
-  }
-  if (NULL == queryResult) {
-    xmlFreeTextWriter(writer);
-    xmlFreeDoc(doc);
-    return [self throwException:FBInvalidXPathException forQuery:xpathQuery detail:evaluationError];
-  }
 
-  NSArray *matchingSnapshots = [self collectMatchingSnapshots:queryResult->nodesetval
-                                                 elementStore:elementStore];
-  xmlXPathFreeObject(queryResult);
-  xmlFreeTextWriter(writer);
-  xmlFreeDoc(doc);
-  if (nil == matchingSnapshots) {
-    return [self throwException:FBXPathQueryEvaluationException forQuery:xpathQuery];
+    NSArray *matchingSnapshots = [self collectMatchingSnapshots:queryResult->nodesetval
+                                                   elementStore:elementStore];
+    if (nil == matchingSnapshots) {
+      return [self throwException:FBXPathQueryEvaluationException forQuery:xpathQuery];
+    }
+    return matchingSnapshots;
+  } @finally {
+    if (NULL != queryResult) {
+      xmlXPathFreeObject(queryResult);
+    }
+    if (NULL != contextNodeQueryResult) {
+      xmlXPathFreeObject(contextNodeQueryResult);
+    }
+    if (NULL != writer) {
+      xmlFreeTextWriter(writer);
+    }
+    if (NULL != doc) {
+      xmlFreeDoc(doc);
+    }
   }
-  return matchingSnapshots;
 }
 
 + (NSArray *)collectMatchingSnapshots:(xmlNodeSetPtr)nodeSet
@@ -504,6 +525,18 @@ static NSString *const topNodeIndexPath = @"top";
                      indexPath:(nullable NSString *)indexPath
             includedAttributes:(nullable NSSet<Class> *)includedAttributes
 {
+  return [self recordElementAttributes:writer forElement:element indexPath:indexPath
+                   includedAttributes:includedAttributes siblingIndex:nil];
+}
+
++ (int)recordElementAttributes:(xmlTextWriterPtr)writer
+                    forElement:(id<FBXCElementSnapshot>)element
+                     indexPath:(nullable NSString *)indexPath
+            includedAttributes:(nullable NSSet<Class> *)includedAttributes
+                  siblingIndex:(nullable NSNumber *)siblingIndex
+{
+  FBXCElementSnapshotWrapper *wrapped = [FBXCElementSnapshotWrapper ensureWrapped:element];
+  NSDictionary *rect = nil;
   for (Class attributeCls in FBElementAttribute.supportedAttributes) {
     // include all supported attributes by default unless enumerated explicitly
     if (includedAttributes && ![includedAttributes containsObject:attributeCls]) {
@@ -519,8 +552,15 @@ static NSString *const topNodeIndexPath = @"top";
         !FBDoesElementSupportMinMaxValue(element.elementType)) {
       continue;
     }
-    int rc = [attributeCls recordWithWriter:writer
-                                 forElement:[FBXCElementSnapshotWrapper ensureWrapped:element]];
+    int rc;
+    if (attributeCls == FBIndexAttribute.class && nil != siblingIndex) {
+      rc = [attributeCls recordWithWriter:writer forValue:siblingIndex.stringValue];
+    } else if ([attributeCls isSubclassOfClass:FBDimensionAttribute.class]) {
+      rect = rect ?: wrapped.wdRect;
+      rc = [attributeCls recordWithWriter:writer forValue:[rect[[attributeCls name]] description]];
+    } else {
+      rc = [attributeCls recordWithWriter:writer forElement:wrapped];
+    }
     if (rc < 0) {
       return rc;
     }
@@ -559,6 +599,17 @@ static NSString *const topNodeIndexPath = @"top";
                   elementStore:(nullable NSMutableDictionary *)elementStore
             includedAttributes:(nullable NSSet<Class> *)includedAttributes
                         writer:(xmlTextWriterPtr)writer
+{
+  return [self writeXmlWithRootElement:root indexPath:indexPath elementStore:elementStore
+                   includedAttributes:includedAttributes writer:writer siblingIndex:nil];
+}
+
++ (int)writeXmlWithRootElement:(id<FBXCElementSnapshot>)root
+                     indexPath:(nullable NSString *)indexPath
+                  elementStore:(nullable NSMutableDictionary *)elementStore
+            includedAttributes:(nullable NSSet<Class> *)includedAttributes
+                        writer:(xmlTextWriterPtr)writer
+                  siblingIndex:(nullable NSNumber *)siblingIndex
 {
   NSAssert((indexPath == nil && elementStore == nil) || (indexPath != nil && elementStore != nil), @"Either both or none of indexPath and elementStore arguments should be equal to nil", nil);
 
@@ -578,7 +629,8 @@ static NSString *const topNodeIndexPath = @"top";
   rc = [self recordElementAttributes:writer
                           forElement:root
                            indexPath:indexPath
-                  includedAttributes:includedAttributes];
+                  includedAttributes:includedAttributes
+                        siblingIndex:siblingIndex];
   if (rc < 0) {
     return rc;
   }
@@ -594,7 +646,8 @@ static NSString *const topNodeIndexPath = @"top";
                                indexPath:newIndexPath
                             elementStore:elementStore
                       includedAttributes:includedAttributes
-                                  writer:writer];
+                                  writer:writer
+                            siblingIndex:@(i)];
       if (rc < 0) {
         return rc;
       }

package/drivers/ios/WebDriverAgent/WebDriverAgentLib/Utilities/LRUCache/LRUCache.m

@@ -80,7 +80,7 @@
   }
   LRUCacheNode *nextNode = node.next;
   if (nil != nextNode) {
-    nextNode.prev = node.prev;
+    nextNode.prev = previousNode;
   }
   if (node == self.tailNode) {
     self.tailNode = previousNode;
@@ -94,19 +94,22 @@
     return;
   }
 
+  LRUCacheNode *previousNode = node.prev;
   if (nil != node.next) {
-    node.next.prev = node.prev;
+    node.next.prev = previousNode;
   }
   if (node == self.headNode) {
     self.headNode = node.next;
   }
-  if (nil != node.prev) {
-    node.prev.next = node.next;
+  if (nil != previousNode) {
+    previousNode.next = node.next;
   }
   if (node == self.tailNode) {
-    self.tailNode = node.prev;
+    self.tailNode = previousNode;
   }
   [self.store removeObjectForKey:(id)node.key];
+  node.next = nil;
+  node.prev = nil;
 }
 
 - (nullable LRUCacheNode *)addNodeToHead:(nullable LRUCacheNode *)node

package/drivers/ios/WebDriverAgent/WebDriverAgentLib/Utilities/LRUCache/LRUCacheNode.h

@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*! Pointer to the next node */
 @property (nonatomic, nullable) LRUCacheNode *next;
 /*! Pointer to the previous node */
-@property (nonatomic, nullable) LRUCacheNode *prev;
+@property (nonatomic, weak, nullable) LRUCacheNode *prev;
 
 /**
  Factory method to create a new cache node with the given value and key

package/drivers/ios/WebDriverAgent/WebDriverAgentLib/WebDriverAgentLib.h

@@ -47,6 +47,7 @@ FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];
 #import <WebDriverAgentLib/XCTIssue+FBPatcher.h>
 #import <WebDriverAgentLib/XCUIApplication+FBHelpers.h>
 #import <WebDriverAgentLib/XCUIDevice+FBHelpers.h>
+#import <WebDriverAgentLib/XCUIDevice+FBHinge.h>
 #import <WebDriverAgentLib/XCUIDevice+FBRotation.h>
 #import <WebDriverAgentLib/XCUIDevice+FBVoiceOver.h>
 #import <WebDriverAgentLib/XCUIElement.h>

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp/COORDINATE_PROBE.md

@@ -21,7 +21,9 @@ shows 80 numbered rows, each 44 points high.
 
 The `probe-status` label exposes `start`, `last`, `phase`, and `count` after a
 touch. `start` and `last` are **canvas-local app points**. It also exposes
-`canvasBounds`, `canvasWindowRect`, `windowSize`, `screenSize`, and `scrollY`.
+`canvasBounds`, `canvasWindowRect`, `windowSize`, `screenSize`, `scrollY`, and
+`fullyVisibleRows` (row indices whose full rectangles lie inside the table bounds).
+`rotationInProgress` stays true until the fixture's rotation transition completes.
 Geometry is refreshed when the view lays out, including after rotation or window
 resizing. Touch-related fields are absent before the first touch.
 

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp/Classes/FBCoordinateProbeViewController.m

@@ -106,6 +106,17 @@
   [self.view addSubview:self.table];
 }
 
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
+{
+  [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+  self.measurement[@"rotationInProgress"] = @YES;
+  [self publishMeasurement];
+  [coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+    self.measurement[@"rotationInProgress"] = @NO;
+    [self publishMeasurement];
+  }];
+}
+
 - (void)viewDidLayoutSubviews
 {
   [super viewDidLayoutSubviews];
@@ -139,6 +150,13 @@
   self.measurement[@"windowSize"] = @[@(window.bounds.size.width), @(window.bounds.size.height)];
   self.measurement[@"screenSize"] = @[@(window.screen.bounds.size.width), @(window.screen.bounds.size.height)];
   self.measurement[@"scrollY"] = @(self.table.contentOffset.y);
+  NSMutableArray<NSNumber *> *fullyVisibleRows = [NSMutableArray new];
+  for (NSIndexPath *indexPath in self.table.indexPathsForVisibleRows) {
+    if (CGRectContainsRect(self.table.bounds, [self.table rectForRowAtIndexPath:indexPath])) {
+      [fullyVisibleRows addObject:@(indexPath.row)];
+    }
+  }
+  self.measurement[@"fullyVisibleRows"] = fullyVisibleRows;
   NSData *data = [NSJSONSerialization dataWithJSONObject:self.measurement
                                                options:NSJSONWritingSortedKeys
                                                  error:nil];

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp/Classes/SceneDelegate.m

@@ -10,7 +10,40 @@
 
 @implementation SceneDelegate
 
+- (void)showIdentifierLookupFixture
+{
+  UIViewController *controller = [UIViewController new];
+  controller.view.backgroundColor = UIColor.whiteColor;
+  controller.view.accessibilityIdentifier = @"IdentifierLookupFixture";
+  NSArray *identifiers = @[@"something", @"different", @"", NSNull.null, @"something", @"", NSNull.null, @"quote'\"é", NSNull.null];
+  NSArray<NSString *> *labels = @[@"other label", @"something", @"something", @"something", @"something", @"", @"", @"quoted", @"日本語"];
+  NSMutableArray<UILabel *> *labelViews = [NSMutableArray array];
+  for (NSUInteger i = 0; i < identifiers.count; i++) {
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(20, 90 + i * 40, 300, 35)];
+    label.text = [NSString stringWithFormat:@"Fixture %lu", (unsigned long)i];
+    label.accessibilityIdentifier = identifiers[i] == NSNull.null ? nil : identifiers[i];
+    label.accessibilityLabel = labels[i];
+    label.isAccessibilityElement = YES;
+    [labelViews addObject:label];
+    [controller.view addSubview:label];
+  }
+  UIButton *mutate = [UIButton buttonWithType:UIButtonTypeSystem];
+  mutate.frame = CGRectMake(20, 470, 220, 40);
+  [mutate setTitle:@"Change identifier" forState:UIControlStateNormal];
+  mutate.accessibilityIdentifier = @"mutateIdentifier";
+  [mutate addAction:[UIAction actionWithHandler:^(__kindof UIAction *action) {
+    labelViews[0].accessibilityIdentifier = @"changed";
+  }] forControlEvents:UIControlEventTouchUpInside];
+  [controller.view addSubview:mutate];
+  self.window.rootViewController = controller;
+  [self.window makeKeyAndVisible];
+}
+
 - (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions {
+  if ([NSProcessInfo.processInfo.arguments containsObject:@"--identifier-lookup-test"]) {
+    [self showIdentifierLookupFixture];
+    return;
+  }
   // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
   // If using a storyboard, the `window` property will automatically be set and attached to the scene.
   // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession:` instead).

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m

@@ -9,6 +9,10 @@
 #import "ViewController.h"
 #import "FBCoordinateProbeViewController.h"
 
+#if !TARGET_OS_TV
+#import <WebKit/WebKit.h>
+#endif
+
 @interface ViewController ()
 @property (weak, nonatomic) IBOutlet UILabel *orentationLabel;
 @property (weak, nonatomic) IBOutlet UIButton *button;
@@ -19,6 +23,17 @@
 - (void)viewDidLoad
 {
   [super viewDidLoad];
+
+#if !TARGET_OS_TV
+  if ([NSProcessInfo.processInfo.arguments containsObject:@"--webview-fixture"]) {
+    WKWebView *webView = [[WKWebView alloc] initWithFrame:self.view.bounds];
+    webView.autoresizingMask = UIViewAutoresizingFlexibleWidth
+      | UIViewAutoresizingFlexibleHeight;
+    [self.view addSubview:webView];
+    [webView loadHTMLString:@"<!doctype html><html><body>"
+      "<p>WebContent snapshot fixture</p></body></html>" baseURL:nil];
+  }
+#endif
   
   UIAccessibilityCustomAction *action1 =
   [[UIAccessibilityCustomAction alloc] initWithName:@"Custom Action 1"
@@ -96,10 +111,20 @@
 }
 
 #if !TARGET_OS_TV
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
+{
+  [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+  [coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+    // A 180-degree rotation can leave bounds unchanged. Read the scene after
+    // the transition as well as during layout.
+    [self updateOrentationLabel];
+  }];
+}
+
 - (void)updateOrentationLabel
 {
   NSString *orientation = nil;
-  switch (UIDevice.currentDevice.orientation) {
+  switch (self.view.window.windowScene.interfaceOrientation) {
     case UIInterfaceOrientationPortrait:
       orientation = @"Portrait";
       break;
@@ -112,12 +137,6 @@
     case UIInterfaceOrientationLandscapeRight:
       orientation = @"LandscapeRight";
       break;
-    case UIDeviceOrientationFaceUp:
-      orientation = @"FaceUp";
-      break;
-    case UIDeviceOrientationFaceDown:
-      orientation = @"FaceDown";
-      break;
     case UIInterfaceOrientationUnknown:
       orientation = @"Unknown";
       break;

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationTests/FBConfigurationTests.m

@@ -12,6 +12,9 @@
 #import "FBConfiguration.h"
 #import "FBRuntimeUtils.h"
 #import "FBTestMacros.h"
+#import "FBXCAccessibilityElement.h"
+#import "FBXCAXClientProxy.h"
+#import "XCUIApplication.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBIsVisible.h"
 
@@ -68,4 +71,53 @@
   }
 }
 
+- (void)testAccessibilityDeadlineAllowsResponsiveNativeAppSnapshots
+{
+  [self launchApplication];
+  NSTimeInterval previousDeadline = FBConfiguration.sharedInstance.accessibilityDeadline;
+  @try {
+    FBConfiguration.sharedInstance.accessibilityDeadline = 3;
+    NSError *error = nil;
+    XCTAssertNotNil([self.testedApplication snapshotWithError:&error]);
+    XCTAssertNil(error);
+  } @finally {
+    FBConfiguration.sharedInstance.accessibilityDeadline = previousDeadline;
+    [self.testedApplication terminate];
+  }
+}
+
+- (void)testAccessibilityDeadlineAllowsWebContentSnapshots
+{
+  NSTimeInterval previousDeadline = FBConfiguration.sharedInstance.accessibilityDeadline;
+  @try {
+    // Resolve the remote AX element before enabling the guard so the test
+    // exercises a WebContent-owned snapshot, not just the host app's tree.
+    FBConfiguration.sharedInstance.accessibilityDeadline = 0;
+    self.testedApplication.launchArguments = @[@"--webview-fixture"];
+    [self.testedApplication launch];
+    XCUIElement *text = self.testedApplication.webViews.staticTexts[
+      @"WebContent snapshot fixture"];
+    XCTAssertTrue([text waitForExistenceWithTimeout:15]);
+    NSError *error = nil;
+    id<FBXCElementSnapshot> initial = [text snapshotWithError:&error];
+    XCTAssertNotNil(initial);
+    XCTAssertNil(error);
+    id<FBXCAccessibilityElement> element = initial.accessibilityElement;
+    XCTAssertNotEqual(element.processIdentifier, self.testedApplication.processID);
+
+    FBConfiguration.sharedInstance.accessibilityDeadline = 3;
+    for (NSUInteger i = 0; i < 3; i++) {
+      error = nil;
+      id<FBXCElementSnapshot> snapshot = [FBXCAXClientProxy.sharedClient
+        snapshotForElement:element attributes:@[] inDepth:YES error:&error];
+      XCTAssertNotNil(snapshot);
+      XCTAssertNil(error);
+    }
+    XCTAssertTrue(text.exists);
+  } @finally {
+    FBConfiguration.sharedInstance.accessibilityDeadline = previousDeadline;
+    [self.testedApplication terminate];
+  }
+}
+
 @end