Changeset 217074 in webkit

Timestamp:

May 18, 2017 4:20:34 PM (7 years ago)

Author:

Wenson Hsieh

Message:

Selection around attachment elements should not persist when beginning a drag
​https://bugs.webkit.org/show_bug.cgi?id=172319
<rdar://problem/32283008>

Reviewed by Tim Horton.

Source/WebCore:

When beginning to drag an attachment element, save and restore the visible selection when calling out to the
injected bundle for additional data, and when creating the drag image.

Augmented an existing API test: DataInteractionTests.AttachmentElementItemProviders.

• page/DragController.cpp:

(WebCore::DragController::startDrag):

Tools:

Tests that temporary selection around an attachment does not persist longer than it needs to.

• TestWebKitAPI/Tests/ios/DataInteractionTests.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/DragController.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Selection around attachment elements should not persist when beginning a drag
+        https://bugs.webkit.org/show_bug.cgi?id=172319
+        <rdar://problem/32283008>
+
+        Reviewed by Tim Horton.
+
+        When beginning to drag an attachment element, save and restore the visible selection when calling out to the
+        injected bundle for additional data, and when creating the drag image.
+
+        Augmented an existing API test: DataInteractionTests.AttachmentElementItemProviders.
+
+        * page/DragController.cpp:
+        (WebCore::DragController::startDrag):
+
 2017-05-18  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/page/DragController.cpp

@@ -1057 +1057 @@
 #if ENABLE(ATTACHMENT_ELEMENT)
     if (is<HTMLAttachmentElement>(element) && m_dragSourceAction & DragSourceActionAttachment) {
+        src.editor().setIgnoreSelectionChanges(true);
+        auto previousSelection = src.selection().selection();
         if (!dataTransfer.pasteboard().hasData()) {
             selectElement(element);
@@ -1085 +1087 @@
         }
         doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, { }, dataTransfer, src, DragSourceActionAttachment);
+        src.selection().setSelection(previousSelection);
+        src.editor().setIgnoreSelectionChanges(false);
         return true;
     }

trunk/Tools/ChangeLog

@@ +1 @@
+2017-05-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Selection around attachment elements should not persist when beginning a drag
+        https://bugs.webkit.org/show_bug.cgi?id=172319
+        <rdar://problem/32283008>
+
+        Reviewed by Tim Horton.
+
+        Tests that temporary selection around an attachment does not persist longer than it needs to.
+
+        * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+        (TestWebKitAPI::TEST):
+
 2017-05-18  John Wilander  <wilander@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm

@@ -645 +645 @@
 
     EXPECT_WK_STREQ("hello", [injectedString UTF8String]);
+    EXPECT_TRUE([webView stringByEvaluatingJavaScript:@"getSelection().isCollapsed"].boolValue);
 }