Expose more WKPreferences SPI to match C SPI
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Oct 2017 17:13:22 +0000 (17:13 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Oct 2017 17:13:22 +0000 (17:13 +0000)
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.

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

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

index e045e21..2b97e70 100644 (file)
@@ -1,5 +1,18 @@
 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>
+
         REGRESSION(r214201): WebProcess hangs during policy decisions
         https://bugs.webkit.org/show_bug.cgi?id=177590
         <rdar://problem/33362929>
index 6be8ea8..aadf662 100644 (file)
@@ -648,16 +648,6 @@ static _WKStorageBlockingPolicy toAPI(WebCore::SecurityOrigin::StorageBlockingPo
 }
 
 #if PLATFORM(MAC)
-- (void)_setPlugInsEnabled:(BOOL)enabled
-{
-    _preferences->setPluginsEnabled(enabled);
-}
-
-- (BOOL)_plugInsEnabled
-{
-    return _preferences->pluginsEnabled();
-}
-
 - (void)_setJavaEnabledForLocalFiles:(BOOL)enabled
 {
     _preferences->setJavaEnabledForLocalFiles(enabled);
@@ -665,7 +655,7 @@ static _WKStorageBlockingPolicy toAPI(WebCore::SecurityOrigin::StorageBlockingPo
 
 - (BOOL)_javaEnabledForLocalFiles
 {
-    return _preferences->pluginsEnabled();
+    return _preferences->javaEnabledForLocalFiles();
 }
 
 - (void)_setCanvasUsesAcceleratedDrawing:(BOOL)enabled
index 2370d7f..2e1a2b1 100644 (file)
@@ -119,7 +119,6 @@ typedef NS_OPTIONS(NSUInteger, _WKJavaScriptRuntimeFlags) {
 - (void)_setEnabled:(BOOL)value forFeature:(_WKExperimentalFeature *)feature WK_API_AVAILABLE(macosx(10.12), ios(10.0));
 
 #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));
 @property (nonatomic, setter=_setCanvasUsesAcceleratedDrawing:) BOOL _canvasUsesAcceleratedDrawing WK_API_AVAILABLE(macosx(WK_MAC_TBA));