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

Unified Diff: ios/web/web_state/ui/crw_web_controller_container_view.mm

Issue 2948673002: Revert of [ObjC ARC] Converts ios/web:web to ARC. (Closed)
Patch Set: Created 3 years, 6 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/web/web_state/ui/crw_web_controller_container_view.mm
diff --git a/ios/web/web_state/ui/crw_web_controller_container_view.mm b/ios/web/web_state/ui/crw_web_controller_container_view.mm
index 9c688682a8ede1d1fba7483b465f1270c1c59c96..9c7ae37ef942a92c7cb96290ee7587d7435ed014 100644
--- a/ios/web/web_state/ui/crw_web_controller_container_view.mm
+++ b/ios/web/web_state/ui/crw_web_controller_container_view.mm
@@ -4,26 +4,24 @@
#import "ios/web/web_state/ui/crw_web_controller_container_view.h"
+#import "base/ios/weak_nsobject.h"
#include "base/logging.h"
+#import "base/mac/scoped_nsobject.h"
#import "ios/web/public/web_state/ui/crw_content_view.h"
#import "ios/web/public/web_state/ui/crw_native_content.h"
#import "ios/web/public/web_state/ui/crw_web_view_content_view.h"
#import "ios/web/web_state/ui/crw_web_view_proxy_impl.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
#pragma mark - CRWToolbarContainerView
// Class that manages the display of toolbars.
@interface CRWToolbarContainerView : UIView {
// Backing object for |self.toolbars|.
- NSMutableArray* _toolbars;
+ base::scoped_nsobject<NSMutableArray> _toolbars;
}
// The toolbars currently managed by this view.
-@property(nonatomic, strong, readonly) NSMutableArray* toolbars;
+@property(nonatomic, retain, readonly) NSMutableArray* toolbars;
// Adds |toolbar| as a subview and bottom aligns to any previously added
// toolbars.
@@ -40,8 +38,8 @@
- (NSMutableArray*)toolbars {
if (!_toolbars)
- _toolbars = [[NSMutableArray alloc] init];
- return _toolbars;
+ _toolbars.reset([[NSMutableArray alloc] init]);
+ return _toolbars.get();
}
#pragma mark Layout
@@ -91,21 +89,28 @@
#pragma mark - CRWWebControllerContainerView
@interface CRWWebControllerContainerView () {
+ // The delegate passed on initialization.
+ base::WeakNSProtocol<id<CRWWebControllerContainerViewDelegate>> _delegate;
+ // Backing objects for corresponding properties.
+ base::scoped_nsobject<CRWWebViewContentView> _webViewContentView;
+ base::scoped_nsprotocol<id<CRWNativeContent>> _nativeController;
+ base::scoped_nsobject<CRWContentView> _transientContentView;
+ base::scoped_nsobject<CRWToolbarContainerView> _toolbarContainerView;
}
// Redefine properties as readwrite.
-@property(nonatomic, strong, readwrite)
+@property(nonatomic, retain, readwrite)
CRWWebViewContentView* webViewContentView;
-@property(nonatomic, strong, readwrite) id<CRWNativeContent> nativeController;
-@property(nonatomic, strong, readwrite) CRWContentView* transientContentView;
+@property(nonatomic, retain, readwrite) id<CRWNativeContent> nativeController;
+@property(nonatomic, retain, readwrite) CRWContentView* transientContentView;
// Container view that displays any added toolbars. It is always the top-most
// subview, and is bottom aligned with the CRWWebControllerContainerView.
-@property(nonatomic, strong, readonly)
+@property(nonatomic, retain, readonly)
CRWToolbarContainerView* toolbarContainerView;
// Convenience getter for the proxy object.
-@property(nonatomic, weak, readonly) CRWWebViewProxyImpl* contentViewProxy;
+@property(nonatomic, readonly) CRWWebViewProxyImpl* contentViewProxy;
// Returns |self.bounds| after being inset at the top by the header height
// returned by the delegate. This is only used to lay out native controllers,
@@ -117,18 +122,12 @@
@implementation CRWWebControllerContainerView
-@synthesize webViewContentView = _webViewContentView;
-@synthesize nativeController = _nativeController;
-@synthesize transientContentView = _transientContentView;
-@synthesize toolbarContainerView = _toolbarContainerView;
-@synthesize delegate = _delegate;
-
- (instancetype)initWithDelegate:
(id<CRWWebControllerContainerViewDelegate>)delegate {
self = [super initWithFrame:CGRectZero];
if (self) {
DCHECK(delegate);
- _delegate = delegate;
+ _delegate.reset(delegate);
self.backgroundColor = [UIColor whiteColor];
self.autoresizingMask =
UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
@@ -148,45 +147,62 @@
- (void)dealloc {
self.contentViewProxy.contentView = nil;
+ [super dealloc];
}
#pragma mark Accessors
+
+- (CRWWebViewContentView*)webViewContentView {
+ return _webViewContentView.get();
+}
- (void)setWebViewContentView:(CRWWebViewContentView*)webViewContentView {
if (![_webViewContentView isEqual:webViewContentView]) {
[_webViewContentView removeFromSuperview];
- _webViewContentView = webViewContentView;
+ _webViewContentView.reset([webViewContentView retain]);
[_webViewContentView setFrame:self.bounds];
[self addSubview:_webViewContentView];
}
}
+- (id<CRWNativeContent>)nativeController {
+ return _nativeController.get();
+}
+
- (void)setNativeController:(id<CRWNativeContent>)nativeController {
if (![_nativeController isEqual:nativeController]) {
- __weak id oldController = _nativeController;
+ base::WeakNSProtocol<id> oldController(_nativeController);
if ([oldController respondsToSelector:@selector(willBeDismissed)]) {
[oldController willBeDismissed];
}
[[oldController view] removeFromSuperview];
- _nativeController = nativeController;
+ _nativeController.reset([nativeController retain]);
// TODO(crbug.com/503297): Re-enable this DCHECK once native controller
// leaks are fixed.
// DCHECK(!oldController);
}
}
+- (CRWContentView*)transientContentView {
+ return _transientContentView.get();
+}
+
- (void)setTransientContentView:(CRWContentView*)transientContentView {
if (![_transientContentView isEqual:transientContentView]) {
[_transientContentView removeFromSuperview];
- _transientContentView = transientContentView;
+ _transientContentView.reset([transientContentView retain]);
}
}
- (void)setToolbarContainerView:(CRWToolbarContainerView*)toolbarContainerView {
if (![_toolbarContainerView isEqual:toolbarContainerView]) {
[_toolbarContainerView removeFromSuperview];
- _toolbarContainerView = toolbarContainerView;
- }
+ _toolbarContainerView.reset([toolbarContainerView retain]);
+ }
+}
+
+- (UIView*)toolbarContainerView {
+ return _toolbarContainerView.get();
}
- (CRWWebViewProxyImpl*)contentViewProxy {
@@ -197,6 +213,14 @@
CGFloat headerHeight = [_delegate headerHeightForContainerView:self];
return UIEdgeInsetsInsetRect(self.bounds,
UIEdgeInsetsMake(headerHeight, 0, 0, 0));
+}
+
+- (id<CRWWebControllerContainerViewDelegate>)delegate {
+ return _delegate.get();
+}
+
+- (void)setDelegate:(id<CRWWebControllerContainerViewDelegate>)delegate {
+ _delegate.reset(delegate);
}
#pragma mark Layout
@@ -291,8 +315,8 @@
- (void)addToolbar:(UIView*)toolbar {
// Create toolbar container if necessary.
if (!self.toolbarContainerView) {
- self.toolbarContainerView =
- [[CRWToolbarContainerView alloc] initWithFrame:CGRectZero];
+ self.toolbarContainerView = [
+ [[CRWToolbarContainerView alloc] initWithFrame:CGRectZero] autorelease];
}
// Add the toolbar to the container.
[self.toolbarContainerView addToolbar:toolbar];
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller_container_view.h ('k') | ios/web/web_state/ui/crw_web_view_content_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698