Attachment 370893 Details for Bug 198354 – Patch

[patch] Patch

bug-198354-20190529155403.patch (text/plain), 3.61 KB, created by Wenson Hsieh on 2019-05-29 15:54:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-05-29 15:54:04 PDT

Size: 3.61 KB

patch

obsolete

>Subversion Revision: 245847
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 900bbe8f18da4eb8056c2e0bac6d50800c85a7c6..f7a0e5cceea299b59e81f70bd4484aca184e95cb 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-05-29  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Remove some logic to suppress the text selection assistant during drop
>+        https://bugs.webkit.org/show_bug.cgi?id=198354
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This logic was originally added to hide the ranged selection after performing a drop in editable content.
>+        However, after r245803, we (1) no longer show the keyboard and/or text selection views when dropping, and (2)
>+        the final selection is now a caret, so it's no longer necessary to suppress the selection assistant.
>+
>+        * UIProcess/ios/WKContentViewInteraction.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView dropInteraction:performDrop:]):
>+        (-[WKContentView dropInteraction:concludeDrop:]):
>+
> 2019-05-28  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [WinCairo] REGRESSION(r245186) Crash in NetworkCache::IOChannel::read in http/tests/IndexedDB some tests
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>index 08b64d2b1fc505c9d41c02f39372d40c28b603a7..31be4b5d733fa855c6bf68539c4bec9c7c8ff023 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>@@ -165,8 +165,7 @@ namespace WebKit {
> enum SuppressSelectionAssistantReason : uint8_t {
>     EditableRootIsTransparentOrFullyClipped = 1 << 0,
>     FocusedElementIsTooSmall = 1 << 1,
>-    DropAnimationIsRunning = 1 << 2,
>-    InteractionIsHappening = 1 << 3
>+    InteractionIsHappening = 1 << 2
> };
> 
> struct WKSelectionDrawingInfo {
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index 89669dc16f91a574060db195cbe782d222933e78..0d2d62135f1dea74ed4e9c1d8464b3825302f07c 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -6891,9 +6891,7 @@ - (void)dropInteraction:(UIDropInteraction *)interaction performDrop:(id <UIDrop
>         WebKit::SandboxExtension::HandleArray sandboxExtensionForUpload;
>         retainedSelf->_page->createSandboxExtensionsIfNeeded(filenames, sandboxExtensionHandle, sandboxExtensionForUpload);
>         retainedSelf->_page->performDragOperation(capturedDragData, "data interaction pasteboard", WTFMove(sandboxExtensionHandle), WTFMove(sandboxExtensionForUpload));
>-
>         retainedSelf->_visibleContentViewSnapshot = [retainedSelf snapshotViewAfterScreenUpdates:NO];
>-        [retainedSelf _startSuppressingSelectionAssistantForReason:WebKit::DropAnimationIsRunning];
>         [UIView performWithoutAnimation:[retainedSelf] {
>             [retainedSelf->_visibleContentViewSnapshot setFrame:[retainedSelf bounds]];
>             [retainedSelf addSubview:retainedSelf->_visibleContentViewSnapshot.get()];
>@@ -6910,7 +6908,6 @@ - (void)dropInteraction:(UIDropInteraction *)interaction item:(UIDragItem *)item
> 
> - (void)dropInteraction:(UIDropInteraction *)interaction concludeDrop:(id <UIDropSession>)session
> {
>-    [self _stopSuppressingSelectionAssistantForReason:WebKit::DropAnimationIsRunning];
>     [std::exchange(_visibleContentViewSnapshot, nil) removeFromSuperview];
>     [std::exchange(_unselectedContentSnapshot, nil) removeFromSuperview];
>     _dragDropInteractionState.clearAllDelayedItemPreviewProviders();

Actions: View | Formatted Diff | Diff

Attachments on bug 198354: 370893 | 370899