Sorting packages also requires the database lock.

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 8c9a016f5776109c7efe71c0ed36ea32e0cbae5c..c4931cbeaab6368501ceab44aeebb4e154ba2e31 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -5,6 +5,7 @@
 
 #include "iPhonePrivate.h"
 
 
 #include "iPhonePrivate.h"
 

+#include "CyteKit/IndirectDelegate.h"

 #include "CyteKit/Localize.h"
 #include "CyteKit/WebViewController.h"
 #include "CyteKit/PerlCompatibleRegEx.hpp"
 #include "CyteKit/Localize.h"
 #include "CyteKit/WebViewController.h"
 #include "CyteKit/PerlCompatibleRegEx.hpp"


@@ -16,7 +17,8 @@ extern NSString * const kCAFilterNearest;
 
 #include <WebCore/WebCoreThread.h>
 
 
 #include <WebCore/WebCoreThread.h>
 

-#include <WebKit/WebPreferences.h>
+#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebPreferences.h>

 
 #include <WebKit/DOMCSSPrimitiveValue.h>
 #include <WebKit/DOMCSSStyleDeclaration.h>
 
 #include <WebKit/DOMCSSPrimitiveValue.h>
 #include <WebKit/DOMCSSStyleDeclaration.h>


@@ -24,6 +26,9 @@ extern NSString * const kCAFilterNearest;
 #include <WebKit/DOMHTMLBodyElement.h>
 #include <WebKit/DOMRGBColor.h>
 
 #include <WebKit/DOMHTMLBodyElement.h>
 #include <WebKit/DOMRGBColor.h>
 

+#include <dlfcn.h>
+#include <objc/runtime.h>
+

 #define ForSaurik 0
 #define DefaultTimeout_ 120.0
 
 #define ForSaurik 0
 #define DefaultTimeout_ 120.0
 


@@ -33,17 +38,11 @@ extern NSString * const kCAFilterNearest;
 
 #define lprintf(args...) fprintf(stderr, args)
 
 
 #define lprintf(args...) fprintf(stderr, args)
 

+JSValueRef (*$JSObjectCallAsFunction)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *);
+

 // XXX: centralize these special class things to some file or mechanism?
 static Class $MFMailComposeViewController;
 
 // XXX: centralize these special class things to some file or mechanism?
 static Class $MFMailComposeViewController;
 

-template <typename Type_>
-static inline void CYRelease(Type_ &value) {
-    if (value != nil) {
-        [value release];
-        value = nil;
-    }
-}
-

 float CYScrollViewDecelerationRateNormal;
 
 @interface WebView (Apple)
 float CYScrollViewDecelerationRateNormal;
 
 @interface WebView (Apple)


@@ -51,23 +50,33 @@ float CYScrollViewDecelerationRateNormal;
 - (void) _setAllowsMessaging:(BOOL)allows;
 @end
 
 - (void) _setAllowsMessaging:(BOOL)allows;
 @end
 

-@interface WebPreferences (Apple)
-+ (void) _setInitialDefaultTextEncodingToSystemEncoding;
-- (void) _setLayoutInterval:(NSInteger)interval;
-- (void) setOfflineWebApplicationCacheEnabled:(BOOL)enabled;
+@interface WebFrame (Cydia)
+- (void) cydia$updateHeight;

 @end
 
 @end
 

-/* Indirect Delegate {{{ */
-@interface IndirectDelegate : NSObject {
-    _transient volatile id delegate_;
+@implementation WebFrame (Cydia)
+
+- (NSString *) description {
+    return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[[([self provisionalDataSource] ?: [self dataSource]) request] URL] absoluteString]];
+}
+
+- (void) cydia$updateHeight {
+    [[[self frameElement] style]
+        setProperty:@"height"
+        value:[NSString stringWithFormat:@"%dpx",
+            [[[self DOMDocument] body] scrollHeight]]
+        priority:nil];

 }
 
 }
 

-- (void) setDelegate:(id)delegate;
-- (id) initWithDelegate:(id)delegate;

 @end
 
 @end
 

+/* Indirect Delegate {{{ */

 @implementation IndirectDelegate
 
 @implementation IndirectDelegate
 

+- (id) delegate {
+    return delegate_;
+}
+

 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
 }
 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
 }


@@ -131,6 +140,14 @@ float CYScrollViewDecelerationRateNormal;
 + (void) _initialize {
     [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding];
 
 + (void) _initialize {
     [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding];
 

+    void *js(NULL);
+    if (js == NULL)
+        js = dlopen("/System/Library/Frameworks/JavaScriptCore.framework/JavaScriptCore", RTLD_GLOBAL | RTLD_LAZY);
+    if (js == NULL)
+        js = dlopen("/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore", RTLD_GLOBAL | RTLD_LAZY);
+    if (js != NULL)
+        $JSObjectCallAsFunction = reinterpret_cast<JSValueRef (*)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(js, "JSObjectCallAsFunction"));
+

     dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
     $MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
 
     dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
     $MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
 


@@ -140,53 +157,68 @@ float CYScrollViewDecelerationRateNormal;
         CYScrollViewDecelerationRateNormal = 0.998;
 }
 
         CYScrollViewDecelerationRateNormal = 0.998;
 }
 

