Commit 323e9bf1 authored by mrowe@apple.com's avatar mrowe@apple.com
Browse files

Decorate some deprecated delegate methods with the availability macros.

The compiler doesn't appear to warn if a delegate implements these methods, but using the availability
macros is good for consistency and documentation.

Reviewed by Tim Hatcher.

* WebView/WebFrameLoadDelegate.h:
* WebView/WebUIDelegate.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@33055 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fd8c02f0
2008-05-12 Mark Rowe <mrowe@apple.com>
Reviewed by Tim Hatcher.
Decorate some deprecated delegate methods with the availability macros.
The compiler doesn't appear to warn if a delegate implements these methods, but using the availability
macros is good for consistency and documentation.
* WebView/WebFrameLoadDelegate.h:
* WebView/WebUIDelegate.h:
2008-05-12 Mark Rowe <mrowe@apple.com>
Reviewed by Tim Hatcher.
......
......@@ -27,6 +27,7 @@
*/
#import <Cocoa/Cocoa.h>
#import <JavaScriptCore/WebKitAvailability.h>
@class NSError;
@class WebFrame;
......@@ -191,6 +192,6 @@
@discussion This method is deprecated. Consider using webView:didClearWindowObject:forFrame:
instead.
*/
- (void)webView:(WebView *)webView windowScriptObjectAvailable:(WebScriptObject *)windowScriptObject;
- (void)webView:(WebView *)webView windowScriptObjectAvailable:(WebScriptObject *)windowScriptObject AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0;
@end
......@@ -28,6 +28,7 @@
#import <Cocoa/Cocoa.h>
#import <Foundation/NSURLRequest.h>
#import <JavaScriptCore/WebKitAvailability.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
#define WebNSUInteger unsigned int
......@@ -543,13 +544,13 @@ typedef enum {
// The following delegate methods are deprecated in favor of the ones above that specify
// the WebFrame whose JavaScript initiated this call.
- (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message;
- (BOOL)webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message;
- (NSString *)webView:(WebView *)sender runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
- (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0;
- (BOOL)webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0;
- (NSString *)webView:(WebView *)sender runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0;
// The following delegate methods are deprecated. Content rect calculations are now done automatically.
- (void)webView:(WebView *)sender setContentRect:(NSRect)frame;
- (NSRect)webViewContentRect:(WebView *)sender;
- (void)webView:(WebView *)sender setContentRect:(NSRect)frame AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0;
- (NSRect)webViewContentRect:(WebView *)sender AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0;
@end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment