Title: [286267] trunk/Source/WebKit
- Revision
- 286267
- Author
- cdu...@apple.com
- Date
- 2021-11-29 15:18:36 -0800 (Mon, 29 Nov 2021)
Log Message
Add WebKitAdditions bits for captive portal mode
https://bugs.webkit.org/show_bug.cgi?id=233569
<rdar://85819906>
Reviewed by Geoffrey Garen.
* UIProcess/API/Cocoa/WKWebpagePreferences.h:
* UIProcess/API/Cocoa/WKWebpagePreferences.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (286266 => 286267)
--- trunk/Source/WebKit/ChangeLog 2021-11-29 23:10:37 UTC (rev 286266)
+++ trunk/Source/WebKit/ChangeLog 2021-11-29 23:18:36 UTC (rev 286267)
@@ -1,3 +1,14 @@
+2021-11-29 Chris Dumez <cdu...@apple.com>
+
+ Add WebKitAdditions bits for captive portal mode
+ https://bugs.webkit.org/show_bug.cgi?id=233569
+ <rdar://85819906>
+
+ Reviewed by Geoffrey Garen.
+
+ * UIProcess/API/Cocoa/WKWebpagePreferences.h:
+ * UIProcess/API/Cocoa/WKWebpagePreferences.mm:
+
2021-11-29 Per Arne Vollan <pvol...@apple.com>
[WP] Sandbox telemetry is missing for some system calls
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.h (286266 => 286267)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.h 2021-11-29 23:10:37 UTC (rev 286266)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.h 2021-11-29 23:18:36 UTC (rev 286267)
@@ -71,4 +71,8 @@
*/
@property (nonatomic) BOOL allowsContentJavaScript WK_API_AVAILABLE(macos(11.0), ios(14.0));
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebpagePreferencesAdditions.h>
+#endif
+
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm (286266 => 286267)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm 2021-11-29 23:10:37 UTC (rev 286266)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm 2021-11-29 23:18:36 UTC (rev 286267)
@@ -460,4 +460,8 @@
return WebKit::mouseEventPolicy(_websitePolicies->mouseEventPolicy());
}
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebpagePreferencesAdditions.mm>
+#endif
+
@end
Modified: trunk/Source/WebKit/mac/replace-webkit-additions-includes.py (286266 => 286267)
--- trunk/Source/WebKit/mac/replace-webkit-additions-includes.py 2021-11-29 23:10:37 UTC (rev 286266)
+++ trunk/Source/WebKit/mac/replace-webkit-additions-includes.py 2021-11-29 23:18:36 UTC (rev 286267)
@@ -86,8 +86,7 @@
return 1
# We currently only support WebKitAdditions in Framework headers on macOS 13+ and iOS 16+.
- if not is_supported_os():
- return 0
+ should_do_replacement = is_supported_os()
additions_import_pattern = re.compile(r"\#if USE\(APPLE_INTERNAL_SDK\)\n#import <WebKitAdditions/(.*)>\n#endif")
try:
@@ -95,7 +94,10 @@
header_contents = header.read()
match = additions_import_pattern.search(header_contents)
while match:
- header_contents = header_contents[:match.start()] + read_content_from_webkit_additions(built_products_directory, sdk_root_directory, match.groups()[0]) + header_contents[match.end():]
+ if should_do_replacement:
+ header_contents = header_contents[:match.start()] + read_content_from_webkit_additions(built_products_directory, sdk_root_directory, match.groups()[0]) + header_contents[match.end():]
+ else:
+ header_contents = header_contents[:match.start()] + header_contents[match.end():]
match = additions_import_pattern.search(header_contents)
try:
with open(header_path, "w") as header:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
