Make WebKit's public headers on Mac and iOS C++ module safe

https://bugs.webkit.org/show_bug.cgi?id=174175

Reviewed by Alex Christensen.

Fixed the header files.

Source/WebKit/mac:

* Misc/WebDownload.h:
* Misc/WebKitErrors.h:
* Plugins/WebPluginContainer.h:
* WebView/WebResourceLoadDelegate.h:

Source/WebKit2:

* UIProcess/API/Cocoa/WKContentRuleList.h:
* UIProcess/API/Cocoa/WKContentRuleListStore.h:
* UIProcess/API/Cocoa/WKUIDelegate.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219165 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index cb64ec3a2cc9e2e3c69601711cd31b69c474bfc6..0ce2d8f49ab3d76279a71674fb95028d17dda6a3 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2017-07-05  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Make WebKit's public headers on Mac and iOS C++ module safe
+        https://bugs.webkit.org/show_bug.cgi?id=174175
+
+        Reviewed by Alex Christensen.
+
+        Fixed the header files.
+
+        * Misc/WebDownload.h:
+        * Misc/WebKitErrors.h:
+        * Plugins/WebPluginContainer.h:
+        * WebView/WebResourceLoadDelegate.h:
+
 2017-07-03  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Remove copy of ICU headers from WebKit

diff --git a/Source/WebKit/mac/Misc/WebDownload.h b/Source/WebKit/mac/Misc/WebDownload.h
index de921f6f7df663a78cd235c1fee9a614372cc265..d678cd1fcf84ad0bd2916d171c15f0756ff634b8 100644 (file)
--- a/Source/WebKit/mac/Misc/WebDownload.h
+++ b/Source/WebKit/mac/Misc/WebDownload.h
@@ -42,6 +42,7 @@
 #import <WebKitLegacy/WAKAppKitStubs.h>
 #endif
 
+@class NSWindow;
 @class WebDownloadInternal;
 
 /*!

diff --git a/Source/WebKit/mac/Misc/WebKitErrors.h b/Source/WebKit/mac/Misc/WebKitErrors.h
index 33dee6176041464871e38271c3f21912d762cf66..893e3f77c0f278529839c030c9535953ee29c094 100644 (file)
--- a/Source/WebKit/mac/Misc/WebKitErrors.h
+++ b/Source/WebKit/mac/Misc/WebKitErrors.h
@@ -26,6 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+@class NSString;
+
 extern NSString *WebKitErrorDomain;
 
 extern NSString * const WebKitErrorMIMETypeKey;

diff --git a/Source/WebKit/mac/Plugins/WebPluginContainer.h b/Source/WebKit/mac/Plugins/WebPluginContainer.h
index fc109ce38860ae62bf7fec947f1413134cbf82d4..69fc3fefe0a8b09c63c28569b2a27b628bcedfc6 100644 (file)
--- a/Source/WebKit/mac/Plugins/WebPluginContainer.h
+++ b/Source/WebKit/mac/Plugins/WebPluginContainer.h
@@ -30,6 +30,7 @@
 
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
+@class WebFrame;
 #endif
 
 /*!

diff --git a/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h b/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h
index 2773616886bcfe81680acf7bf661590104bf472f..42e12ea7484f5110d8a142a8a74d0c682046e3d8 100644 (file)
--- a/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h
+++ b/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h
@@ -26,12 +26,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import <Foundation/NSObjCRuntime.h>
+
 @class WebView;
 @class WebDataSource;
+@class NSError;
 @class NSURLAuthenticationChallenge;
 @class NSURLResponse;
 @class NSURLRequest;
 
+@protocol NSObject;
+
 /*!
     @category  WebResourceLoadDelegate
     @discussion Implementors of this protocol will receive messages indicating

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 477de0c36a79a68c88470045d6a4e98656fa90e2..64ff2272a27e31876fbc3a72f2bedcf1c80be796 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2017-07-05  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Make WebKit's public headers on Mac and iOS C++ module safe
+        https://bugs.webkit.org/show_bug.cgi?id=174175
+
+        Reviewed by Alex Christensen.
+
+        Fixed the header files.
+
+        * UIProcess/API/Cocoa/WKContentRuleList.h:
+        * UIProcess/API/Cocoa/WKContentRuleListStore.h:
+        * UIProcess/API/Cocoa/WKUIDelegate.h:
+
 2017-07-05  Chris Dumez  <cdumez@apple.com>
 
         [WK2] WebsiteDataStore::setResourceLoadStatisticsEnabled() updates processPools the store is not associated with

diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKContentRuleList.h b/Source/WebKit2/UIProcess/API/Cocoa/WKContentRuleList.h
index 0b4bc30e25dde9205340830cc582a3e1fdc54295..9589fa34147abacacec8c63014887985610c51a5 100644 (file)
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKContentRuleList.h
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKContentRuleList.h
@@ -27,6 +27,8 @@
 
 #if WK_API_ENABLED
 
+#import <Foundation/Foundation.h>
+
 WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA))
 @interface WKContentRuleList : NSObject
 

diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKContentRuleListStore.h b/Source/WebKit2/UIProcess/API/Cocoa/WKContentRuleListStore.h
index daa5616d580e43ce9ba360f82309c5bb16bd91d7..82e68f6b746104cd8f2ecc264eb0c51dac34ac8f 100644 (file)
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKContentRuleListStore.h
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKContentRuleListStore.h
@@ -27,6 +27,11 @@
 
 #if WK_API_ENABLED
 
+#import <Foundation/Foundation.h>
+
+@class NSURL;
+@class NSError;
+@class NSArray;
 @class WKContentRuleList;
 
 WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA))

diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h b/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h
index a68c24c2b12b14dcedce1be8ab85d94616c9b3cc..d5bb6be8bf7ee97876b0abd2bf7686f188f10c69 100644 (file)
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h
@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class WKNavigationAction;
 @class WKOpenPanelParameters;
 @class WKPreviewElementInfo;
+@class WKWebView;
 @class WKWebViewConfiguration;
 @class WKWindowFeatures;