Changeset 176701 in webkit

Timestamp:

Dec 2, 2014, 4:59:06 PM (12 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/18441138> [iOS] Text selection in WKWebView with WKSelectionGranularityCharacter only works in the most recent WKWebView to load
​https://bugs.webkit.org/show_bug.cgi?id=139211

Reviewed by Anders Carlsson.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView becomeFirstResponder]): Override to activate the text selection for when
becoming first resopnder.
(-[WKContentView resignFirstResponder]): Deactiavte the text selection when resigning first
responder. This ensures that if another WKWebView becomes first responder, and it uses
block selection, we don’t end up with two active selection views.
(-[WKContentView useSelectionAssistantWithMode:]): Only activate the text selection if this
is the first responder. This ensures that loading content into a non-first-responder
WKWebView doesn‘t deactivate the text selection in the current first responder.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-02  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/18441138> [iOS] Text selection in WKWebView with WKSelectionGranularityCharacter only works in the most recent WKWebView to load
+        https://bugs.webkit.org/show_bug.cgi?id=139211
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView becomeFirstResponder]): Override to activate the text selection for when
+        becoming first resopnder.
+        (-[WKContentView resignFirstResponder]): Deactiavte the text selection when resigning first
+        responder. This ensures that if another WKWebView becomes first responder, and it uses
+        block selection, we don’t end up with two active selection views.
+        (-[WKContentView useSelectionAssistantWithMode:]): Only activate the text selection if this
+        is the first responder. This ensures that loading content into a non-first-responder
+        WKWebView doesn‘t deactivate the text selection in the current first responder.
+
 2014-12-02  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -451 +451 @@
 }
 
+- (BOOL)becomeFirstResponder
+{
+    BOOL didBecomeFirstResponder = [super becomeFirstResponder];
+    if (didBecomeFirstResponder)
+        [_textSelectionAssistant activateSelection];
+
+    return didBecomeFirstResponder;
+}
+
 - (BOOL)resignFirstResponder
 {
@@ -460 +469 @@
     [self _cancelInteraction];
     [_webSelectionAssistant resignedFirstResponder];
+    [_textSelectionAssistant deactivateSelection];
 
     return [super resignFirstResponder];
@@ -1087 +1097 @@
         }
 
-        [_textSelectionAssistant activateSelection];
+        if (self.isFirstResponder)
+            [_textSelectionAssistant activateSelection];
     }
 }