Skip to content

Commit 745f9b2

Browse files
committed
rollback of weak/strong reference in MDCThumbTrack
Summary: This reverts commit 77e79d6. Test Plan: revert-hammer Reviewers: Subscribers: # Tip: Write "Fixes T123" in your summary to automatically close the # corresponding task when this change lands.
1 parent 81ad7e3 commit 745f9b2

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

components/Switch/Switch.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@
423423
CLANG_WARN_EMPTY_BODY = YES;
424424
CLANG_WARN_ENUM_CONVERSION = YES;
425425
CLANG_WARN_INT_CONVERSION = YES;
426-
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
427426
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
428427
CLANG_WARN_UNREACHABLE_CODE = YES;
429428
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -468,7 +467,6 @@
468467
CLANG_WARN_EMPTY_BODY = YES;
469468
CLANG_WARN_ENUM_CONVERSION = YES;
470469
CLANG_WARN_INT_CONVERSION = YES;
471-
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
472470
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
473471
CLANG_WARN_UNREACHABLE_CODE = YES;
474472
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -501,7 +499,6 @@
501499
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
502500
PRODUCT_BUNDLE_IDENTIFIER = com.google.Switch;
503501
PRODUCT_NAME = "$(TARGET_NAME)";
504-
WARNING_CFLAGS = "";
505502
};
506503
name = Debug;
507504
};
@@ -513,7 +510,6 @@
513510
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
514511
PRODUCT_BUNDLE_IDENTIFIER = com.google.Switch;
515512
PRODUCT_NAME = "$(TARGET_NAME)";
516-
WARNING_CFLAGS = "";
517513
};
518514
name = Release;
519515
};

components/private/ThumbTrack/src/MDCThumbTrack.m

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -611,21 +611,19 @@ - (void)setValueFromThumbPosition:(CGPoint)position isTap:(BOOL)isTap {
611611
} else {
612612
value = [self valueForThumbPosition:position];
613613
}
614-
__strong typeof(_delegate) strongDelegate = _delegate;
615-
if ([strongDelegate respondsToSelector:@selector(thumbTrack:willAnimateToValue:)]) {
616-
[strongDelegate thumbTrack:self willAnimateToValue:value];
614+
__weak MDCThumbTrack *weakSelf = self;
615+
if ([_delegate respondsToSelector:@selector(thumbTrack:willAnimateToValue:)]) {
616+
[_delegate thumbTrack:self willAnimateToValue:value];
617617
}
618-
__weak typeof(self) weakSelf = self;
619618
[self setValue:value
620619
animated:YES
621620
userGenerated:YES
622621
completion:^{
623-
__strong typeof(weakSelf) strongSelf = weakSelf;
624-
__strong typeof(strongSelf->_delegate) strongDelegate = strongSelf->_delegate;
622+
MDCThumbTrack *strongSelf = weakSelf;
625623
[strongSelf sendDiscreteChangeAction];
626-
if (strongSelf && [strongDelegate
624+
if (strongSelf && [strongSelf->_delegate
627625
respondsToSelector:@selector(thumbTrack:didAnimateToValue:)]) {
628-
[strongDelegate thumbTrack:strongSelf didAnimateToValue:value];
626+
[strongSelf->_delegate thumbTrack:weakSelf didAnimateToValue:value];
629627
}
630628
}];
631629
}

0 commit comments

Comments
 (0)