Reimplement ASRectTable using unordered_map to avoid obscure NSMapTable exception. #719
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // | ||
| // ASRectMap.h | ||
| // Texture | ||
| // | ||
| // Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import <CoreGraphics/CGGeometry.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /** | ||
| * A category for indexing weak pointers to CGRects. Similar to ASIntegerMap. | ||
| */ | ||
| @interface ASRectMap : NSObject | ||
|
|
||
| /** | ||
| * Creates a new rect map. The keys are never retained. | ||
| */ | ||
| + (ASRectMap *)rectMapForWeakObjectPointers; | ||
|
|
||
| /** | ||
| * Retrieves the rect for a given key, or CGRectNull if the key is not found. | ||
| * | ||
| * @param key An object to lookup the rect for. | ||
| */ | ||
| - (CGRect)rectForKey:(id)key; | ||
|
|
||
| /** | ||
| * Sets the given rect for the associated key. Key *will not be retained!* | ||
| * | ||
| * @param rect The rect to store as value. | ||
| * @param key The key to use for the rect. | ||
| */ | ||
| - (void)setRect:(CGRect)rect forKey:(id)key; | ||
|
|
||
| /** | ||
| * Removes the rect for the given key, if one exists. | ||
| * | ||
| * @param key The key to remove. | ||
| */ | ||
| - (void)removeRectForKey:(id)key; | ||
|
|
||
| @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,78 @@ | ||
| // | ||
| // ASRectMap.mm | ||
| // Texture | ||
| // | ||
| // Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
|
|
||
| #import "ASRectMap.h" | ||
| #import "ASObjectDescriptionHelpers.h" | ||
| #import <UIKit/UIGeometry.h> | ||
| #import <unordered_map> | ||
|
|
||
| @implementation ASRectMap { | ||
| std::unordered_map<void *, CGRect> _map; | ||
|
There was a problem hiding this comment. We may should add a comment that we use a There was a problem hiding this comment. Could we not use There was a problem hiding this comment. Unfortunately I don't think we can use And we could use it via: |
||
| } | ||
|
|
||
| + (ASRectMap *)rectMapForWeakObjectPointers | ||
| { | ||
| return [[self alloc] init]; | ||
| } | ||
|
|
||
| - (CGRect)rectForKey:(id)key | ||
| { | ||
| auto result = _map.find((__bridge void *)key); | ||
| if (result != _map.end()) { | ||
| // result->first is the key; result->second is the value, a CGRect. | ||
| return result->second; | ||
| } else { | ||
| return CGRectNull; | ||
| } | ||
| } | ||
|
|
||
| - (void)setRect:(CGRect)rect forKey:(id)key | ||
| { | ||
| if (key) { | ||
| _map[(__bridge void *)key] = rect; | ||
| } | ||
| } | ||
|
|
||
| - (void)removeRectForKey:(id)key | ||
| { | ||
| if (key) { | ||
| _map.erase((__bridge void *)key); | ||
| } | ||
| } | ||
|
|
||
| - (id)copyWithZone:(NSZone *)zone | ||
| { | ||
| ASRectMap *copy = [ASRectMap rectMapForWeakObjectPointers]; | ||
| copy->_map = _map; | ||
| return copy; | ||
| } | ||
|
|
||
| - (NSMutableArray<NSDictionary *> *)propertiesForDescription | ||
| { | ||
| NSMutableArray *result = [NSMutableArray array]; | ||
|
|
||
| // { ptr1->rect1 ptr2->rect2 ptr3->rect3 } | ||
| NSMutableString *str = [NSMutableString string]; | ||
| for (auto it = _map.begin(); it != _map.end(); it++) { | ||
|
There was a problem hiding this comment. You could also use of a bit of a smaller code: There was a problem hiding this comment. Is this method dangerous, now that the keys are stored unretained? Could we be calling There was a problem hiding this comment. Agree with @Adlai-Holler. Let's pay extra attention here. |
||
| [str appendFormat:@" %@->%@", it->first, NSStringFromCGRect(it->second)]; | ||
| } | ||
| [result addObject:@{ @"ASRectMap": str }]; | ||
|
|
||
| return result; | ||
|
There was a problem hiding this comment.
Edit: NM I see you used |
||
| } | ||
|
|
||
| - (NSString *)description | ||
| { | ||
| return ASObjectDescriptionMakeWithoutObject([self propertiesForDescription]); | ||
| } | ||
|
|
||
| @end | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please update this file license per Danger's comment.