+- (bool) retainsNetworkActivityIndicator {
+    return true;
+}
+
+- (void) releaseNetworkActivityIndicator {
+    if ([loading_ count] != 0) {
+        [loading_ removeAllObjects];
+
+        if ([self retainsNetworkActivityIndicator])
+            [delegate_ releaseNetworkActivityIndicator];
+    }
+}
+

 - (void) dealloc {
 #if LogBrowser
     NSLog(@"[CyteWebViewController dealloc]");
 #endif
 
 - (void) dealloc {
 #if LogBrowser
     NSLog(@"[CyteWebViewController dealloc]");
 #endif
 

-    [webview_ setDelegate:nil];
-
-    [indirect_ setDelegate:nil];
-    [indirect_ release];
+    [self releaseNetworkActivityIndicator];

 
 

-    if (challenge_ != nil)
-        [challenge_ release];
-
-    if (title_ != nil)
-        [title_ release];
-
-    if ([loading_ count] != 0)
-        [delegate_ releaseNetworkActivityIndicator];
-    [loading_ release];
-
-    [reloaditem_ release];
-    [loadingitem_ release];
+    [super dealloc];
+}

 
 

-    [indicator_ release];
+- (NSString *) description {
+    return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[request_ URL] absoluteString]];
+}

 
 

-    [super dealloc];
+- (CyteWebView *) webView {
+    return (CyteWebView *) [self view];

 }
 
 - (NSURL *) URLWithURL:(NSURL *)url {
     return url;
 }
 
 }
 
 - (NSURL *) URLWithURL:(NSURL *)url {
     return url;
 }
 

