X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/fe2d3954ad019bc5f3d8d18a40c4b3ae66c76c96..680a3c3c74c8badbc3a73f33f44eceedfe8539ff:/CyteKit/WebViewController.h

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index 95724872..c2e64d53 100644
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -46,14 +46,14 @@
 #include <UIKit/UIKit.h>
 #include <MessageUI/MessageUI.h>
 
-#include <CydiaSubstrate/CydiaSubstrate.h>
+#include <Menes/ObjectHandle.h>
 
 @class IndirectDelegate;
 
 @protocol CyteWebViewControllerDelegate
 - (void) retainNetworkActivityIndicator;
 - (void) releaseNetworkActivityIndicator;
-- (CyteViewController *) pageForURL:(NSURL *)url forExternal:(BOOL)external;
+- (CyteViewController *) pageForURL:(NSURL *)url forExternal:(BOOL)external withReferrer:(NSString *)referrer;
 - (void) unloadData;
 @end
 
@@ -62,23 +62,21 @@
     MFMailComposeViewControllerDelegate,
     UIWebViewDelegate
 > {
-    _transient CyteWebView *webview_;
+    _H<CyteWebView, 1> webview_;
     _transient UIScrollView *scroller_;
 
-    UIActivityIndicatorView *indicator_;
-    IndirectDelegate *indirect_;
-    NSURLAuthenticationChallenge *challenge_;
+    _H<UIActivityIndicatorView> indicator_;
+    _H<IndirectDelegate, 1> indirect_;
+    _H<NSURLAuthenticationChallenge> challenge_;
 
     bool error_;
     _H<NSURLRequest> request_;
-
-    _H<NSURLRequest> stage1_;
-    _H<NSURLRequest> stage2_;
+    bool ready_;
 
     _transient NSNumber *sensitive_;
 
-    NSString *title_;
-    NSMutableSet *loading_;
+    _H<NSString> title_;
+    _H<NSMutableSet> loading_;
 
     // XXX: NSString * or UIImage *
     _H<NSObject> custom_;
@@ -89,8 +87,8 @@
     float width_;
     Class class_;
 
-    UIBarButtonItem *reloaditem_;
-    UIBarButtonItem *loadingitem_;
+    _H<UIBarButtonItem> reloaditem_;
+    _H<UIBarButtonItem> loadingitem_;
 
     bool visible_;
     bool hidesNavigationBar_;
@@ -99,7 +97,11 @@
 
 + (void) _initialize;
 
+- (CyteWebView *) webView;
+
+- (void) setRequest:(NSURLRequest *)request;
 - (void) setURL:(NSURL *)url;
+- (void) setURL:(NSURL *)url withReferrer:(NSString *)referrer;
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
@@ -111,7 +113,10 @@
 - (void) reloadURL;
 
 - (id) init;
+
 - (id) initWithURL:(NSURL *)url;
+- (id) initWithRequest:(NSURLRequest *)request;
+
 - (id) initWithWidth:(float)width;
 - (id) initWithWidth:(float)width ofClass:(Class)_class;
 
@@ -145,6 +150,9 @@
 
 - (void) setViewportWidthOnMainThread:(float)value;
 
+- (void) setScrollAlwaysBounceVertical:(bool)value;
+- (void) setScrollIndicatorStyle:(UIScrollViewIndicatorStyle)style;
+
 @end
 
 #endif//CyteKit_WebViewController_H