Title: [179183] trunk/Source/WebKit/mac
- Revision
- 179183
- Author
- [email protected]
- Date
- 2015-01-27 08:17:04 -0800 (Tue, 27 Jan 2015)
Log Message
Make it easy to test enabling formal delegate protocols
https://bugs.webkit.org/show_bug.cgi?id=140892
Reviewed by Dan Bernstein.
Add an WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS define that controls whether delegates should be formal protocols.
* Misc/WebDownload.h:
* WebView/WebFrameLoadDelegate.h:
* WebView/WebPolicyDelegate.h:
* WebView/WebResourceLoadDelegate.h:
* WebView/WebUIDelegate.h:
* WebView/WebView.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (179182 => 179183)
--- trunk/Source/WebKit/mac/ChangeLog 2015-01-27 16:10:17 UTC (rev 179182)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-27 16:17:04 UTC (rev 179183)
@@ -1,3 +1,19 @@
+2015-01-26 Anders Carlsson <[email protected]>
+
+ Make it easy to test enabling formal delegate protocols
+ https://bugs.webkit.org/show_bug.cgi?id=140892
+
+ Reviewed by Dan Bernstein.
+
+ Add an WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS define that controls whether delegates should be formal protocols.
+
+ * Misc/WebDownload.h:
+ * WebView/WebFrameLoadDelegate.h:
+ * WebView/WebPolicyDelegate.h:
+ * WebView/WebResourceLoadDelegate.h:
+ * WebView/WebUIDelegate.h:
+ * WebView/WebView.h:
+
2015-01-26 Chris Dumez <[email protected]>
Rename Document::body() to Document::bodyOrFrameset() for clarity
Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (179182 => 179183)
--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-01-27 16:10:17 UTC (rev 179182)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-01-27 16:17:04 UTC (rev 179183)
@@ -72,6 +72,12 @@
@optional
+#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
+@end
+
+@interface NSObject (WebDownloadDelegate)
+#endif
+
/*!
@method downloadWindowForAuthenticationSheet:
@abstract
Modified: trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h (179182 => 179183)
--- trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2015-01-27 16:10:17 UTC (rev 179182)
+++ trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2015-01-27 16:17:04 UTC (rev 179183)
@@ -53,9 +53,12 @@
@protocol WebFrameLoadDelegate <NSObject>
@optional
+
+#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
@end
@interface NSObject (WebFrameLoadDelegate)
+#endif
/*!
@method webView:didStartProvisionalLoadForFrame:
Modified: trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h (179182 => 179183)
--- trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2015-01-27 16:10:17 UTC (rev 179182)
+++ trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2015-01-27 16:17:04 UTC (rev 179183)
@@ -140,9 +140,12 @@
@protocol WebPolicyDelegate <NSObject>
@optional
+
+#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
@end
@interface NSObject (WebPolicyDelegate)
+#endif
/*!
@method webView:decidePolicyForNavigationAction:request:frame:decisionListener:
Modified: trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h (179182 => 179183)
--- trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h 2015-01-27 16:10:17 UTC (rev 179182)
+++ trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h 2015-01-27 16:17:04 UTC (rev 179183)
@@ -46,9 +46,12 @@
@protocol WebResourceLoadDelegate <NSObject>
@optional
+
+#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
@end
@interface NSObject (WebResourceLoadDelegate)
+#endif
/*!
@method webView:identifierForInitialRequest:fromDataSource:
Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegate.h (179182 => 179183)
--- trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2015-01-27 16:10:17 UTC (rev 179182)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2015-01-27 16:17:04 UTC (rev 179183)
@@ -163,9 +163,12 @@
@protocol WebUIDelegate <NSObject>
@optional
+
+#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
@end
@interface NSObject (WebUIDelegate)
+#endif
/*!
@method webView:createWebViewWithRequest:
Modified: trunk/Source/WebKit/mac/WebView/WebView.h (179182 => 179183)
--- trunk/Source/WebKit/mac/WebView/WebView.h 2015-01-27 16:10:17 UTC (rev 179182)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2015-01-27 16:17:04 UTC (rev 179183)
@@ -222,31 +222,51 @@
@property UIDelegate
@abstract The WebView's WebUIDelegate.
*/
+#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
+@property (nonatomic, assign) id <WebUIDelegate> UIDelegate;
+#else
@property (nonatomic, assign) id UIDelegate;
+#endif
/*!
@property resourceLoadDelegate
@abstract The WebView's WebResourceLoadDelegate.
*/
+#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
+@property (nonatomic, assign) id <WebResourceLoadDelegate> resourceLoadDelegate;
+#else
@property (nonatomic, assign) id resourceLoadDelegate;
+#endif
/*!
@property downloadDelegate
@abstract The WebView's WebDownloadDelegate.
*/
+#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
+@property (nonatomic, assign) id <WebDownloadDelegate> downloadDelegate;
+#else
@property (nonatomic, assign) id downloadDelegate;
+#endif
/*!
@property frameLoadDelegate
@abstract The WebView's WebFrameLoadDelegate delegate.
*/
+#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
+@property (nonatomic, assign) id <WebFrameLoadDelegate> frameLoadDelegate;
+#else
@property (nonatomic, assign) id frameLoadDelegate;
+#endif
/*!
@property policyDelegate
@abstract The WebView's WebPolicyDelegate.
*/
+#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
+@property (nonatomic, assign) id <WebPolicyDelegate> policyDelegate;
+#else
@property (nonatomic, assign) id policyDelegate;
+#endif
/*!
@property mainFrame
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