-- (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
-    return [NSURLRequest
+- (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy referrer:(NSString *)referrer {
+    NSMutableURLRequest *request([NSMutableURLRequest

         requestWithURL:[self URLWithURL:url]
         cachePolicy:policy
         timeoutInterval:DefaultTimeout_
         requestWithURL:[self URLWithURL:url]
         cachePolicy:policy
         timeoutInterval:DefaultTimeout_

-    ];
+    ]);
+
+    [request setValue:referrer forHTTPHeaderField:@"Referer"];
+
+    return request;

 }
 
 }
 

-- (void) setURL:(NSURL *)url {
+- (void) setRequest:(NSURLRequest *)request {

     _assert(request_ == nil);
     _assert(request_ == nil);

-    request_ = [self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
+    request_ = request;
+}
+
+- (void) setURL:(NSURL *)url {
+    [self setURL:url withReferrer:nil];
+}
+
+- (void) setURL:(NSURL *)url withReferrer:(NSString *)referrer {
+    [self setRequest:[self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy referrer:referrer]];

 }
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
 }
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {

-    [self loadRequest:[self requestWithURL:url cachePolicy:policy]];
+    [self loadRequest:[self requestWithURL:url cachePolicy:policy referrer:nil]];

 }
 
 - (void) loadURL:(NSURL *)url {
 }
 
 - (void) loadURL:(NSURL *)url {


@@ -199,9 +231,10 @@ float CYScrollViewDecelerationRateNormal;
 #endif
 
     error_ = false;
 #endif
 
     error_ = false;

+    ready_ = true;

 
     WebThreadLocked lock;
 
     WebThreadLocked lock;

-    [webview_ loadRequest:request];
+    [[self webView] loadRequest:request];

 }
 
 - (void) reloadURLWithCache:(BOOL)cache {
 }
 
 - (void) reloadURLWithCache:(BOOL)cache {


@@ -213,7 +246,7 @@ float CYScrollViewDecelerationRateNormal;
 
     request_ = request;
 
 
     request_ = request;
 

-    if ([request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
+    if (cache || [request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)

         [self loadRequest:request_];
     else {
         UIAlertView *alert = [[[UIAlertView alloc]
         [self loadRequest:request_];
     else {
         UIAlertView *alert = [[[UIAlertView alloc]


@@ -231,13 +264,13 @@ float CYScrollViewDecelerationRateNormal;
     }
 }
 
     }
 }
 

-- (void) reloadURL {
-    [self reloadURLWithCache:YES];
-}
-

 - (void) reloadData {
     [super reloadData];
 - (void) reloadData {
     [super reloadData];

-    [self reloadURLWithCache:YES];
+
+    if (ready_)
+        [self dispatchEvent:@"CydiaReloadData"];
+    else
+        [self reloadURLWithCache:YES];

 }
 
 - (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
 }
 
 - (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {


@@ -273,7 +306,7 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) _setViewportWidth {
 }
 
 - (void) _setViewportWidth {

-    [[webview_ _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];
+    [[[self webView] _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];

 }
 
 - (void) setViewportWidth:(float)width {
 }
 
 - (void) setViewportWidth:(float)width {


@@ -297,6 +330,9 @@ float CYScrollViewDecelerationRateNormal;
     [self dismissModalViewControllerAnimated:YES];
 }
 
     [self dismissModalViewControllerAnimated:YES];
 }
 

+- (void) _setupMail:(MFMailComposeViewController *)controller {
+}
+

 - (void) _openMailToURL:(NSURL *)url {
     if ($MFMailComposeViewController != nil && [$MFMailComposeViewController canSendMail]) {
         MFMailComposeViewController *controller([[[$MFMailComposeViewController alloc] init] autorelease]);
 - (void) _openMailToURL:(NSURL *)url {
     if ($MFMailComposeViewController != nil && [$MFMailComposeViewController canSendMail]) {
         MFMailComposeViewController *controller([[[$MFMailComposeViewController alloc] init] autorelease]);


@@ -304,6 +340,8 @@ float CYScrollViewDecelerationRateNormal;
 
         [controller setMailToURL:url];
 
 
         [controller setMailToURL:url];
 

+        [self _setupMail:controller];
+

         [self presentModalViewController:controller animated:YES];
         return;
     }
         [self presentModalViewController:controller animated:YES];
         return;
     }


@@ -338,11 +376,20 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {
 }
 
 - (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {

-    [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
+    NSValue *object([NSValue valueWithNonretainedObject:frame]);
+    if (![loading_ containsObject:object])
+        return;
+    [loading_ removeObject:object];
+

     [self _didFinishLoading];
 
     [self _didFinishLoading];
 

-    if ([error code] == NSURLErrorCancelled)
+    if ([[error domain] isEqualToString:NSURLErrorDomain] && [error code] == NSURLErrorCancelled)
+        return;
+
+    if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) {
+        request_ = nil;

         return;
         return;

+    }

 
     if ([frame parentFrame] == nil) {
         [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
 
     if ([frame parentFrame] == nil) {
         [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",


@@ -354,19 +401,29 @@ float CYScrollViewDecelerationRateNormal;
     }
 }
 
     }
 }
 

-- (void) pushRequest:(NSURLRequest *)request asPop:(bool)pop {
+- (void) pushRequest:(NSURLRequest *)request forAction:(NSDictionary *)action asPop:(bool)pop {
+    WebFrame *frame(nil);
+    if (NSDictionary *WebActionElement = [action objectForKey:@"WebActionElementKey"])
+        frame = [WebActionElement objectForKey:@"WebElementFrame"];
+    if (frame == nil)
+        frame = [[[[self webView] _documentView] webView] mainFrame];
+
+    WebDataSource *source([frame provisionalDataSource] ?: [frame dataSource]);
+    NSString *referrer([request valueForHTTPHeaderField:@"Referer"] ?: [[[source request] URL] absoluteString]);
+

     NSURL *url([request URL]);
 
     // XXX: filter to internal usage?
     NSURL *url([request URL]);
 
     // XXX: filter to internal usage?

-    CyteViewController *page([delegate_ pageForURL:url forExternal:NO]);
+    CyteViewController *page([delegate_ pageForURL:url forExternal:NO withReferrer:referrer]);

 
     if (page == nil) {
         CyteWebViewController *browser([[[class_ alloc] init] autorelease]);
 
     if (page == nil) {
         CyteWebViewController *browser([[[class_ alloc] init] autorelease]);

-        [browser loadRequest:request];
+        [browser setRequest:request];

         page = browser;
     }
 
     [page setDelegate:delegate_];
         page = browser;
     }
 
     [page setDelegate:delegate_];

+    [page setPageColor:color_];

 
     if (!pop) {
         [[self navigationItem] setTitle:title_];
 
     if (!pop) {
         [[self navigationItem] setTitle:title_];


@@ -384,8 +441,6 @@ float CYScrollViewDecelerationRateNormal;
             action:@selector(close)
         ] autorelease]];
 
             action:@selector(close)
         ] autorelease]];
 

-        [delegate_ unloadData];
-

         [[self navigationController] presentModalViewController:navigation animated:YES];
     }
 }
         [[self navigationController] presentModalViewController:navigation animated:YES];
     }
 }


@@ -393,7 +448,11 @@ float CYScrollViewDecelerationRateNormal;
 // CyteWebViewDelegate {{{
 - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message {
 #if LogMessages
 // CyteWebViewDelegate {{{
 - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message {
 #if LogMessages

-    static Pcre irritating("^(?:The page at .* displayed insecure content from .*\\.|Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\.)\\n$");
+    static Pcre irritating("^(?"
+        ":" "The page at .* displayed insecure content from .*\\."
+        "|" "Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\."
+    ")\\n$");
+

     if (NSString *data = [message objectForKey:@"message"])
         if (irritating(data))
             return;
     if (NSString *data = [message objectForKey:@"message"])
         if (irritating(data))
             return;


@@ -404,47 +463,81 @@ float CYScrollViewDecelerationRateNormal;
 
 - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
 #if LogBrowser
 
 - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
 #if LogBrowser

-    NSLog(@"decidePolicyForNavigationAction:%@ request:%@ frame:%@", action, request, frame);
+    NSLog(@"decidePolicyForNavigationAction:%@ request:%@ %@ frame:%@", action, request, [request allHTTPHeaderFields], frame);

 #endif
 
     if ([frame parentFrame] == nil) {
         if (!error_) {
             NSURL *url(request == nil ? nil : [request URL]);
 
 #endif
 
     if ([frame parentFrame] == nil) {
         if (!error_) {
             NSURL *url(request == nil ? nil : [request URL]);
 

-            if (request_ == nil || [self allowsNavigationAction] || [[request_ URL] isEqual:url])
-                request_ = request;
-            else {
+            if (request_ != nil && ![[request_ URL] isEqual:url] && ![self allowsNavigationAction]) {

                 if (url != nil)
                 if (url != nil)

-                    [self pushRequest:request asPop:NO];
+                    [self pushRequest:request forAction:action asPop:NO];

                 [listener ignore];
             }
         }
     }
 }
 
                 [listener ignore];
             }
         }
     }
 }
 

-- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
+- (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
+#if LogBrowser
+    NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);
+#endif
+
+    if ([frame parentFrame] == nil) {
+        switch (decision) {
+            case CYWebPolicyDecisionIgnore:
+                if ([[request_ URL] isEqual:[request URL]])
+                    request_ = nil;
+            break;
+
+            case CYWebPolicyDecisionUse:
+                if (!error_)
+                    request_ = request;
+            break;
+
+            default:
+            break;
+        }
+    }
+}
+
+- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener {

 #if LogBrowser
 #if LogBrowser

-    NSLog(@"decidePolicyForNewWindowAction:%@ request:%@ newFrameName:%@", action, request, frame);
+    NSLog(@"decidePolicyForNewWindowAction:%@ request:%@ %@ newFrameName:%@", action, request, [request allHTTPHeaderFields], name);

 #endif
 
     NSURL *url([request URL]);
     if (url == nil)
         return;
 
 #endif
 
     NSURL *url([request URL]);
     if (url == nil)
         return;
 

-    if ([frame isEqualToString:@"_open"])
+    if ([name isEqualToString:@"_open"])

         [delegate_ openURL:url];
     else {
         NSString *scheme([[url scheme] lowercaseString]);
         if ([scheme isEqualToString:@"mailto"])
             [self _openMailToURL:url];
         else
         [delegate_ openURL:url];
     else {
         NSString *scheme([[url scheme] lowercaseString]);
         if ([scheme isEqualToString:@"mailto"])
             [self _openMailToURL:url];
         else

-            [self pushRequest:request asPop:[frame isEqualToString:@"_popup"]];
+            [self pushRequest:request forAction:action asPop:[name isEqualToString:@"_popup"]];

     }
 
     [listener ignore];
 }
 
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     }
 
     [listener ignore];
 }
 
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {

+#if LogBrowser
+    NSLog(@"didClearWindowObject:%@ forFrame:%@", window, frame);
+#endif
+}
+
+- (void) webView:(WebView *)view didCommitLoadForFrame:(WebFrame *)frame {
+#if LogBrowser
+    NSLog(@"didCommitLoadForFrame:%@", frame);
+#endif
+
+    if ([frame parentFrame] == nil) {
+        loaded_ = true;
+    }

 }
 
 - (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {


@@ -464,11 +557,14 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame {

-    [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
+    NSValue *object([NSValue valueWithNonretainedObject:frame]);
+    if (![loading_ containsObject:object])
+        return;
+    [loading_ removeObject:object];

 
     if ([frame parentFrame] == nil) {
         if (DOMDocument *document = [frame DOMDocument])
 
     if ([frame parentFrame] == nil) {
         if (DOMDocument *document = [frame DOMDocument])

-            if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
+            if (DOMNodeList *bodies = [document getElementsByTagName:@"body"])

                 for (DOMHTMLBodyElement *body in (id) bodies) {
                     DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
 
                 for (DOMHTMLBodyElement *body in (id) bodies) {
                     DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
 


@@ -483,9 +579,7 @@ float CYScrollViewDecelerationRateNormal;
                             float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
                             float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
 
                             float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
                             float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
 

-                            if (red == 0xc7 && green == 0xce && blue == 0xd5)
-                                uic = [UIColor pinStripeColor];
-                            else if (alpha != 0)
+                            if (alpha == 1)

                                 uic = [UIColor
                                     colorWithRed:(red / 255)
                                     green:(green / 255)
                                 uic = [UIColor
                                     colorWithRed:(red / 255)
                                     green:(green / 255)


@@ -495,7 +589,8 @@ float CYScrollViewDecelerationRateNormal;
                         }
                     }
 
                         }
                     }
 

-                    [scroller_ setBackgroundColor:(uic ?: [UIColor clearColor])];
+                    [self setPageColor:uic];
+                    [scroller_ setBackgroundColor:color_];

                     break;
                 }
     }
                     break;
                 }
     }


@@ -507,23 +602,32 @@ float CYScrollViewDecelerationRateNormal;
     if ([frame parentFrame] != nil)
         return;
 
     if ([frame parentFrame] != nil)
         return;
 

-    if (title_ != nil)
-        [title_ autorelease];
-    title_ = [title retain];
+    title_ = title;

 
     [[self navigationItem] setTitle:title_];
 }
 
 - (void) webView:(WebView *)view didStartProvisionalLoadForFrame:(WebFrame *)frame {
 
     [[self navigationItem] setTitle:title_];
 }
 
 - (void) webView:(WebView *)view didStartProvisionalLoadForFrame:(WebFrame *)frame {

+#if LogBrowser
+    NSLog(@"didStartProvisionalLoadForFrame:%@", frame);
+#endif
+

     [loading_ addObject:[NSValue valueWithNonretainedObject:frame]];
 
     if ([frame parentFrame] == nil) {
     [loading_ addObject:[NSValue valueWithNonretainedObject:frame]];
 
     if ([frame parentFrame] == nil) {

-        CYRelease(title_);
+        title_ = nil;

         custom_ = nil;
         style_ = nil;
         function_ = nil;
 
         custom_ = nil;
         style_ = nil;
         function_ = nil;
 

+        [registered_ removeAllObjects];
+        timer_ = nil;
+
+        allowsNavigationAction_ = true;
+

         [self setHidesNavigationBar:NO];
         [self setHidesNavigationBar:NO];

+        [self setScrollAlwaysBounceVertical:true];
+        [self setScrollIndicatorStyle:UIScrollViewIndicatorStyleDefault];

 
         // XXX: do we still need to do this?
         [[self navigationItem] setTitle:nil];
 
         // XXX: do we still need to do this?
         [[self navigationItem] setTitle:nil];


@@ -558,7 +662,7 @@ float CYScrollViewDecelerationRateNormal;
 // }}}
 
 - (void) close {
 // }}}
 
 - (void) close {

-    [[self navigationController] dismissModalViewControllerAnimated:YES];
+    [[[self navigationController] parentOrPresentingViewController] dismissModalViewControllerAnimated:YES];

 }
 
 - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
 }
 
 - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {


@@ -596,7 +700,6 @@ float CYScrollViewDecelerationRateNormal;
             _nodefault
         }
 
             _nodefault
         }
 

-        [challenge_ release];

         challenge_ = nil;
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
         challenge_ = nil;
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];


@@ -605,7 +708,7 @@ float CYScrollViewDecelerationRateNormal;
         } else if (button == [alert firstOtherButtonIndex]) {
             if (request_ != nil) {
                 WebThreadLocked lock;
         } else if (button == [alert firstOtherButtonIndex]) {
             if (request_ != nil) {
                 WebThreadLocked lock;

-                [webview_ loadRequest:request_];
+                [[self webView] loadRequest:request_];

             }
         }
 
             }
         }
 


@@ -626,7 +729,7 @@ float CYScrollViewDecelerationRateNormal;
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)
         return nil;
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)
         return nil;

-    else if (custom_ == [NSNull null])
+    else if ((/*clang:*/id) custom_ == [NSNull null])

         return (UIBarButtonItem *) [NSNull null];
 
     return [[[UIBarButtonItem alloc]
         return (UIBarButtonItem *) [NSNull null];
 
     return [[[UIBarButtonItem alloc]


@@ -643,7 +746,7 @@ float CYScrollViewDecelerationRateNormal;
         return nil;
 
     if (UINavigationController *navigation = [self navigationController])
         return nil;
 
     if (UINavigationController *navigation = [self navigationController])

-        if ([[navigation parentViewController] modalViewController] == navigation)
+        if ([[navigation parentOrPresentingViewController] modalViewController] == navigation)

             return [[[UIBarButtonItem alloc]
                 initWithTitle:UCLocalize("CLOSE")
                 style:UIBarButtonItemStylePlain
             return [[[UIBarButtonItem alloc]
                 initWithTitle:UCLocalize("CLOSE")
                 style:UIBarButtonItemStylePlain


@@ -687,7 +790,7 @@ float CYScrollViewDecelerationRateNormal;
         else if (button == (UIBarButtonItem *) [NSNull null])
             button = nil;
 
         else if (button == (UIBarButtonItem *) [NSNull null])
             button = nil;
 

-        [[self navigationItem] setRightBarButtonItem:button];
+        [[self navigationItem] setRightBarButtonItem:button animated:YES];

     }
 }
 
     }
 }
 


@@ -701,7 +804,9 @@ float CYScrollViewDecelerationRateNormal;
     if ([loading_ count] != 1)
         return;
 
     if ([loading_ count] != 1)
         return;
 

-    [delegate_ retainNetworkActivityIndicator];
+    if ([self retainsNetworkActivityIndicator])
+        [delegate_ retainNetworkActivityIndicator];
+

     [self didStartLoading];
 }
 
     [self didStartLoading];
 }
 


@@ -716,7 +821,9 @@ float CYScrollViewDecelerationRateNormal;
     [self applyRightButton];
     [[self navigationItem] setTitle:title_];
 
     [self applyRightButton];
     [[self navigationItem] setTitle:title_];
 

-    [delegate_ releaseNetworkActivityIndicator];
+    if ([self retainsNetworkActivityIndicator])
+        [delegate_ releaseNetworkActivityIndicator];
+

     [self didFinishLoading];
 }
 
     [self didFinishLoading];
 }
 


@@ -726,118 +833,152 @@ float CYScrollViewDecelerationRateNormal;
 
 - (id) initWithWidth:(float)width ofClass:(Class)_class {
     if ((self = [super init]) != nil) {
 
 - (id) initWithWidth:(float)width ofClass:(Class)_class {
     if ((self = [super init]) != nil) {

+        width_ = width;
+        class_ = _class;
+
+        [self setPageColor:nil];
+

         allowsNavigationAction_ = true;
 
         allowsNavigationAction_ = true;
 

-        class_ = _class;
-        loading_ = [[NSMutableSet alloc] initWithCapacity:5];
+        loading_ = [NSMutableSet setWithCapacity:5];
+        registered_ = [NSMutableSet setWithCapacity:5];
+        indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];

 
 

-        indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
+        reloaditem_ = [[[UIBarButtonItem alloc]
+            initWithTitle:UCLocalize("RELOAD")
+            style:[self rightButtonStyle]
+            target:self
+            action:@selector(reloadButtonClicked)
+        ] autorelease];

 
 

-        CGRect bounds([[self view] bounds]);
+        loadingitem_ = [[[UIBarButtonItem alloc]
+            initWithTitle:(kCFCoreFoundationVersionNumber >= 800 ? @"       " : @" ")
+            style:UIBarButtonItemStylePlain
+            target:self
+            action:@selector(reloadButtonClicked)
+        ] autorelease];

 
 

-        webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease];
-        [webview_ setDelegate:self];
-        [self setView:webview_];
+        UIActivityIndicatorViewStyle style;
+        float left;
+        if (kCFCoreFoundationVersionNumber >= 800) {
+            style = UIActivityIndicatorViewStyleGray;
+            left = 7;
+        } else {
+            style = UIActivityIndicatorViewStyleWhite;
+            left = 15;
+        }

 
 

-        if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)])
-            [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic];
-        else
-            [webview_ setDetectsPhoneNumbers:NO];
+        indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:style] autorelease];
+        [indicator_ setFrame:CGRectMake(left, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)];
+        [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
+
+        [self applyLeftButton];
+        [self applyRightButton];
+    } return self;
+}
+
+- (NSString *) applicationNameForUserAgent {
+    return nil;
+}

 
 

-        [webview_ setScalesPageToFit:YES];
+- (void) loadView {
+    CGRect bounds([[UIScreen mainScreen] applicationFrame]);

 
 

-        UIWebDocumentView *document([webview_ _documentView]);
+    webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease];
+    [webview_ setDelegate:self];
+    [self setView:webview_];

 
 

-        // XXX: I think this improves scrolling; the hardcoded-ness sucks
-        [document setTileSize:CGSizeMake(320, 500)];
+    if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)])
+        [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic];
+    else
+        [webview_ setDetectsPhoneNumbers:NO];
+
+    [webview_ setScalesPageToFit:YES];

 
 

