Use _H<> for BrowserController::request_.

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index f44e6bac0bb0c2bda0bd06796d5619a1c74ad386..41b3d9d29a2058c4ab5396c303a65fc49d1d2f68 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -71,7 +71,7 @@
     NSURLAuthenticationChallenge *challenge_;
 
     bool error_;
-    NSURLRequest *request_;
+    _H<NSURLRequest> request_;
 
     _transient NSNumber *sensitive_;
 

diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm
index 9b0eda336cf5be3b1b3c4fdf2ae78fb2eca85df6..f354be8faeda8e118bc7bf67fe2e04315f0a7775 100644 (file)
--- a/UICaboodle/BrowserView.mm
+++ b/UICaboodle/BrowserView.mm
@@ -480,9 +480,6 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
     if (challenge_ != nil)
         [challenge_ release];
 
-    if (request_ != nil)
-        [request_ release];
-
     if (closer_ != nil)
         [closer_ release];
 
@@ -504,11 +501,11 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
 - (void) setURL:(NSURL *)url {
     _assert(request_ == nil);
 
-    request_ = [[NSURLRequest
+    request_ = [NSURLRequest
         requestWithURL:url
         cachePolicy:NSURLRequestUseProtocolCachePolicy
         timeoutInterval:DefaultTimeout_
-    ] retain];
+    ];
 }
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
@@ -541,8 +538,7 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
     NSMutableURLRequest *request([request_ mutableCopy]);
     [request setCachePolicy:(cache ? NSURLRequestUseProtocolCachePolicy : NSURLRequestReloadIgnoringLocalCacheData)];
 
-    [request_ autorelease];
-    request_ = [request retain];
+    request_ = request;
 
     if ([request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
         [self loadRequest:request_];
@@ -671,14 +667,8 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
 #endif
 
     if ([frame parentFrame] == nil) {
-        if (!error_) {
-            if (request_ != nil)
-                [request_ autorelease];
-            if (request == nil)
-                request_ = nil;
-            else
-                request_ = [request retain];
-        }
+        if (!error_)
+            request_ = request;
     }
 }