-[BrowserController applyRightButton] must be used from the main thread.

[cydia.git] / UICaboodle / BrowserView.h

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 2f0e4eb7c1bf4f9892c51f961e8fb9ceb86299f3..692704a6562a82a398a0b9586930b8750fed3dfe 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -15,7 +15,6 @@
 @class NSURL;
 @class NSURLRequest;
 
-@class UIProgressIndicator;
 @class UIScroller;
 @class UIDocumentWebView;
 
@@ -25,6 +24,7 @@
 @class IndirectDelegate;
 
 @protocol CYWebViewDelegate <UIWebViewDelegate>
+- (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message;
 - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener;
 - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener;
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;
@@ -38,6 +38,7 @@
 - (bool) webView:(WebView *)view shouldRunJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame;
 - (bool) webView:(WebView *)view shouldRunJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame;
 - (bool) webView:(WebView *)view shouldRunJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)text initiatedByFrame:(WebFrame *)frame;
+- (void) webViewUpdateViewSettings:(UIWebView *)view;
 @end
 
 @interface CYWebView : UIWebView
@@ -50,7 +51,9 @@
 @end
 
 @protocol BrowserControllerDelegate
-- (CYViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;
+- (void) retainNetworkActivityIndicator;
+- (void) releaseNetworkActivityIndicator;
+- (CYViewController *) pageForURL:(NSURL *)url;
 @end
 
 @interface BrowserController : CYViewController <
@@ -58,17 +61,17 @@
     HookProtocol,
     UIWebViewDelegate
 > {
-    CYWebView *webview_;
-    UIScrollView *scroller_;
+    _transient CYWebView *webview_;
+    _transient UIScrollView *scroller_;
 
-    UIProgressIndicator *indicator_;
+    UIActivityIndicatorView *indicator_;
     IndirectDelegate *indirect_;
     NSURLAuthenticationChallenge *challenge_;
 
     bool error_;
     NSURLRequest *request_;
 
-    NSNumber *sensitive_;
+    _transient NSNumber *sensitive_;
 
     NSString *title_;
     NSMutableSet *loading_;
@@ -89,6 +92,8 @@
 
 + (void) _initialize;
 
+- (void) setURL:(NSURL *)url;
+
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
 
@@ -97,6 +102,7 @@
 - (bool) isLoading;
 
 - (id) init;
+- (id) initWithURL:(NSURL *)url;
 - (id) initWithWidth:(float)width;
 - (id) initWithWidth:(float)width ofClass:(Class)_class;
 
@@ -120,4 +126,6 @@
 
 - (void) close;
 
+- (void) dispatchEvent:(NSString *)event;
+
 @end