Attachment 359546 Details for Bug 193596 – Patch

[patch] Patch

bug-193596-20190118151848.patch (text/plain), 2.77 KB, created by Megan Gardner on 2019-01-18 15:18:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Megan Gardner

Created: 2019-01-18 15:18:49 PST

Size: 2.77 KB

patch

obsolete

>Subversion Revision: 240132
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 6c960a5e86f221f2233df54e75ee92b07a06321d..032b22b4e4b43f8fb5d463228745ebb5732ba701 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-18  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Cleanup undo options
>+        https://bugs.webkit.org/show_bug.cgi?id=193596
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Return to get correct undo behavior.
>+
>+        * Platform/spi/ios/UIKitSPI.h:
>+        * UIProcess/ios/WKContentViewInteraction.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        
> 2019-01-17  John Wilander  <wilander@apple.com>
> 
>         Add infrastructure to enable/disable ITP Debug Mode through Preferences
>diff --git a/Source/WebKit/Platform/spi/ios/UIKitSPI.h b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>index 1f63a32a539dd69a01493f29f400e4936a168578..ff2444a2efdff44879cf2d699e4b9ea664f1705d 100644
>--- a/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>+++ b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>@@ -317,6 +317,7 @@ typedef enum {
> @end
> 
> @interface UIResponder ()
>+@property (nonatomic, readonly) NSInteger undoOption;
> - (void)_handleKeyUIEvent:(UIEvent *)event;
> - (void)_wheelChangedWithEvent:(UIEvent *)event;
> @end
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>index a7ffff78f30a70f4fc590d705a1d19e3a3881bef..bab4baf5ce7cc595e0aaeededbe3d025472645fb 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>@@ -157,6 +157,11 @@ enum SuppressSelectionAssistantReason : uint8_t {
>     FocusedElementIsTooSmall = 1 << 1,
>     DropAnimationIsRunning = 1 << 2
> };
>+    
>+enum WKUndoOption {
>+    WKUndoTypeDefault =  0,
>+    WKUndoTypeSmaller = 1,
>+};
> 
> struct WKSelectionDrawingInfo {
>     enum class SelectionType { None, Plugin, Range };
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index 3e5292a78c2acf461a68293b3aac422c90d7b3c5..fc9d1c1b0b2ea5fa08edf93d026bfb6cd8feb4b6 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -5104,6 +5104,13 @@ - (void)setDataListTextSuggestions:(NSArray<UITextSuggestion *> *)textSuggestion
> 
> #endif
> 
>+- (NSInteger)undoOption
>+{
>+    if (_suppressSelectionAssistantReasons.contains(WebKit::FocusedElementIsTransparentOrFullyClipped)) {
>+        return WebKit::WKUndoTypeSmaller;
>+    return WebKit::WKUndoTypeDefault;
>+}
>+
> - (void)updateTextSuggestionsForInputDelegate
> {
>     // Text suggestions vended from clients take precedence over text suggestions from a focused form control with a datalist.

Actions: View | Formatted Diff | Diff

Attachments on bug 193596: 359546 | 359551