forked from facebookarchive/WebDriverAgent
-
Notifications
You must be signed in to change notification settings - Fork 395
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
635f387
commit 4265ccb
Showing
11 changed files
with
120 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
|
|
||
| #import "FBXCElementSnapshotWrapper.h" | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface XCUIElement (FBVisibleFrame) | ||
|
|
||
| /** | ||
| Returns the snapshot visibleFrame with a fallback to direct attribute retrieval from FBXCAXClient in case of a snapshot fault (nil visibleFrame) | ||
| @return the snapshot visibleFrame | ||
| */ | ||
| - (CGRect)fb_visibleFrame; | ||
|
|
||
| @end | ||
|
|
||
| @interface FBXCElementSnapshotWrapper (FBVisibleFrame) | ||
|
|
||
| /** | ||
| Returns the snapshot visibleFrame with a fallback to direct attribute retrieval from FBXCAXClient in case of a snapshot fault (nil visibleFrame) | ||
| @return the snapshot visibleFrame | ||
| */ | ||
| - (CGRect)fb_visibleFrame; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
|
|
||
| #import "XCUIElement+FBVisibleFrame.h" | ||
| #import "FBElementUtils.h" | ||
| #import "FBXCodeCompatibility.h" | ||
| #import "FBXCElementSnapshotWrapper+Helpers.h" | ||
| #import "XCUIElement+FBUtilities.h" | ||
| #import "XCTestPrivateSymbols.h" | ||
|
|
||
| #define VisibleFrameFetchTimeout 0.3 | ||
|
|
||
| @implementation XCUIElement (FBVisibleFrame) | ||
|
|
||
| - (CGRect)fb_visibleFrame | ||
| { | ||
| id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:NO]; | ||
| return [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_visibleFrame; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @implementation FBXCElementSnapshotWrapper (FBVisibleFrame) | ||
|
|
||
| - (CGRect)fb_visibleFrame | ||
| { | ||
| CGRect thisVisibleFrame = [self visibleFrame]; | ||
| if (!CGRectIsEmpty(thisVisibleFrame)) { | ||
| return thisVisibleFrame; | ||
| } | ||
|
|
||
| NSDictionary *visibleFrameDict = [self fb_attributeValue:FB_XCAXAVisibleFrameAttributeName | ||
| timeout:VisibleFrameFetchTimeout | ||
| error:nil]; | ||
| if (nil == visibleFrameDict) { | ||
| return thisVisibleFrame; | ||
| } | ||
|
|
||
| id x = [visibleFrameDict objectForKey:@"X"]; | ||
| id y = [visibleFrameDict objectForKey:@"Y"]; | ||
| id height = [visibleFrameDict objectForKey:@"Height"]; | ||
| id width = [visibleFrameDict objectForKey:@"Width"]; | ||
| if (x != nil && y != nil && height != nil && width != nil) { | ||
| return CGRectMake([x doubleValue], [y doubleValue], [width doubleValue], [height doubleValue]); | ||
| } | ||
|
|
||
| return thisVisibleFrame; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,4 +103,9 @@ - (NSArray *)_allDescendants | |
| return @[]; | ||
| } | ||
|
|
||
| - (CGRect)visibleFrame | ||
| { | ||
| return CGRectZero; | ||
| } | ||
|
|
||
| @end | ||