Title: [244447] trunk/Source/WebKit
- Revision
- 244447
- Author
- beid...@apple.com
- Date
- 2019-04-18 19:36:55 -0700 (Thu, 18 Apr 2019)
Log Message
Deprecate WebKit2 plug-in support.
<rdar://problem/43812306> and https://bugs.webkit.org/show_bug.cgi?id=197080
Reviewed by Andy Estes.
* UIProcess/API/Cocoa/WKPreferences.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences encodeWithCoder:]):
(-[WKPreferences initWithCoder:]):
(-[WKPreferences javaEnabled]):
(-[WKPreferences setJavaEnabled:]):
(-[WKPreferences plugInsEnabled]):
(-[WKPreferences setPlugInsEnabled:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (244446 => 244447)
--- trunk/Source/WebKit/ChangeLog 2019-04-19 02:25:51 UTC (rev 244446)
+++ trunk/Source/WebKit/ChangeLog 2019-04-19 02:36:55 UTC (rev 244447)
@@ -1,3 +1,19 @@
+2019-04-18 Brady Eidson <beid...@apple.com>
+
+ Deprecate WebKit2 plug-in support.
+ <rdar://problem/43812306> and https://bugs.webkit.org/show_bug.cgi?id=197080
+
+ Reviewed by Andy Estes.
+
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences encodeWithCoder:]):
+ (-[WKPreferences initWithCoder:]):
+ (-[WKPreferences javaEnabled]):
+ (-[WKPreferences setJavaEnabled:]):
+ (-[WKPreferences plugInsEnabled]):
+ (-[WKPreferences setPlugInsEnabled:]):
+
2019-04-18 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r244434.
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h (244446 => 244447)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h 2019-04-19 02:25:51 UTC (rev 244446)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h 2019-04-19 02:36:55 UTC (rev 244447)
@@ -52,16 +52,6 @@
@property (nonatomic) BOOL _javascript_CanOpenWindowsAutomatically;
#if !TARGET_OS_IPHONE
-/*! @abstract A Boolean value indicating whether Java is enabled.
- @discussion The default value is NO.
- */
-@property (nonatomic) BOOL javaEnabled;
-
-/*! @abstract A Boolean value indicating whether plug-ins are enabled.
- @discussion The default value is NO.
- */
-@property (nonatomic) BOOL plugInsEnabled;
-
/*!
@property tabFocusesLinks
@abstract If tabFocusesLinks is YES, the tab key will focus links and form controls.
@@ -71,3 +61,14 @@
#endif
@end
+
+#if !TARGET_OS_IPHONE
+
+@interface WKPreferences (WKDeprecated)
+
+@property (nonatomic) BOOL javaEnabled WK_API_DEPRECATED("Java is no longer supported", macos(macos(10.10), WK_MAC_TBA));
+@property (nonatomic) BOOL plugInsEnabled WK_API_DEPRECATED("Plug-ins are no longer supported", macos(macos(10.10), WK_MAC_TBA));
+
+@end
+
+#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (244446 => 244447)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2019-04-19 02:25:51 UTC (rev 244446)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2019-04-19 02:36:55 UTC (rev 244447)
@@ -69,8 +69,10 @@
[coder encodeBool:self._javascript_CanOpenWindowsAutomatically forKey:@"_javascript_CanOpenWindowsAutomatically"];
#if PLATFORM(MAC)
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[coder encodeBool:self.javaEnabled forKey:@"javaEnabled"];
[coder encodeBool:self.plugInsEnabled forKey:@"plugInsEnabled"];
+ALLOW_DEPRECATED_DECLARATIONS_END
[coder encodeBool:self.tabFocusesLinks forKey:@"tabFocusesLinks"];
#endif
}
@@ -85,8 +87,10 @@
self._javascript_CanOpenWindowsAutomatically = [coder decodeBoolForKey:@"_javascript_CanOpenWindowsAutomatically"];
#if PLATFORM(MAC)
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
self.javaEnabled = [coder decodeBoolForKey:@"javaEnabled"];
self.plugInsEnabled = [coder decodeBoolForKey:@"plugInsEnabled"];
+ALLOW_DEPRECATED_DECLARATIONS_END
self.tabFocusesLinks = [coder decodeBoolForKey:@"tabFocusesLinks"];
#endif
@@ -132,26 +136,6 @@
#if PLATFORM(MAC)
-- (BOOL)javaEnabled
-{
- return _preferences->javaEnabled();
-}
-
-- (void)setJavaEnabled:(BOOL)javaEnabled
-{
- _preferences->setJavaEnabled(javaEnabled);
-}
-
-- (BOOL)plugInsEnabled
-{
- return _preferences->pluginsEnabled();
-}
-
-- (void)setPlugInsEnabled:(BOOL)plugInsEnabled
-{
- _preferences->setPluginsEnabled(plugInsEnabled);
-}
-
- (BOOL)tabFocusesLinks
{
return _preferences->tabsToLinks();
@@ -1361,3 +1345,31 @@
}
@end
+
+#if !TARGET_OS_IPHONE
+
+@implementation WKPreferences (WKDeprecated)
+
+- (BOOL)javaEnabled
+{
+ return _preferences->javaEnabled();
+}
+
+- (void)setJavaEnabled:(BOOL)javaEnabled
+{
+ _preferences->setJavaEnabled(javaEnabled);
+}
+
+- (BOOL)plugInsEnabled
+{
+ return _preferences->pluginsEnabled();
+}
+
+- (void)setPlugInsEnabled:(BOOL)plugInsEnabled
+{
+ _preferences->setPluginsEnabled(plugInsEnabled);
+}
+
+@end
+
+#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
