Title: [251215] trunk/Source/WebKit
- Revision
- 251215
- Author
- d...@apple.com
- Date
- 2019-10-16 15:49:31 -0700 (Wed, 16 Oct 2019)
Log Message
Add Swift modulemap for WebKit Private APIs
https://bugs.webkit.org/show_bug.cgi?id=203059
Reviewed by Tim Horton.
Provide a Swift modulemap for WebKit_Private, and
ensure WKPreferencesPrivate.h is exposed.
Renamed OSX.modulemap to macOS.modulemap while here.
* Configurations/WebKit.xcconfig:
* Modules/iOS.private.modulemap: Added.
* Modules/macOS.modulemap: Renamed from Source/WebKit/Modules/OSX.modulemap.
* Modules/macOS.private.modulemap: Added.
* Shared/API/Cocoa/WebKitPrivate.h: Include WKPreferencesPrivate.h.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (251214 => 251215)
--- trunk/Source/WebKit/ChangeLog 2019-10-16 22:47:40 UTC (rev 251214)
+++ trunk/Source/WebKit/ChangeLog 2019-10-16 22:49:31 UTC (rev 251215)
@@ -1,3 +1,21 @@
+2019-10-16 Dean Jackson <d...@apple.com>
+
+ Add Swift modulemap for WebKit Private APIs
+ https://bugs.webkit.org/show_bug.cgi?id=203059
+
+ Reviewed by Tim Horton.
+
+ Provide a Swift modulemap for WebKit_Private, and
+ ensure WKPreferencesPrivate.h is exposed.
+
+ Renamed OSX.modulemap to macOS.modulemap while here.
+
+ * Configurations/WebKit.xcconfig:
+ * Modules/iOS.private.modulemap: Added.
+ * Modules/macOS.modulemap: Renamed from Source/WebKit/Modules/OSX.modulemap.
+ * Modules/macOS.private.modulemap: Added.
+ * Shared/API/Cocoa/WebKitPrivate.h: Include WKPreferencesPrivate.h.
+
2019-10-16 John Wilander <wilan...@apple.com>
Resource Load Statistics (experimental): Block all third-party cookies on websites without prior user interaction
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (251214 => 251215)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2019-10-16 22:47:40 UTC (rev 251214)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2019-10-16 22:49:31 UTC (rev 251215)
@@ -30,7 +30,10 @@
DEFINES_MODULE = YES;
MODULEMAP_FILE = $(MODULEMAP_FILE_$(WK_COCOA_TOUCH));
MODULEMAP_FILE_cocoatouch = Modules/iOS.modulemap;
-MODULEMAP_FILE_ = Modules/OSX.modulemap;
+MODULEMAP_FILE_ = Modules/macOS.modulemap;
+MODULEMAP_PRIVATE_FILE = $(MODULEMAP_PRIVATE_FILE_$(WK_COCOA_TOUCH));
+MODULEMAP_PRIVATE_FILE_cocoatouch = Modules/iOS.private.modulemap;
+MODULEMAP_PRIVATE_FILE_ = Modules/macOS.private.modulemap;
INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
Deleted: trunk/Source/WebKit/Modules/OSX.modulemap (251214 => 251215)
--- trunk/Source/WebKit/Modules/OSX.modulemap 2019-10-16 22:47:40 UTC (rev 251214)
+++ trunk/Source/WebKit/Modules/OSX.modulemap 2019-10-16 22:49:31 UTC (rev 251215)
@@ -1,18 +0,0 @@
-framework module WebKit [system] [extern_c] {
- umbrella header "WebKit.h"
- module * { export * }
- export *
-
- explicit module NPAPI {
- header "nptypes.h"
- header "npapi.h"
- header "npfunctions.h"
- header "npruntime.h"
- export *
- }
-
- explicit module DOMProgressEvent {
- header "DOMProgressEvent.h"
- export *
- }
-}
Added: trunk/Source/WebKit/Modules/iOS.private.modulemap (0 => 251215)
--- trunk/Source/WebKit/Modules/iOS.private.modulemap (rev 0)
+++ trunk/Source/WebKit/Modules/iOS.private.modulemap 2019-10-16 22:49:31 UTC (rev 251215)
@@ -0,0 +1,5 @@
+framework module WebKit_Private [system] [extern_c] {
+ umbrella header "WebKitPrivate.h"
+ module * { export * }
+ export *
+}
Copied: trunk/Source/WebKit/Modules/macOS.modulemap (from rev 251214, trunk/Source/WebKit/Modules/OSX.modulemap) (0 => 251215)
--- trunk/Source/WebKit/Modules/macOS.modulemap (rev 0)
+++ trunk/Source/WebKit/Modules/macOS.modulemap 2019-10-16 22:49:31 UTC (rev 251215)
@@ -0,0 +1,18 @@
+framework module WebKit [system] [extern_c] {
+ umbrella header "WebKit.h"
+ module * { export * }
+ export *
+
+ explicit module NPAPI {
+ header "nptypes.h"
+ header "npapi.h"
+ header "npfunctions.h"
+ header "npruntime.h"
+ export *
+ }
+
+ explicit module DOMProgressEvent {
+ header "DOMProgressEvent.h"
+ export *
+ }
+}
Added: trunk/Source/WebKit/Modules/macOS.private.modulemap (0 => 251215)
--- trunk/Source/WebKit/Modules/macOS.private.modulemap (rev 0)
+++ trunk/Source/WebKit/Modules/macOS.private.modulemap 2019-10-16 22:49:31 UTC (rev 251215)
@@ -0,0 +1,5 @@
+framework module WebKit_Private [system] [extern_c] {
+ umbrella header "WebKitPrivate.h"
+ module * { export * }
+ export *
+}
Modified: trunk/Source/WebKit/Shared/API/Cocoa/WebKitPrivate.h (251214 => 251215)
--- trunk/Source/WebKit/Shared/API/Cocoa/WebKitPrivate.h 2019-10-16 22:47:40 UTC (rev 251214)
+++ trunk/Source/WebKit/Shared/API/Cocoa/WebKitPrivate.h 2019-10-16 22:49:31 UTC (rev 251215)
@@ -25,6 +25,7 @@
#import <WebKit/WKHistoryDelegatePrivate.h>
#import <WebKit/WKNavigationPrivate.h>
+#import <WebKit/WKPreferencesPrivate.h>
#import <WebKit/WKProcessPoolPrivate.h>
#import <WebKit/WKUIDelegatePrivate.h>
#import <WebKit/WKWebViewConfigurationPrivate.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
