Skip to content

Commit

Permalink
Fix merge from master into ARC'd branch
Browse files Browse the repository at this point in the history
  • Loading branch information
soffes committed May 8, 2012
1 parent bb374bc commit c52f555
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions SSToolkit/SSWebView.m
Expand Up @@ -118,7 +118,6 @@ - (void)reset {
_webView.delegate = self;
[self addSubview:_webView];

[_lastRequest release];
_lastRequest = nil;
}

Expand Down Expand Up @@ -290,15 +289,13 @@ - (void)goForward {


- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL {
[_lastRequest release];
_lastRequest = nil;

[_webView loadData:data MIMEType:MIMEType textEncodingName:encodingName baseURL:baseURL];
}


- (void)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL {
[_lastRequest release];
_lastRequest = nil;

if (!baseURL) {
Expand All @@ -309,7 +306,6 @@ - (void)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL {


- (void)loadRequest:(NSURLRequest *)aRequest {
[_lastRequest release];
_lastRequest = nil;

[_webView loadRequest:aRequest];
Expand Down

0 comments on commit c52f555

Please sign in to comment.