Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (186123 => 186124)
--- trunk/Source/WebKit/mac/ChangeLog 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-30 18:26:01 UTC (rev 186124)
@@ -1,3 +1,18 @@
+2015-06-30 Anders Carlsson <[email protected]>
+
+ Remove the WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS ifdefs now that this is always true
+ https://bugs.webkit.org/show_bug.cgi?id=146462
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebDownload.h:
+ * WebView/WebFrameLoadDelegate.h:
+ * WebView/WebPolicyDelegate.h:
+ * WebView/WebResourceLoadDelegate.h:
+ * WebView/WebUIDelegate.h:
+ * WebView/WebView.h:
+ * postprocess-headers.sh:
+
2015-06-29 Anders Carlsson <[email protected]>
Get rid of unused WKSI functions
Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (186123 => 186124)
--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-06-30 18:26:01 UTC (rev 186124)
@@ -69,12 +69,6 @@
@optional
-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebDownloadDelegate)
-#endif
-
/*!
@method downloadWindowForAuthenticationSheet:
@abstract
Modified: trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h (186123 => 186124)
--- trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2015-06-30 18:26:01 UTC (rev 186124)
@@ -54,12 +54,6 @@
@optional
-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebFrameLoadDelegate)
-#endif
-
/*!
@method webView:didStartProvisionalLoadForFrame:
@abstract Notifies the delegate that the provisional load of a frame has started
Modified: trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h (186123 => 186124)
--- trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2015-06-30 18:26:01 UTC (rev 186124)
@@ -141,12 +141,6 @@
@optional
-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebPolicyDelegate)
-#endif
-
/*!
@method webView:decidePolicyForNavigationAction:request:frame:decisionListener:
@abstract This method is called to decide what to do with a proposed navigation.
Modified: trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h (186123 => 186124)
--- trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h 2015-06-30 18:26:01 UTC (rev 186124)
@@ -47,12 +47,6 @@
@optional
-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebResourceLoadDelegate)
-#endif
-
/*!
@method webView:identifierForInitialRequest:fromDataSource:
@param webView The WebView sending the message.
Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegate.h (186123 => 186124)
--- trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2015-06-30 18:26:01 UTC (rev 186124)
@@ -164,12 +164,6 @@
@optional
-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebUIDelegate)
-#endif
-
/*!
@method webView:createWebViewWithRequest:
@abstract Create a new window and begin to load the specified request.
Modified: trunk/Source/WebKit/mac/WebView/WebView.h (186123 => 186124)
--- trunk/Source/WebKit/mac/WebView/WebView.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2015-06-30 18:26:01 UTC (rev 186124)
@@ -54,13 +54,11 @@
@class WebScriptObject;
@class WebViewPrivate;
-#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
@protocol WebDownloadDelegate;
@protocol WebFrameLoadDelegate;
@protocol WebPolicyDelegate;
@protocol WebResourceLoadDelegate;
@protocol WebUIDelegate;
-#endif
// Element dictionary keys
extern NSString *WebElementDOMNodeKey; // DOMNode of the element
@@ -230,51 +228,31 @@
@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
Modified: trunk/Source/WebKit/mac/postprocess-headers.sh (186123 => 186124)
--- trunk/Source/WebKit/mac/postprocess-headers.sh 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/postprocess-headers.sh 2015-06-30 18:26:01 UTC (rev 186124)
@@ -13,11 +13,11 @@
fi
if [[ ${PLATFORM_NAME} == macosx ]]; then
- unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0 -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
+ unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0";
elif [[ ${PLATFORM_NAME} == *simulator* ]]; then
- unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK} -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
+ unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK}";
else
- unifdefOptions="-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK} -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
+ unifdefOptions="-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK}";
fi
# FIXME: We should consider making this logic general purpose so as to support keeping or removing
