doumafang closed pull request #1580: [iOS] fix transition may cause memory leak.
URL: https://github.com/apache/incubator-weex/pull/1580
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXTransition.h
b/ios/sdk/WeexSDK/Sources/Module/WXTransition.h
index 62554714d0..70ec131236 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXTransition.h
+++ b/ios/sdk/WeexSDK/Sources/Module/WXTransition.h
@@ -46,10 +46,10 @@ typedef NS_OPTIONS(NSUInteger, WXTransitionOptions) {
@end
@interface WXTransition : NSObject
-@property(nonatomic,strong) NSMutableDictionary *oldFilterStyles;
-@property(nonatomic,strong) NSMutableDictionary *filterStyles;
-@property(nonatomic,strong) NSMutableArray *propertyArray;
-@property(nonatomic,assign) WXTransitionOptions transitionOptions;
+@property (nonatomic,strong) NSMutableDictionary *oldFilterStyles;
+@property (nonatomic,strong) NSMutableDictionary *filterStyles;
+@property (nonatomic,strong) NSMutableArray *propertyArray;
+@property (nonatomic,assign) WXTransitionOptions transitionOptions;
- (instancetype) initWithStyles:(NSDictionary *)styles;
- (void)_handleTransitionWithStyles:(NSDictionary *)styles
resetStyles:(NSMutableArray *)resetStyles target:(WXComponent
*)targetComponent;
- (BOOL)_hasTransitionOptionInStyles:(NSDictionary *)styles;
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXTransition.mm
b/ios/sdk/WeexSDK/Sources/Module/WXTransition.mm
index 53b6b31d3c..fae2ef5ac1 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXTransition.mm
+++ b/ios/sdk/WeexSDK/Sources/Module/WXTransition.mm
@@ -36,7 +36,6 @@ @implementation WXTransitionInfo
@interface WXTransition()
{
- WXComponent *_targetComponent;
double ax;
double bx;
double cx;
@@ -55,7 +54,7 @@ @interface WXTransition()
NSMutableDictionary *_filterStyles;
NSMutableDictionary *_oldFilterStyles;
}
-
+@property (nonatomic,weak) WXComponent *targetComponent;
@end
@implementation WXTransition
@@ -100,6 +99,10 @@ - (void)_handleTransitionWithStyles:(NSDictionary *)styles
resetStyles:(NSMutabl
[self _suspendTransitionDisplayLink];
}
+ if (!targetComponent) {
+ return;
+ }
+
_filterStyles = _filterStyles ?:[NSMutableDictionary new];
_oldFilterStyles = _oldFilterStyles ?: [NSMutableDictionary new];
NSMutableDictionary *futileStyles = [NSMutableDictionary new];
@@ -125,11 +128,10 @@ - (void)_handleTransitionWithStyles:(NSDictionary
*)styles resetStyles:(NSMutabl
}
}
[self updateFutileStyles:futileStyles resetStyles:nil
target:targetComponent];
-
+
_targetComponent = targetComponent;
NSMutableDictionary *componentStyles = [NSMutableDictionary
dictionaryWithDictionary:styles];
[componentStyles addEntriesFromDictionary:targetComponent.styles];
-
_transitionDuration = componentStyles[kWXTransitionDuration] ? [WXConvert
CGFloat:componentStyles[kWXTransitionDuration]] : 0;
_transitionDelay = componentStyles[kWXTransitionDelay] ? [WXConvert
CGFloat:componentStyles[kWXTransitionDelay]] : 0;
_transitionTimingFunction = [WXConvert
CAMediaTimingFunction:componentStyles[kWXTransitionTimingFunction]];
@@ -162,6 +164,9 @@ - (BOOL)_hasTransitionOptionInStyles:(NSDictionary *)styles
- (void)updateFutileStyles:(NSDictionary *)styles resetStyles:(NSMutableArray
*)resetStyles target:(WXComponent *)targetComponent
{
+ if (!targetComponent) {
+ return;
+ }
[targetComponent _updateCSSNodeStyles:styles];
[targetComponent _resetCSSNodeStyles:resetStyles];
WXPerformBlockOnMainThread(^{
@@ -204,7 +209,7 @@ - (void)_dealTransitionWithProperty:(NSString
*)singleProperty
else if ([singleProperty isEqualToString:@"transform"]) {
NSString *transformOrigin = _filterStyles[@"transformOrigin"];
WXTransform *wxTransform = [[WXTransform alloc]
initWithCSSValue:_filterStyles[singleProperty] origin:transformOrigin
instance:_targetComponent.weexInstance];
- WXTransform *oldTransform = _targetComponent->_transform;
+ WXTransform *oldTransform =
_targetComponent?_targetComponent->_transform:wxTransform;
if (wxTransform.rotateAngle != oldTransform.rotateAngle) {
WXTransitionInfo *info = [WXTransitionInfo new];
info.propertyName = @"transform.rotation";
@@ -304,6 +309,10 @@ - (NSArray *)_calculatePerColorRGB1:(NSArray *)RGB1
RGB2:(NSArray *)RGB2
- (void)_calculatetransitionProcessingStyle
{
+ if (_targetComponent == nil) {
+ return;
+ }
+
if (_propertyArray.count == 0) {
return;
}
@@ -356,11 +365,11 @@ - (void)_calculatetransitionProcessingStyle
transformString = [transformString stringByAppendingFormat:@"
%@",newString];
}
if ([info.propertyName
isEqualToString:@"transform.translation.x"]) {
- newString = [NSString
stringWithFormat:@"translateX(%lfpx)",currentValue /
_targetComponent.weexInstance.pixelScaleFactor];
+ newString = [NSString
stringWithFormat:@"translateX(%lfpx)",currentValue /
(_targetComponent.weexInstance.pixelScaleFactor?_targetComponent.weexInstance.pixelScaleFactor:[WXUtility
defaultPixelScaleFactor])];
transformString = [transformString stringByAppendingFormat:@"
%@",newString];
}
if ([info.propertyName
isEqualToString:@"transform.translation.y"]) {
- newString = [NSString
stringWithFormat:@"translateY(%lfpx)",currentValue /
_targetComponent.weexInstance.pixelScaleFactor];
+ newString = [NSString
stringWithFormat:@"translateY(%lfpx)",currentValue /
(_targetComponent.weexInstance.pixelScaleFactor?_targetComponent.weexInstance.pixelScaleFactor:[WXUtility
defaultPixelScaleFactor])];
transformString = [transformString stringByAppendingFormat:@"
%@",newString];
}
[_oldFilterStyles setObject:transformString forKey:@"transform"];
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
