Changeset 170495 in webkit

Timestamp:

Jun 26, 2014, 2:23:02 PM (11 years ago)

Author:

mitz@apple.com

Message:

[iOS] Add API for opting into character selection granularity
​https://bugs.webkit.org/show_bug.cgi?id=134354

Reviewed by Geoff Garen.

• Shared/API/Cocoa/WKFoundation.h: Added a definition of WK_ENUM_AVAILABLE_IOS.
• UIProcess/API/Cocoa/WKWebViewConfiguration.h:

(WKSelectionGranularity): Added this enum with two values, one representing dynamic
granularity( the current, default behavior) and one representing character granularity.
Delcared new selectionGranularity property.

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration copyWithZone:]): Copy the _selectionGranularity ivar.

• UIProcess/ios/WKContentViewInteraction.mm:

(toUIWebSelectionMode): Added this helper function for mapping WKSelectionGranularity values
to UIWebSelectionMode values.
(-[WKContentView setupInteraction]): Use a selection assistant with the mode specified in
the configuration.
(-[WKContentView _stopAssistingKeyboard]): Ditto.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::selectWithGesture): Changed the behavior of the loupe gesture type in
non-editable text to select a word, rather than an empty range, matching the UITextView
behavior.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKFoundation.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewConfiguration.h (modified) (2 diffs)
• UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (4 diffs)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-06-26  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Add API for opting into character selection granularity
+        https://bugs.webkit.org/show_bug.cgi?id=134354
+
+        Reviewed by Geoff Garen.
+
+        * Shared/API/Cocoa/WKFoundation.h: Added a definition of WK_ENUM_AVAILABLE_IOS.
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+        (WKSelectionGranularity): Added this enum with two values, one representing dynamic
+        granularity( the current, default behavior) and one representing character granularity.
+        Delcared new selectionGranularity property.
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration copyWithZone:]): Copy the _selectionGranularity ivar.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (toUIWebSelectionMode): Added this helper function for mapping WKSelectionGranularity values
+        to UIWebSelectionMode values.
+        (-[WKContentView setupInteraction]): Use a selection assistant with the mode specified in
+        the configuration.
+        (-[WKContentView _stopAssistingKeyboard]): Ditto.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::selectWithGesture): Changed the behavior of the loupe gesture type in
+        non-editable text to select a word, rather than an empty range, matching the UITextView
+        behavior.
+
 2014-06-26  Ada Chan  <adachan@apple.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h

@@ -45 +45 @@
 #define WK_CLASS_AVAILABLE(_mac, _ios) __attribute__((visibility ("default")))
 #define WK_ENUM_AVAILABLE(_mac, _ios)
+#define WK_ENUM_AVAILABLE_IOS(_ios)
 
 #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h

@@ -33 +33 @@
 @class WKProcessPool;
 @class WKUserContentController;
+
+#if TARGET_OS_IPHONE
+/*! @enum WKSelectionGranularity
+ @abstract The granularity with which a selection can be created and modified interactively.
+ @constant WKSelectionGranularityDynamic    Selection granularity varies automatically based on the selection.
+ @constant WKSelectionGranularityCharacter  Selection endpoints can be placed at any character boundary.
+ @discussion An example of how granularity may vary when WKSelectionGranularityDynamic is used is
+ that when the selection is within a single block, the granularity may be single character, and when
+ the selection is not confined to a single block, the selection granularity may be single block.
+ */
+typedef NS_ENUM(NSInteger, WKSelectionGranularity) {
+    WKSelectionGranularityDynamic,
+    WKSelectionGranularityCharacter,
+} WK_ENUM_AVAILABLE_IOS(8_0);
+#endif
 
 /*! A WKWebViewConfiguration object is a collection of properties with
@@ -81 +96 @@
 @property (nonatomic) BOOL mediaPlaybackAllowsAirPlay;
 
+/*! @abstract The level of granularity with which the user can interactively
+ select content in the web view.
+ @discussion Possible values are described in WKSelectionGranularity.
+ The default value is WKSelectionGranularityDynamic.
+ */
+@property (nonatomic) WKSelectionGranularity selectionGranularity;
+
 #endif
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

@@ -117 +117 @@
     configuration->_mediaPlaybackRequiresUserAction = self->_mediaPlaybackRequiresUserAction;
     configuration->_mediaPlaybackAllowsAirPlay = self->_mediaPlaybackAllowsAirPlay;
+    configuration->_selectionGranularity = self->_selectionGranularity;
 #endif
 

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -37 +37 @@
 #import "WKFormSelectControl.h"
 #import "WKInspectorNodeSearchGestureRecognizer.h"
+#import "WKWebViewConfiguration.h"
 #import "WKWebViewPrivate.h"
 #import "WebEvent.h"
@@ -191 +192 @@
 @implementation WKContentView (WKInteraction)
 
+static UIWebSelectionMode toUIWebSelectionMode(WKSelectionGranularity granularity)
+{
+    switch (granularity) {
+    case WKSelectionGranularityDynamic:
+        return UIWebSelectionModeWeb;
+    case WKSelectionGranularityCharacter:
+        return UIWebSelectionModeTextOnly;
+    }
+
+    ASSERT_NOT_REACHED();
+    return UIWebSelectionModeWeb;
+}
+
 - (void)setupInteraction
 {
@@ -238 +252 @@
 
     // FIXME: This should be called when we get notified that loading has completed.
-    [self useSelectionAssistantWithMode:UIWebSelectionModeWeb];
+    [self useSelectionAssistantWithMode:toUIWebSelectionMode([[_webView configuration] selectionGranularity])];
     
     _actionSheetAssistant = adoptNS([[WKActionSheetAssistant alloc] initWithView:self]);
@@ -2307 +2321 @@
 - (void)_stopAssistingKeyboard
 {
-    [self useSelectionAssistantWithMode:UIWebSelectionModeWeb];
+    [self useSelectionAssistantWithMode:toUIWebSelectionMode([[_webView configuration] selectionGranularity])];
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -857 +857 @@
 
     case GestureType::Loupe:
-        range = Range::create(*frame.document(), position, position);
+        if (position.rootEditableElement())
+            range = Range::create(*frame.document(), position, position);
+        else
+            range = wordRangeFromPosition(position);
         break;