Changeset 226255 in webkit

Timestamp:

Dec 21, 2017 7:23:18 PM (6 years ago)

Author:

mitz@apple.com

Message:

WKPreferences doesn’t expose editable link behavior
​https://bugs.webkit.org/show_bug.cgi?id=181111

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKPreferences.mm:

(toAPI): Added. Converts WebCore::EditableLinkBehavior to _WKEditableLinkBehavior.
(toEditableLinkBehavior): Added. Converts the other way.
(-[WKPreferences _editableLinkBehavior]): Added this getter.
(-[WKPreferences _setEditableLinkBehavior:]): Ditto.

• UIProcess/API/Cocoa/WKPreferencesPrivate.h: Declared new property.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-12-21  Dan Bernstein  <mitz@apple.com>
+
+        WKPreferences doesn’t expose editable link behavior
+        https://bugs.webkit.org/show_bug.cgi?id=181111
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKPreferences.mm:
+        (toAPI): Added. Converts WebCore::EditableLinkBehavior to _WKEditableLinkBehavior.
+        (toEditableLinkBehavior): Added. Converts the other way.
+        (-[WKPreferences _editableLinkBehavior]): Added this getter.
+        (-[WKPreferences _setEditableLinkBehavior:]): Ditto.
+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h: Declared new property.
+
 2017-12-21  Andy Estes  <aestes@apple.com>
 

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

@@ -35 +35 @@
 #import "_WKExperimentalFeatureInternal.h"
 #import <WebCore/SecurityOrigin.h>
+#import <WebCore/Settings.h>
 #import <wtf/RetainPtr.h>
 
@@ -678 +679 @@
 }
 
+static _WKEditableLinkBehavior toAPI(WebCore::EditableLinkBehavior behavior)
+{
+    switch (behavior) {
+    case WebCore::EditableLinkDefaultBehavior:
+        return _WKEditableLinkBehaviorDefault;
+    case WebCore::EditableLinkAlwaysLive:
+        return _WKEditableLinkBehaviorAlwaysLive;
+    case WebCore::EditableLinkOnlyLiveWithShiftKey:
+        return _WKEditableLinkBehaviorOnlyLiveWithShiftKey;
+    case WebCore::EditableLinkLiveWhenNotFocused:
+        return _WKEditableLinkBehaviorLiveWhenNotFocused;
+    case WebCore::EditableLinkNeverLive:
+        return _WKEditableLinkBehaviorNeverLive;
+    }
+    
+    ASSERT_NOT_REACHED();
+    return _WKEditableLinkBehaviorNeverLive;
+}
+
+static WebCore::EditableLinkBehavior toEditableLinkBehavior(_WKEditableLinkBehavior wkBehavior)
+{
+    switch (wkBehavior) {
+    case _WKEditableLinkBehaviorDefault:
+        return WebCore::EditableLinkDefaultBehavior;
+    case _WKEditableLinkBehaviorAlwaysLive:
+        return WebCore::EditableLinkAlwaysLive;
+    case _WKEditableLinkBehaviorOnlyLiveWithShiftKey:
+        return WebCore::EditableLinkOnlyLiveWithShiftKey;
+    case _WKEditableLinkBehaviorLiveWhenNotFocused:
+        return WebCore::EditableLinkLiveWhenNotFocused;
+    case _WKEditableLinkBehaviorNeverLive:
+        return WebCore::EditableLinkNeverLive;
+    }
+    
+    ASSERT_NOT_REACHED();
+    return WebCore::EditableLinkNeverLive;
+}
+
+- (_WKEditableLinkBehavior)_editableLinkBehavior
+{
+    return toAPI(static_cast<WebCore::EditableLinkBehavior>(_preferences->editableLinkBehavior()));
+}
+
+- (void)_setEditableLinkBehavior:(_WKEditableLinkBehavior)editableLinkBehavior
+{
+    _preferences->setEditableLinkBehavior(toEditableLinkBehavior(editableLinkBehavior));
+}
+
 #if PLATFORM(MAC)
 - (void)_setJavaEnabledForLocalFiles:(BOOL)enabled

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

@@ -46 +46 @@
     _WKJavaScriptRuntimeFlagsAllEnabled = 0
 } WK_API_AVAILABLE(macosx(10.11), ios(9.0));
+
+typedef NS_ENUM(NSInteger, _WKEditableLinkBehavior) {
+    _WKEditableLinkBehaviorDefault,
+    _WKEditableLinkBehaviorAlwaysLive,
+    _WKEditableLinkBehaviorOnlyLiveWithShiftKey,
+    _WKEditableLinkBehaviorLiveWhenNotFocused,
+    _WKEditableLinkBehaviorNeverLive,
+} WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 @class _WKExperimentalFeature;
@@ -119 +127 @@
 @property (nonatomic, setter=_setShouldAllowUserInstalledFonts:) BOOL _shouldAllowUserInstalledFonts WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
+@property (nonatomic, setter=_setEditableLinkBehavior:) _WKEditableLinkBehavior _editableLinkBehavior WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+
 + (NSArray<_WKExperimentalFeature *> *)_experimentalFeatures WK_API_AVAILABLE(macosx(10.12), ios(10.0));
 - (BOOL)_isEnabledForFeature:(_WKExperimentalFeature *)feature WK_API_AVAILABLE(macosx(10.12), ios(10.0));