-        [document setBackgroundColor:[UIColor clearColor]];
+    UIWebDocumentView *document([webview_ _documentView]);

 
 

-        // XXX: this is terribly (too?) expensive
-        [document setDrawsBackground:NO];
+    // XXX: I think this improves scrolling; the hardcoded-ness sucks
+    [document setTileSize:CGSizeMake(320, 500)];

 
 

-        WebView *webview([document webView]);
-        WebPreferences *preferences([webview preferences]);
+    WebView *webview([document webView]);
+    WebPreferences *preferences([webview preferences]);

 
 

-        // XXX: I have no clue if I actually /want/ this modification
-        if ([webview respondsToSelector:@selector(_setLayoutInterval:)])
-            [webview _setLayoutInterval:0];
-        else if ([preferences respondsToSelector:@selector(_setLayoutInterval:)])
-            [preferences _setLayoutInterval:0];
+    // XXX: I have no clue if I actually /want/ this modification
+    if ([webview respondsToSelector:@selector(_setLayoutInterval:)])
+        [webview _setLayoutInterval:0];
+    else if ([preferences respondsToSelector:@selector(_setLayoutInterval:)])
+        [preferences _setLayoutInterval:0];

 
 

-        [preferences setCacheModel:WebCacheModelDocumentBrowser];
+    [preferences setCacheModel:WebCacheModelDocumentBrowser];
+    [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+
+    if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)])

         [preferences setOfflineWebApplicationCacheEnabled:YES];
 
         [preferences setOfflineWebApplicationCacheEnabled:YES];
 

