Attachment 372939 Details for Bug 199211 – Simpler fix, let's see what happens

[patch] Simpler fix, let's see what happens

Simpler.patch (text/plain), 3.65 KB, created by Daniel Bates on 2019-06-26 11:51:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2019-06-26 11:51:41 PDT

Size: 3.65 KB

patch

obsolete

>From e8334c4cc4a29ae1b8e95c6fbce4e1467a1586cd Mon Sep 17 00:00:00 2001
>From: Daniel Bates <dabates@apple.com>
>Date: Wed, 26 Jun 2019 11:50:29 -0700
>Subject: [PATCH] Bug 199211 Simpler
>
>---
> Source/WebKit/UIProcess/ios/WKContentView.h         |  1 -
> Source/WebKit/UIProcess/ios/WKContentView.mm        |  7 -------
> .../WebKit/UIProcess/ios/WKContentViewInteraction.h |  1 +
> .../UIProcess/ios/WKContentViewInteraction.mm       | 13 ++++++++++---
> 4 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/Source/WebKit/UIProcess/ios/WKContentView.h b/Source/WebKit/UIProcess/ios/WKContentView.h
>index 421967adf32..606de133747 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentView.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentView.h
>@@ -102,7 +102,6 @@ class WebProcessPool;
> - (void)_showInspectorHighlight:(const WebCore::Highlight&)highlight;
> - (void)_hideInspectorHighlight;
> 
>-- (void)_didCommitLoadForMainFrame;
> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction;
> - (void)_layerTreeCommitComplete;
> 
>diff --git a/Source/WebKit/UIProcess/ios/WKContentView.mm b/Source/WebKit/UIProcess/ios/WKContentView.mm
>index b3d9ecdfbe5..197db6d5aac 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentView.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentView.mm
>@@ -581,13 +581,6 @@ - (void)_processDidCreateContextForVisibilityPropagation
> }
> #endif
> 
>-- (void)_didCommitLoadForMainFrame
>-{
>-    [self _elementDidBlur];
>-    [self _cancelLongPressGestureRecognizer];
>-    [_webView _didCommitLoadForMainFrame];
>-}
>-
> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
> {
>     CGSize contentsSize = layerTreeTransaction.contentsSize();
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>index e96dedb66a6..9003f6b7f66 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>@@ -515,6 +515,7 @@ FOR_EACH_PRIVATE_WKCONTENTVIEW_ACTION(DECLARE_WKCONTENTVIEW_ACTION_FOR_WEB_VIEW)
> - (void)_handleAutocorrectionContext:(const WebKit::WebAutocorrectionContext&)context;
> 
> - (void)_didStartProvisionalLoadForMainFrame;
>+- (void)_didCommitLoadForMainFrame;
> 
> @end
> 
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index b3e16f2417b..ce0b7a5a1a2 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -806,9 +806,8 @@ - (void)setupInteraction
> 
>     _showingTextStyleOptions = NO;
> 
>-    // FIXME: This should be called when we get notified that loading has completed.
>     [self setUpTextSelectionAssistant];
>-    
>+
>     _actionSheetAssistant = adoptNS([[WKActionSheetAssistant alloc] initWithView:self]);
>     [_actionSheetAssistant setDelegate:self];
>     _smartMagnificationController = std::make_unique<WebKit::SmartMagnificationController>(self);
>@@ -3819,6 +3818,14 @@ - (void)_didStartProvisionalLoadForMainFrame
>     [self _setDoubleTapGesturesEnabled:NO];
> }
> 
>+- (void)_didCommitLoadForMainFrame
>+{
>+    [self _elementDidBlur];
>+    [self _cancelLongPressGestureRecognizer];
>+    [_textSelectionAssistant activateSelection];
>+    [_webView _didCommitLoadForMainFrame];
>+}
>+
> #if !USE(UIKIT_KEYBOARD_ADDITIONS)
> - (NSArray *)keyCommands
> {
>@@ -4994,7 +5001,7 @@ - (void)takeTraitsFrom:(UITextInputTraits *)traits
> - (void)_showKeyboard
> {
>     [self setUpTextSelectionAssistant];
>-    
>+
>     if (self.isFirstResponder && !_suppressSelectionAssistantReasons)
>         [_textSelectionAssistant activateSelection];
> 
>-- 
>2.21.0 (Apple Git-120)
>

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 199211: 372874 | 372890 | 372939 | 372945