commit ffc46620d9231fe96f6aef8fef2cd94aa3d93a83
author wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Oct 21 20:19:53 2019 +0000
committer wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Oct 21 20:19:53 2019 +0000
tree 10cb1507b00726822bca80bfcc72d96bc8c8ecb6
parent c27e52ec2eefea39423e8eef58df2aebc1b5417d

[Clipboard API] Implement ClipboardItem.getType() for platform clipboard items
https://bugs.webkit.org/show_bug.cgi?id=203168

Reviewed by Tim Horton.

Source/WebCore:

This patch completes support for ClipboardItem.getType().

Tests:  editing/async-clipboard/clipboard-change-data-while-getting-type.html
        editing/async-clipboard/clipboard-get-type-with-old-items.html
        editing/async-clipboard/clipboard-item-get-type-basic.html
        ClipboardTests.ReadMultipleItems

* Modules/async-clipboard/Clipboard.cpp:
(WebCore::Clipboard::getType):

Implement getType(). If the given clipboard item is being tracked as one of the active clipboard items, then
allow it to read data from the platform pasteboard. We use existing pasteboard reading methods and classes
(PasteboardPlainText and WebContentMarkupReader) to ask the platform pasteboard for text and markup data,
respectively, and go through readURL() for "text/uri-list".

Before exposing any data to the page, we additionally check that the change count of the pasteboard is still
what we started with when setting up the current session. If this is not the case, we reject the promise and
immediately clear out the session.

(WebCore::Clipboard::activePasteboard):
* Modules/async-clipboard/Clipboard.h:
* dom/DataTransfer.h:

Drive-by tweak: make the WebContentReadingPolicy enum class narrower.

* platform/Pasteboard.h:

Add an enum flag for allowing or ignoring the platform URL type when reading plain text from the platform
pasteboard. We use this in Clipboard::getType() to ignore URLs on the platform pasteboard when plain text, since
the plain text reader would otherwise prefer URLs over plain text by default, and read the URL type instead of
the plain text type.

* platform/StaticPasteboard.h:
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::read):
* platform/ios/PasteboardIOS.mm:
(WebCore::Pasteboard::read):
* platform/libwpe/PasteboardLibWPE.cpp:
(WebCore::Pasteboard::read):
* platform/mac/PasteboardMac.mm:
(WebCore::Pasteboard::read):
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::read):

Tools:

Add support for the new layout tests, as well as a new API test.

* DumpRenderTree/ios/UIScriptControllerIOS.h:
* DumpRenderTree/ios/UIScriptControllerIOS.mm:
(WTR::UIScriptControllerIOS::copyText):

Implement UIScriptController.copyText in WebKit1. This is used in one of the new layout tests, which passes in
WebKit1 on macOS and iOS.

* DumpRenderTree/mac/DumpRenderTreePasteboard.mm:
(-[LocalPasteboard declareTypes:owner:]):
(-[LocalPasteboard addTypes:owner:]):
(-[LocalPasteboard _addTypesWithoutUpdatingChangeCount:owner:]):

Adjust logic when declaring types on the platform pasteboard, such that it behaves more like the platform; when
declaring types, even if the owner doesn't change, the change count should still get bumped up by 1.

* DumpRenderTree/mac/UIScriptControllerMac.h:
* DumpRenderTree/mac/UIScriptControllerMac.mm:
(WTR::UIScriptControllerMac::copyText):
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKitCocoa/ClipboardTests.mm: Added.
(-[TestWKWebView readClipboard]):
(createWebViewForClipboardTests):
(writeMultipleObjectsToPlatformPasteboard):

Add a new API test to verify that clipboard items contain the right data when writing multiple items (each with
different sets of types) to the platform pasteboard using native APIs.

* TestWebKitAPI/Tests/WebKitCocoa/clipboard.html: Added.
* WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm:
(-[LocalPasteboard declareTypes:owner:]):
(-[LocalPasteboard addTypes:owner:]):
(-[LocalPasteboard _addTypesWithoutUpdatingChangeCount:owner:]):

LayoutTests:

Add 3 new layout tests.

* editing/async-clipboard/clipboard-change-data-while-getting-type-expected.txt: Added.
* editing/async-clipboard/clipboard-change-data-while-getting-type.html: Added.

Add a layout test to verify that if the pasteboard changes right after the page has obtained clipboard items,
the page should not be able to fetch the new contents of the pasteboard using these clipboard items.

* editing/async-clipboard/clipboard-get-type-with-old-items.html: Added.
* editing/async-clipboard/clipboard-get-type-with-old-items-expected.txt: Added.

Add a layout test to verify that after attempting to get data from invalid (stale) items, the page is still
capable of reading data from valid clipboard items.

* editing/async-clipboard/clipboard-item-get-type-basic-expected.txt: Added.
* editing/async-clipboard/clipboard-item-get-type-basic.html: Added.

Add a layout test to verify that after writing multiple types to the clipboard using the DataTransfer API, we
should be able to read them back using the async clipboard API, as a single ClipboardItem, and also get data out
of the clipboard item using ClipboardItem.getType.

* editing/async-clipboard/resources/async-clipboard-helpers.js:
* platform/win/TestExpectations:
* resources/ui-helper.js:
(window.UIHelper.async.copyText):
(window.UIHelper):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251377 268f45cc-cd09-0410-ab3c-d52691b4dbfc