+    if (NSString *agent = [self applicationNameForUserAgent])
+        [webview setApplicationNameForUserAgent:agent];
+
+    if ([webview respondsToSelector:@selector(setShouldUpdateWhileOffscreen:)])
+        [webview setShouldUpdateWhileOffscreen:NO];
+

 #if LogMessages
 #if LogMessages

-        if ([document respondsToSelector:@selector(setAllowsMessaging:)])
-            [document setAllowsMessaging:YES];
-        if ([webview respondsToSelector:@selector(_setAllowsMessaging:)])
-            [webview _setAllowsMessaging:YES];
+    if ([document respondsToSelector:@selector(setAllowsMessaging:)])
+        [document setAllowsMessaging:YES];
+    if ([webview respondsToSelector:@selector(_setAllowsMessaging:)])
+        [webview _setAllowsMessaging:YES];

 #endif
 
 #endif
 

-        if ([webview_ respondsToSelector:@selector(_scrollView)]) {
-            scroller_ = [webview_ _scrollView];
+    if ([webview_ respondsToSelector:@selector(_scrollView)]) {
+        scroller_ = [webview_ _scrollView];

 
 

-            [scroller_ setDirectionalLockEnabled:YES];
-            [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal];
-            [scroller_ setDelaysContentTouches:NO];
+        [scroller_ setDirectionalLockEnabled:YES];
+        [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal];
+        [scroller_ setDelaysContentTouches:NO];

 
 

-            [scroller_ setCanCancelContentTouches:YES];
-        } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
-            UIScroller *scroller([webview_ _scroller]);
-            scroller_ = (UIScrollView *) scroller;
+        [scroller_ setCanCancelContentTouches:YES];
+    } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
+        UIScroller *scroller([webview_ _scroller]);
+        scroller_ = (UIScrollView *) scroller;

 
 

