diff options
| -rw-r--r-- | CyteKit/WebViewController.h | 3 | ||||
| -rw-r--r-- | CyteKit/WebViewController.mm | 22 |
2 files changed, 23 insertions, 2 deletions
diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h index 89ebe61..9572487 100644 --- a/CyteKit/WebViewController.h +++ b/CyteKit/WebViewController.h @@ -72,6 +72,9 @@ bool error_; _H<NSURLRequest> request_; + _H<NSURLRequest> stage1_; + _H<NSURLRequest> stage2_; + _transient NSNumber *sensitive_; NSString *title_; diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm index d3b12a6..8b82229 100644 --- a/CyteKit/WebViewController.mm +++ b/CyteKit/WebViewController.mm @@ -16,6 +16,7 @@ extern NSString * const kCAFilterNearest; #include <WebCore/WebCoreThread.h> +#include <WebKit/WebKitErrors.h> #include <WebKit/WebPreferences.h> #include <WebKit/DOMCSSPrimitiveValue.h> @@ -344,6 +345,13 @@ float CYScrollViewDecelerationRateNormal; if ([[error domain] isEqualToString:NSURLErrorDomain] && [error code] == NSURLErrorCancelled) return; + if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) { + request_ = (id) stage2_; + stage1_ = nil; + stage2_ = nil; + return; + } + if ([frame parentFrame] == nil) { [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@", [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString], @@ -421,8 +429,12 @@ float CYScrollViewDecelerationRateNormal; } - (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame { - if (decision == CYWebPolicyDecisionUse && !error_) - request_ = request; + if ([frame parentFrame] == nil) + if (decision == CYWebPolicyDecisionUse) + if (!error_) { + stage1_ = (id) request_; + request_ = request; + } } - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id<WebPolicyDecisionListener>)listener { @@ -470,6 +482,9 @@ float CYScrollViewDecelerationRateNormal; [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]]; if ([frame parentFrame] == nil) { + stage1_ = nil; + stage2_ = nil; + if (DOMDocument *document = [frame DOMDocument]) if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"]) for (DOMHTMLBodyElement *body in (id) bodies) { @@ -526,6 +541,9 @@ float CYScrollViewDecelerationRateNormal; style_ = nil; function_ = nil; + stage2_ = (id) stage1_; + stage1_ = nil; + [self setHidesNavigationBar:NO]; // XXX: do we still need to do this? |