Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.mm

Issue 2852713002: Revert of [ObjC ARC] Converts ios/chrome/browser/ui/toolbar:toolbar to ARC. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.mm
diff --git a/ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.mm b/ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.mm
index a6f37c572e03c58d72c1d5b02963624d715ecc71..dff031ab80643357197193bb048d398b746cf5e2 100644
--- a/ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.mm
+++ b/ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.mm
@@ -8,10 +8,6 @@
#import <QuartzCore/CAMediaTimingFunction.h>
#include "ios/chrome/browser/ui/toolbar/toolbar_button_tints.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
namespace {
// The number of dots drawn.
@@ -52,7 +48,7 @@
// Whether the reading list contains unseen items.
BOOL readingListContainsUnseenItems_;
// The CALayers containing the drawn dots.
- NSMutableArray<CAShapeLayer*>* pathLayers_;
+ base::scoped_nsobject<CAShapeLayer> pathLayers_[kNumberOfDots];
// Whether the CALayers are being animated.
BOOL animationOnGoing_;
}
@@ -85,7 +81,6 @@
forState:UIControlStateNormal];
[self setTintColor:toolbar::HighlighButtonTint(style_)
forState:UIControlStateHighlighted];
- pathLayers_ = [[NSMutableArray alloc] initWithCapacity:kNumberOfDots];
}
return self;
}
@@ -118,7 +113,7 @@
- (void)initializeShapeLayers {
for (int i = 0; i < kNumberOfDots; i++) {
- CAShapeLayer* pathLayer = pathLayers_[i];
+ base::scoped_nsobject<CAShapeLayer>& pathLayer = pathLayers_[i];
if (pathLayer) {
[pathLayer removeFromSuperlayer];
}
@@ -130,7 +125,7 @@
[path moveToPoint:CGPointMake(x - kMaxWidthOfSegment * 0.5, y)];
[path addLineToPoint:CGPointMake(x + kMaxWidthOfSegment * 0.5, y)];
- pathLayer = [CAShapeLayer layer];
+ pathLayer.reset([[CAShapeLayer layer] retain]);
[pathLayer setFrame:self.bounds];
[pathLayer setPath:path.CGPath];
[pathLayer setStrokeColor:[self.tintColor CGColor]];
@@ -139,8 +134,7 @@
[pathLayer setLineCap:kCALineCapRound];
[pathLayer setStrokeStart:kStrokeStartAtRest];
[pathLayer setStrokeEnd:kStrokeEndAtRest];
- [self.layer addSublayer:pathLayer];
- pathLayers_[i] = pathLayer;
+ [self.layer addSublayer:pathLayer.get()];
}
}
@@ -212,7 +206,8 @@
// Add four animations for each stroke.
for (int i = 0; i < kNumberOfDots; i++) {
- CAShapeLayer* pathLayer = pathLayers_[i];
+ base::scoped_nsobject<CAShapeLayer>& pathLayer = pathLayers_[i];
+ DCHECK(pathLayer.get());
const int frameStart =
(kNumberOfDots - i) * kFramesBetweenAnimationOfEachDot;

Powered by Google App Engine
This is Rietveld 408576698