-            [scroller setDirectionalScrolling:YES];
-            // XXX: we might be better off /not/ setting this on older systems
-            [scroller setScrollDecelerationFactor:CYScrollViewDecelerationRateNormal]; /* 0.989324 */
-            [scroller setScrollHysteresis:0]; /* 8 */
+        [scroller setDirectionalScrolling:YES];
+        // XXX: we might be better off /not/ setting this on older systems
+        [scroller setScrollDecelerationFactor:CYScrollViewDecelerationRateNormal]; /* 0.989324 */
+        [scroller setScrollHysteresis:0]; /* 8 */

 
 

-            [scroller setThumbDetectionEnabled:NO];
+        [scroller setThumbDetectionEnabled:NO];

 
 

-            // use NO with UIApplicationUseLegacyEvents(YES)
-            [scroller setEventMode:YES];
+        // use NO with UIApplicationUseLegacyEvents(YES)
+        [scroller setEventMode:YES];

 
 

-            // XXX: this is handled by setBounces, right?
-            //[scroller setAllowsRubberBanding:YES];
-        }
+        // XXX: this is handled by setBounces, right?
+        //[scroller setAllowsRubberBanding:YES];
+    }

 
 

-        [scroller_ setFixedBackgroundPattern:YES];
-        [scroller_ setBackgroundColor:[UIColor clearColor]];
-        [scroller_ setClipsSubviews:YES];
+    [webview_ setOpaque:NO];
+    [webview_ setBackgroundColor:color_];

 
 

