Changeset 222715 in webkit

Timestamp:

Oct 2, 2017 10:13:22 AM (7 years ago)

Author:

achristensen@apple.com

Message:

Expose more WKPreferences SPI to match C SPI
​https://bugs.webkit.org/show_bug.cgi?id=177697

• UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences _javaEnabledForLocalFiles]):
(-[WKPreferences _setPlugInsEnabled:]): Deleted.
(-[WKPreferences _plugInsEnabled]): Deleted.

• UIProcess/API/Cocoa/WKPreferencesPrivate.h:

_javaEnabledForLocalFiles should return the correct value.
_plugInsEnabled has public API. This SPI is not needed.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreferences.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKPreferencesPrivate.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-02  Alex Christensen  <achristensen@webkit.org>
+
+        Expose more WKPreferences SPI to match C SPI
+        https://bugs.webkit.org/show_bug.cgi?id=177697
+
+        * UIProcess/API/Cocoa/WKPreferences.mm:
+        (-[WKPreferences _javaEnabledForLocalFiles]):
+        (-[WKPreferences _setPlugInsEnabled:]): Deleted.
+        (-[WKPreferences _plugInsEnabled]): Deleted.
+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+        _javaEnabledForLocalFiles should return the correct value.
+        _plugInsEnabled has public API.  This SPI is not needed.
+
 2017-10-02  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm

@@ -649 +649 @@
 
 #if PLATFORM(MAC)
-- (void)_setPlugInsEnabled:(BOOL)enabled
-{
-    _preferences->setPluginsEnabled(enabled);
-}
-
-- (BOOL)_plugInsEnabled
-{
-    return _preferences->pluginsEnabled();
-}
-
 - (void)_setJavaEnabledForLocalFiles:(BOOL)enabled
 {
@@ -666 +656 @@
 - (BOOL)_javaEnabledForLocalFiles
 {
-    return _preferences->pluginsEnabled();
+    return _preferences->javaEnabledForLocalFiles();
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

@@ -120 +120 @@
 
 #if !TARGET_OS_IPHONE
-@property (nonatomic, setter=_setPlugInsEnabled:) BOOL _plugInsEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 @property (nonatomic, setter=_setWebGLEnabled:) BOOL _webGLEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 @property (nonatomic, setter=_setJavaEnabledForLocalFiles:) BOOL _javaEnabledForLocalFiles WK_API_AVAILABLE(macosx(WK_MAC_TBA));