-        [scroller_ setBounces:YES];
-        [scroller_ setScrollingEnabled:YES];
-        [scroller_ setShowBackgroundShadow:NO];
+    [scroller_ setFixedBackgroundPattern:YES];
+    [scroller_ setBackgroundColor:color_];
+    [scroller_ setClipsSubviews:YES];

 
 

-        [self setViewportWidth:width];
+    [scroller_ setBounces:YES];
+    [scroller_ setScrollingEnabled:YES];
+    [scroller_ setShowBackgroundShadow:NO];

 
 

-        reloaditem_ = [[UIBarButtonItem alloc]
-            initWithTitle:UCLocalize("RELOAD")
-            style:[self rightButtonStyle]
-            target:self
-            action:@selector(reloadButtonClicked)
-        ];
+    [self setViewportWidth:width_];

 
 

-        loadingitem_ = [[UIBarButtonItem alloc]
-            initWithTitle:@" "
-            style:UIBarButtonItemStylePlain
-            target:self
-            action:@selector(reloadButtonClicked)
-        ];
+    [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];

 
 

-        indicator_ = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; 
-        [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)];
+    ready_ = false;
+}

 
 

-        UITableView *table([[[UITableView alloc] initWithFrame:bounds style:UITableViewStyleGrouped] autorelease]);
-        [webview_ insertSubview:table atIndex:0];
+- (void) releaseSubviews {
+    webview_ = nil;
+    scroller_ = nil;

 
 

-        [self applyLeftButton];
-        [self applyRightButton];
+    [self releaseNetworkActivityIndicator];

 
 

-        [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
-        [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
-        [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
-    } return self;
+    [super releaseSubviews];

 }
 
 - (id) initWithWidth:(float)width {
 }
 
 - (id) initWithWidth:(float)width {


@@ -854,44 +995,26 @@ float CYScrollViewDecelerationRateNormal;
     } return self;
 }
 
     } return self;
 }
 

+- (id) initWithRequest:(NSURLRequest *)request {
+    if ((self = [self init]) != nil) {
+        [self setRequest:request];
+    } return self;
+}
+

 - (void) callFunction:(WebScriptObject *)function {
     WebThreadLocked lock;
 
 - (void) callFunction:(WebScriptObject *)function {
     WebThreadLocked lock;
 

-    WebView *webview([[webview_ _documentView] webView]);
+    WebView *webview([[[self webView] _documentView] webView]);

     WebFrame *frame([webview mainFrame]);
     WebFrame *frame([webview mainFrame]);

-    WebPreferences *preferences([webview preferences]);
-
-    bool maybe([preferences javaScriptCanOpenWindowsAutomatically]);
-    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
-
-    /*id _private(MSHookIvar<id>(webview, "_private"));
-    WebCore::Page *page(_private == nil ? NULL : MSHookIvar<WebCore::Page *>(_private, "page"));
-    WebCore::Settings *settings(page == NULL ? NULL : page->settings());
-
-    bool no;
-    if (settings == NULL)
-        no = 0;
-    else {
-        no = settings->JavaScriptCanOpenWindowsAutomatically();
-        settings->setJavaScriptCanOpenWindowsAutomatically(true);
-    }*/
-
-    if (UIWindow *window = [[self view] window])
-        if (UIResponder *responder = [window firstResponder])
-            [responder resignFirstResponder];

 
 

-    JSObjectRef object([function JSObject]);

     JSGlobalContextRef context([frame globalContext]);
     JSGlobalContextRef context([frame globalContext]);

-    JSObjectCallAsFunction(context, object, NULL, 0, NULL, NULL);
-
-    /*if (settings != NULL)
-        settings->setJavaScriptCanOpenWindowsAutomatically(no);*/
-
-    [preferences setJavaScriptCanOpenWindowsAutomatically:maybe];
+    JSObjectRef object([function JSObject]);
+    if ($JSObjectCallAsFunction != NULL)
+        ($JSObjectCallAsFunction)(context, object, NULL, 0, NULL, NULL);

 }
 
 - (void) reloadButtonClicked {
 }
 
 - (void) reloadButtonClicked {

-    [self reloadURLWithCache:YES];
+    [self reloadURLWithCache:NO];

 }
 
 - (void) _customButtonClicked {
 }
 
 - (void) _customButtonClicked {


@@ -939,7 +1062,7 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) dispatchEvent:(NSString *)event {
 }
 
 - (void) dispatchEvent:(NSString *)event {

-    [webview_ dispatchEvent:event];
+    [[self webView] dispatchEvent:event];

 }
 
 - (bool) hidesNavigationBar {
 }
 
 - (bool) hidesNavigationBar {


@@ -962,12 +1085,54 @@ float CYScrollViewDecelerationRateNormal;
     [self setHidesNavigationBar:[value boolValue]];
 }
 
     [self setHidesNavigationBar:[value boolValue]];
 }
 

+- (void) setScrollAlwaysBounceVertical:(bool)value {
+    if ([webview_ respondsToSelector:@selector(_scrollView)]) {
+        UIScrollView *scroller([webview_ _scrollView]);
+        [scroller setAlwaysBounceVertical:value];
+    } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
+        //UIScroller *scroller([webview_ _scroller]);
+        // XXX: I am sad here.
+    } else return;
+}
+
+- (void) setScrollAlwaysBounceVerticalNumber:(NSNumber *)value {
+    [self setScrollAlwaysBounceVertical:[value boolValue]];
+}
+
+- (void) setScrollIndicatorStyle:(UIScrollViewIndicatorStyle)style {
+    if ([webview_ respondsToSelector:@selector(_scrollView)]) {
+        UIScrollView *scroller([webview_ _scrollView]);
+        [scroller setIndicatorStyle:style];
+    } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
+        UIScroller *scroller([webview_ _scroller]);
+        [scroller setScrollerIndicatorStyle:style];
+    } else return;
+}
+
+- (void) setScrollIndicatorStyleWithName:(NSString *)style {
+    UIScrollViewIndicatorStyle value;
+
+    if (false);
+    else if ([style isEqualToString:@"default"])
+        value = UIScrollViewIndicatorStyleDefault;
+    else if ([style isEqualToString:@"black"])
+        value = UIScrollViewIndicatorStyleBlack;
+    else if ([style isEqualToString:@"white"])
+        value = UIScrollViewIndicatorStyleWhite;
+    else return;
+
+    [self setScrollIndicatorStyle:value];
+}
+

 - (void) viewWillAppear:(BOOL)animated {
     visible_ = true;
 
     if ([self hidesNavigationBar])
         [self _setHidesNavigationBar:YES animated:animated];
 
 - (void) viewWillAppear:(BOOL)animated {
     visible_ = true;
 
     if ([self hidesNavigationBar])
         [self _setHidesNavigationBar:YES animated:animated];
 

+    // XXX: why isn't this evern called automatically?
+    [[self webView] setNeedsLayout];
+

     [self dispatchEvent:@"CydiaViewWillAppear"];
     [super viewWillAppear:animated];
 }
     [self dispatchEvent:@"CydiaViewWillAppear"];
     [super viewWillAppear:animated];
 }


@@ -992,4 +1157,16 @@ float CYScrollViewDecelerationRateNormal;
     [self dispatchEvent:@"CydiaViewDidDisappear"];
 }
 
     [self dispatchEvent:@"CydiaViewDidDisappear"];
 }
 

+- (void) updateHeights:(NSTimer *)timer {
+    for (WebFrame *frame in (id) registered_)
+        [frame cydia$updateHeight];
+}
+
+- (void) registerFrame:(WebFrame *)frame {
+    [registered_ addObject:frame];
+
+    if (timer_ == nil)
+        timer_ = [NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(updateHeights:) userInfo:nil repeats:YES];
+}
+

 @end
 @end