Changeset 286705 in webkit

Timestamp:

Dec 8, 2021, 12:34:03 PM (5 years ago)

Author:

Truitt Savell

Message:

Unreviewed, reverting r286632.

Broke 3 tests on iOS

Reverted changeset:

"Add a DOMPasteAccessCategory to control which pasteboard
the WebProcess is granted access to when pasting"
​https://bugs.webkit.org/show_bug.cgi?id=233939
​https://commits.webkit.org/r286632

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/DOMPasteAccess.h (modified) (2 diffs)
• WebCore/loader/EmptyClients.cpp (modified) (1 diff)
• WebCore/page/EditorClient.h (modified) (2 diffs)
• WebCore/page/Frame.cpp (modified) (2 diffs)
• WebCore/page/Frame.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Scripts/webkit/messages.py (modified) (1 diff)
• WebKit/UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• WebKit/UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• WebKit/UIProcess/API/mac/WKView.mm (modified) (1 diff)
• WebKit/UIProcess/API/mac/WKWebViewMac.mm (modified) (1 diff)
• WebKit/UIProcess/API/wpe/PageClientImpl.cpp (modified) (1 diff)
• WebKit/UIProcess/API/wpe/PageClientImpl.h (modified) (2 diffs)
• WebKit/UIProcess/Cocoa/WebViewImpl.h (modified) (2 diffs)
• WebKit/UIProcess/Cocoa/WebViewImpl.mm (modified) (7 diffs)
• WebKit/UIProcess/PageClient.h (modified) (2 diffs)
• WebKit/UIProcess/WebPageProxy.cpp (modified) (5 diffs)
• WebKit/UIProcess/WebPageProxy.h (modified) (2 diffs)
• WebKit/UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebKit/UIProcess/ios/PageClientImplIOS.h (modified) (2 diffs)
• WebKit/UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)
• WebKit/UIProcess/ios/WKContentViewInteraction.h (modified) (2 diffs)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (11 diffs)
• WebKit/UIProcess/ios/WebPageProxyIOS.mm (modified) (1 diff)
• WebKit/UIProcess/mac/PageClientImplMac.h (modified) (1 diff)
• WebKit/UIProcess/mac/PageClientImplMac.mm (modified) (1 diff)
• WebKit/UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)
• WebKit/UIProcess/playstation/PageClientImpl.cpp (modified) (1 diff)
• WebKit/UIProcess/playstation/PageClientImpl.h (modified) (1 diff)
• WebKit/UIProcess/win/PageClientImpl.cpp (modified) (1 diff)
• WebKit/UIProcess/win/PageClientImpl.h (modified) (2 diffs)
• WebKit/WebProcess/WebCoreSupport/WebEditorClient.cpp (modified) (1 diff)
• WebKit/WebProcess/WebCoreSupport/WebEditorClient.h (modified) (2 diffs)
• WebKit/WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebKit/WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• WebKitLegacy/win/ChangeLog (modified) (1 diff)
• WebKitLegacy/win/WebCoreSupport/WebEditorClient.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-08  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, reverting r286632.
+
+        Broke 3 tests on iOS
+
+        Reverted changeset:
+
+        "Add a `DOMPasteAccessCategory` to control which pasteboard
+        the WebProcess is granted access to when pasting"
+        https://bugs.webkit.org/show_bug.cgi?id=233939
+        https://commits.webkit.org/r286632
+
 2021-12-08  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/dom/DOMPasteAccess.h

@@ -30 +30 @@
 namespace WebCore {
 
-enum class DOMPasteAccessCategory : uint8_t {
-    General,
-};
-
 enum class DOMPasteAccessPolicy : uint8_t {
     NotRequestedYet,
@@ -50 +46 @@
 namespace WTF {
 
-template<> struct EnumTraits<WebCore::DOMPasteAccessCategory> {
-    using values = EnumValues<
-        WebCore::DOMPasteAccessCategory,
-        WebCore::DOMPasteAccessCategory::General
-    >;
-};
-
 template<> struct EnumTraits<WebCore::DOMPasteAccessResponse> {
     using values = EnumValues<

trunk/Source/WebCore/loader/EmptyClients.cpp

@@ -287 +287 @@
     void clearUndoRedoOperations() final { }
 
-    DOMPasteAccessResponse requestDOMPasteAccess(DOMPasteAccessCategory, const String&) final { return DOMPasteAccessResponse::DeniedForGesture; }
+    DOMPasteAccessResponse requestDOMPasteAccess(const String&) final { return DOMPasteAccessResponse::DeniedForGesture; }
 
     bool canCopyCut(Frame*, bool defaultValue) const final { return defaultValue; }

trunk/Source/WebCore/page/EditorClient.h

@@ -37 +37 @@
 namespace WebCore {
 
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 
@@ -103 +102 @@
     virtual void handleAcceptedCandidateWithSoftSpaces(TextCheckingResult) { }
 
-    virtual DOMPasteAccessResponse requestDOMPasteAccess(DOMPasteAccessCategory, const String& originIdentifier) = 0;
+    virtual DOMPasteAccessResponse requestDOMPasteAccess(const String& originIdentifier) = 0;
 
     // Notify an input method that a composition was voluntarily discarded by WebCore, so that it could clean up too.

trunk/Source/WebCore/page/Frame.cpp

@@ -562 +562 @@
 #endif // PLATFORM(IOS_FAMILY)
 
-bool Frame::requestDOMPasteAccess(DOMPasteAccessCategory pasteAccessCategory)
+bool Frame::requestDOMPasteAccess()
 {
     if (m_settings->javaScriptCanAccessClipboard() && m_settings->domPasteAllowed())
@@ -590 +590 @@
             return false;
 
-        auto response = client->requestDOMPasteAccess(pasteAccessCategory, m_doc->originIdentifierForPasteboard());
+        auto response = client->requestDOMPasteAccess(m_doc->originIdentifierForPasteboard());
         gestureToken->didRequestDOMPasteAccess(response);
         switch (response) {

trunk/Source/WebCore/page/Frame.h

@@ -177 +177 @@
     void setHasHadUserInteraction() { m_hasHadUserInteraction = true; }
 
-    bool requestDOMPasteAccess(DOMPasteAccessCategory = DOMPasteAccessCategory::General);
+    bool requestDOMPasteAccess();
 
     String debugDescription() const;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-08  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, reverting r286632.
+
+        Broke 3 tests on iOS
+
+        Reverted changeset:
+
+        "Add a `DOMPasteAccessCategory` to control which pasteboard
+        the WebProcess is granted access to when pasting"
+        https://bugs.webkit.org/show_bug.cgi?id=233939
+        https://commits.webkit.org/r286632
+
 2021-12-08  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/Scripts/webkit/messages.py

@@ -759 +759 @@
         'WebCore::CompositeOperator': ['<WebCore/GraphicsTypes.h>'],
         'WebCore::CreateNewGroupForHighlight': ['<WebCore/AppHighlight.h>'],
-        'WebCore::DOMPasteAccessCategory': ['<WebCore/DOMPasteAccess.h>'],
         'WebCore::DOMPasteAccessResponse': ['<WebCore/DOMPasteAccess.h>'],
         'WebCore::DestinationColorSpace': ['<WebCore/ColorSpace.h>'],

trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp

@@ -549 +549 @@
 #endif
 
-void PageClientImpl::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
+void PageClientImpl::requestDOMPasteAccess(const IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
 {
     completionHandler(WebCore::DOMPasteAccessResponse::DeniedForGesture);

trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h

@@ -161 +161 @@
     void isPlayingAudioDidChange() final { }
 
-    void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
+    void requestDOMPasteAccess(const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
 
 #if ENABLE(VIDEO) && USE(GSTREAMER)

trunk/Source/WebKit/UIProcess/API/mac/WKView.mm

@@ -913 +913 @@
 }
 
+- (void)_web_grantDOMPasteAccess
+{
+    _data->_impl->handleDOMPasteRequestWithResult(WebCore::DOMPasteAccessResponse::GrantedForGesture);
+}
+
 - (void)maybeInstallIconLoadingClient
 {

trunk/Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm

@@ -1233 +1233 @@
 }
 
+- (void)_web_grantDOMPasteAccess
+{
+    _impl->handleDOMPasteRequestWithResult(WebCore::DOMPasteAccessResponse::GrantedForGesture);
+}
+
 - (void)_takeFindStringFromSelectionInternal:(id)sender
 {

trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp

@@ -416 +416 @@
 #endif // ENABLE(FULLSCREEN_API)
 
-void PageClientImpl::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
+void PageClientImpl::requestDOMPasteAccess(const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
 {
     completionHandler(WebCore::DOMPasteAccessResponse::DeniedForGesture);

trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h

@@ -37 +37 @@
 
 namespace WebCore {
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 }
@@ -160 +159 @@
 
     IPC::Attachment hostFileDescriptor() final;
-    void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
+    void requestDOMPasteAccess(const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
 
     WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection() override;

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h

@@ -136 +136 @@
 #endif
 
+- (void)_web_grantDOMPasteAccess;
+
 @optional
 - (void)_web_didAddMediaControlsManager:(id)controlsManager;
@@ -651 +653 @@
     void clearPromisedDragImage();
 
-    void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&);
-    void handleDOMPasteRequestForCategoryWithResult(WebCore::DOMPasteAccessCategory, WebCore::DOMPasteAccessResponse);
+    void requestDOMPasteAccess(const WebCore::IntRect&, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&);
+    void handleDOMPasteRequestWithResult(WebCore::DOMPasteAccessResponse);
     NSMenu *domPasteMenu() const { return m_domPasteMenu.get(); }
-    void hideDOMPasteMenuWithResult(WebCore::DOMPasteAccessResponse);
 
 #if HAVE(TRANSLATION_UI_SERVICES) && ENABLE(CONTEXT_MENUS)

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

@@ -1008 +1008 @@
 
 @interface WKDOMPasteMenuDelegate : NSObject<NSMenuDelegate>
-- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl&)impl pasteAccessCategory:(WebCore::DOMPasteAccessCategory)category;
+- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl&)impl;
 @end
 
 @implementation WKDOMPasteMenuDelegate {
     WeakPtr<WebKit::WebViewImpl> _impl;
-    WebCore::DOMPasteAccessCategory _category;
-}
-
-- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl&)impl pasteAccessCategory:(WebCore::DOMPasteAccessCategory)category
+}
+
+- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl&)impl
 {
     if (!(self = [super init]))
@@ -1022 +1021 @@
 
     _impl = impl;
-    _category = category;
     return self;
 }
@@ -1030 +1028 @@
     RunLoop::main().dispatch([impl = _impl] {
         if (impl)
-            impl->hideDOMPasteMenuWithResult(WebCore::DOMPasteAccessResponse::DeniedForGesture);
+            impl->handleDOMPasteRequestWithResult(WebCore::DOMPasteAccessResponse::DeniedForGesture);
     });
 }
@@ -1044 +1042 @@
     confinementRect.move(0, -confinementRect.height());
     return confinementRect;
-}
-
-- (void)_web_grantDOMPasteAccess
-{
-    _impl->handleDOMPasteRequestForCategoryWithResult(_category, WebCore::DOMPasteAccessResponse::GrantedForGesture);
 }
 
@@ -1611 +1604 @@
     updateRemoteAccessibilityRegistration(false);
 
-    hideDOMPasteMenuWithResult(WebCore::DOMPasteAccessResponse::DeniedForGesture);
+    handleDOMPasteRequestWithResult(WebCore::DOMPasteAccessResponse::DeniedForGesture);
 }
 
@@ -4586 +4579 @@
 }
 
-static NSPasteboardName pasteboardNameForAccessCategory(WebCore::DOMPasteAccessCategory pasteAccessCategory)
-{
-    switch (pasteAccessCategory) {
-    case WebCore::DOMPasteAccessCategory::General:
-        return NSPasteboardNameGeneral;
-    }
-}
-
-static NSPasteboard *pasteboardForAccessCategory(WebCore::DOMPasteAccessCategory pasteAccessCategory)
-{
-    switch (pasteAccessCategory) {
-    case WebCore::DOMPasteAccessCategory::General:
-        return NSPasteboard.generalPasteboard;
-    }
-}
-
-void WebViewImpl::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAccessCategory, const WebCore::IntRect&, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completion)
+void WebViewImpl::requestDOMPasteAccess(const WebCore::IntRect&, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completion)
 {
     ASSERT(!m_domPasteRequestHandler);
-    hideDOMPasteMenuWithResult(WebCore::DOMPasteAccessResponse::DeniedForGesture);
-
-    NSData *data = [pasteboardForAccessCategory(pasteAccessCategory) dataForType:@(WebCore::PasteboardCustomData::cocoaType())];
+    handleDOMPasteRequestWithResult(WebCore::DOMPasteAccessResponse::DeniedForGesture);
+
+    NSData *data = [NSPasteboard.generalPasteboard dataForType:@(WebCore::PasteboardCustomData::cocoaType())];
     auto buffer = WebCore::SharedBuffer::create(data);
     if (WebCore::PasteboardCustomData::fromSharedBuffer(buffer.get()).origin() == originIdentifier) {
-        m_page->grantAccessToCurrentPasteboardData(pasteboardNameForAccessCategory(pasteAccessCategory));
+        m_page->grantAccessToCurrentPasteboardData(NSPasteboardNameGeneral);
         completion(WebCore::DOMPasteAccessResponse::GrantedForGesture);
         return;
     }
 
-    m_domPasteMenuDelegate = adoptNS([[WKDOMPasteMenuDelegate alloc] initWithWebViewImpl:*this pasteAccessCategory:pasteAccessCategory]);
+    m_domPasteMenuDelegate = adoptNS([[WKDOMPasteMenuDelegate alloc] initWithWebViewImpl:*this]);
     m_domPasteRequestHandler = WTFMove(completion);
     m_domPasteMenu = adoptNS([[NSMenu alloc] initWithTitle:WebCore::contextMenuItemTagPaste()]);
@@ -4621 +4598 @@
     [m_domPasteMenu setDelegate:m_domPasteMenuDelegate.get()];
     [m_domPasteMenu setAllowsContextMenuPlugIns:NO];
-
-    auto pasteMenuItem = RetainPtr([m_domPasteMenu insertItemWithTitle:WebCore::contextMenuItemTagPaste() action:@selector(_web_grantDOMPasteAccess) keyEquivalent:emptyString() atIndex:0]);
-    [pasteMenuItem setTarget:m_domPasteMenuDelegate.get()];
-
+    [m_domPasteMenu insertItemWithTitle:WebCore::contextMenuItemTagPaste() action:@selector(_web_grantDOMPasteAccess) keyEquivalent:emptyString() atIndex:0];
     [NSMenu popUpContextMenu:m_domPasteMenu.get() withEvent:m_lastMouseDownEvent.get() forView:m_view.getAutoreleased()];
 }
 
-void WebViewImpl::handleDOMPasteRequestForCategoryWithResult(WebCore::DOMPasteAccessCategory pasteAccessCategory, WebCore::DOMPasteAccessResponse response)
+void WebViewImpl::handleDOMPasteRequestWithResult(WebCore::DOMPasteAccessResponse response)
 {
     if (response == WebCore::DOMPasteAccessResponse::GrantedForCommand || response == WebCore::DOMPasteAccessResponse::GrantedForGesture)
-        m_page->grantAccessToCurrentPasteboardData(pasteboardNameForAccessCategory(pasteAccessCategory));
-
-    hideDOMPasteMenuWithResult(response);
-}
-
-void WebViewImpl::hideDOMPasteMenuWithResult(WebCore::DOMPasteAccessResponse response)
-{
+        m_page->grantAccessToCurrentPasteboardData(NSPasteboardNameGeneral);
+
     if (auto handler = std::exchange(m_domPasteRequestHandler, { }))
         handler(response);

trunk/Source/WebKit/UIProcess/PageClient.h

@@ -111 +111 @@
 enum class TextIndicatorLifetime : uint8_t;
 enum class TextIndicatorDismissalAnimation : uint8_t;
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 enum class ScrollIsAnimated : uint8_t;
@@ -601 +600 @@
 #endif
 
-    virtual void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect& elementRect, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) = 0;
+    virtual void requestDOMPasteAccess(const WebCore::IntRect& elementRect, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) = 0;
 
 #if ENABLE(ATTACHMENT_ELEMENT)

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -2511 +2511 @@
 }
 
-static std::optional<DOMPasteAccessCategory> pasteAccessCategoryForCommand(const String& commandName)
-{
-    static NeverDestroyed<HashMap<String, DOMPasteAccessCategory, ASCIICaseInsensitiveHash>> pasteCommandNames = HashMap<String, DOMPasteAccessCategory, ASCIICaseInsensitiveHash> {
-        { "Paste", DOMPasteAccessCategory::General },
-        { "PasteAndMatchStyle", DOMPasteAccessCategory::General },
-        { "PasteAsQuotation", DOMPasteAccessCategory::General },
-        { "PasteAsPlainText", DOMPasteAccessCategory::General },
+static bool isPasteCommandName(const String& commandName)
+{
+    static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> pasteCommandNames = HashSet<String, ASCIICaseInsensitiveHash> {
+        "Paste",
+        "PasteAndMatchStyle",
+        "PasteAsQuotation",
+        "PasteAsPlainText"
     };
-
-    auto it = pasteCommandNames->find(commandName);
-    if (it != pasteCommandNames->end())
-        return it->value;
-
-    return std::nullopt;
+    return pasteCommandNames->contains(commandName);
 }
 
@@ -2534 +2529 @@
     }
 
-    if (auto pasteAccessCategory = pasteAccessCategoryForCommand(commandName))
-        willPerformPasteCommand(*pasteAccessCategory);
+    if (isPasteCommandName(commandName))
+        willPerformPasteCommand();
 
     sendWithAsyncReply(Messages::WebPage::ExecuteEditCommandWithCallback(commandName, argument), [callbackFunction = WTFMove(callbackFunction), backgroundActivity = m_process->throttler().backgroundActivity("WebPageProxy::executeEditCommand"_s)] () mutable {
@@ -2549 +2544 @@
         return;
 
-    if (auto pasteAccessCategory = pasteAccessCategoryForCommand(commandName))
-        willPerformPasteCommand(*pasteAccessCategory);
+    if (isPasteCommandName(commandName))
+        willPerformPasteCommand();
 
     if (commandName == ignoreSpellingCommandName)
@@ -6617 +6612 @@
 #endif
 
-void WebPageProxy::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAccessCategory, const WebCore::IntRect& elementRect, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
-{
-    m_pageClient->requestDOMPasteAccess(pasteAccessCategory, elementRect, originIdentifier, WTFMove(completionHandler));
+void WebPageProxy::requestDOMPasteAccess(const WebCore::IntRect& elementRect, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
+{
+    m_pageClient->requestDOMPasteAccess(elementRect, originIdentifier, WTFMove(completionHandler));
 }
 
@@ -10820 +10815 @@
 #if !PLATFORM(COCOA)
 
-void WebPageProxy::willPerformPasteCommand(DOMPasteAccessCategory)
+void WebPageProxy::willPerformPasteCommand()
 {
 }

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -268 +268 @@
 enum class CookieConsentDecisionResult : uint8_t;
 enum class CreateNewGroupForHighlight : bool;
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 enum class EventMakesGamepadsVisible : bool;
@@ -2262 +2261 @@
 #endif
 
-    void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&);
-    void willPerformPasteCommand(WebCore::DOMPasteAccessCategory);
+    void requestDOMPasteAccess(const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&);
+    void willPerformPasteCommand();
 
     // Back/Forward list management

trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

@@ -233 +233 @@
 #endif
 
-    RequestDOMPasteAccess(enum:uint8_t WebCore::DOMPasteAccessCategory pasteAccessCategory, WebCore::IntRect elementRect, String originIdentifier) -> (enum:uint8_t WebCore::DOMPasteAccessResponse response) Synchronous
+    RequestDOMPasteAccess(WebCore::IntRect elementRect, String originIdentifier) -> (enum:uint8_t WebCore::DOMPasteAccessResponse response) Synchronous
 
     # Find messages

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h

@@ -39 +39 @@
 
 namespace WebCore {
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 struct PromisedAttachmentInfo;
@@ -268 +267 @@
 #endif
 
-    void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect& elementRect, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
+    void requestDOMPasteAccess(const WebCore::IntRect& elementRect, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
 
 #if ENABLE(DRAG_SUPPORT)

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm

@@ -952 +952 @@
 #endif
 
-void PageClientImpl::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAccessCategory, const WebCore::IntRect& elementRect, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
-{
-    [m_contentView _requestDOMPasteAccessForCategory:pasteAccessCategory elementRect:elementRect originIdentifier:originIdentifier completionHandler:WTFMove(completionHandler)];
+void PageClientImpl::requestDOMPasteAccess(const WebCore::IntRect& elementRect, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
+{
+    [m_contentView _requestDOMPasteAccessWithElementRect:elementRect originIdentifier:originIdentifier completionHandler:WTFMove(completionHandler)];
 }
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

@@ -91 +91 @@
 struct ShareDataWithParsedURL;
 struct TextRecognitionResult;
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 enum class MouseEventPolicy : uint8_t;
@@ -677 +676 @@
 - (void)updateFocusedElementFocusedWithDataListDropdown:(BOOL)value;
 
-- (void)_requestDOMPasteAccessForCategory:(WebCore::DOMPasteAccessCategory)pasteAccessCategory elementRect:(const WebCore::IntRect&)elementRect originIdentifier:(const String&)originIdentifier completionHandler:(CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&)completionHandler;
+- (void)_requestDOMPasteAccessWithElementRect:(const WebCore::IntRect&)elementRect originIdentifier:(const String&)originIdentifier completionHandler:(CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&)completionHandler;
 
 - (void)doAfterPositionInformationUpdate:(void (^)(WebKit::InteractionInformationAtPosition))action forRequest:(WebKit::InteractionInformationRequest)request;

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1270 +1270 @@
 
     [self _resetPanningPreventionFlags];
-    [self _hidePasteMenuWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
+    [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
     [self _cancelPendingKeyEventHandler];
 
@@ -1659 +1659 @@
 
     if (superDidResign) {
-        [self _hidePasteMenuWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
+        [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
         _page->activityStateDidChange(WebCore::ActivityState::IsFocused, WebKit::WebPageProxy::ActivityStateChangeDispatchMode::Immediate);
 
@@ -1727 +1727 @@
     _lastInteractionLocation = lastTouchEvent->locationInDocumentCoordinates;
     if (lastTouchEvent->type == UIWebTouchEventTouchBegin) {
-        [self _hidePasteMenuWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
+        [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
         _layerTreeTransactionIdAtLastInteractionStart = downcast<WebKit::RemoteLayerTreeDrawingAreaProxy>(*_page->drawingArea()).lastCommittedLayerTreeTransactionID();
 
@@ -3991 +3991 @@
 - (void)_willHideMenu:(NSNotification *)notification
 {
-    [self _hidePasteMenuWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
+    [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
 }
 
@@ -4019 +4019 @@
 - (void)pasteForWebView:(id)sender
 {
-    if (sender == UIMenuController.sharedMenuController && [self _hidePasteMenuWithResult:WebCore::DOMPasteAccessResponse::GrantedForGesture])
+    if (sender == UIMenuController.sharedMenuController && [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::GrantedForGesture])
         return;
 
@@ -4165 +4165 @@
 }
 
-static UIPasteboardName pasteboardNameForAccessCategory(WebCore::DOMPasteAccessCategory pasteAccessCategory)
-{
-    switch (pasteAccessCategory) {
-    case WebCore::DOMPasteAccessCategory::General:
-        return UIPasteboardNameGeneral;
-    }
-}
-
-static UIPasteboard *pasteboardForAccessCategory(WebCore::DOMPasteAccessCategory pasteAccessCategory)
-{
-    switch (pasteAccessCategory) {
-    case WebCore::DOMPasteAccessCategory::General:
-        return UIPasteboard.generalPasteboard;
-    }
-}
-
-- (BOOL)_hidePasteMenuWithResult:(WebCore::DOMPasteAccessResponse)response
-{
+- (BOOL)_handleDOMPasteRequestWithResult:(WebCore::DOMPasteAccessResponse)response
+{
+    if (response == WebCore::DOMPasteAccessResponse::GrantedForCommand || response == WebCore::DOMPasteAccessResponse::GrantedForGesture)
+        _page->grantAccessToCurrentPasteboardData(UIPasteboardNameGeneral);
+
     if (auto pasteHandler = WTFMove(_domPasteRequestHandler)) {
         [UIMenuController.sharedMenuController hideMenuFromView:self];
@@ -4191 +4178 @@
 }
 
-- (BOOL)_handleDOMPasteRequestForCategory:(WebCore::DOMPasteAccessCategory)pasteAccessCategory result:(WebCore::DOMPasteAccessResponse)response
-{
-    if (response == WebCore::DOMPasteAccessResponse::GrantedForCommand || response == WebCore::DOMPasteAccessResponse::GrantedForGesture)
-        _page->grantAccessToCurrentPasteboardData(pasteboardNameForAccessCategory(pasteAccessCategory));
-
-    return [self _hidePasteMenuWithResult:response];
-}
-
 - (void)_willPerformAction:(SEL)action sender:(id)sender
 {
     if (action != @selector(paste:))
-        [self _hidePasteMenuWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
+        [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
 }
 
@@ -4208 +4187 @@
 {
     if (action == @selector(paste:))
-        [self _hidePasteMenuWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
+        [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
 }
 
@@ -5868 +5847 @@
     }
 
-    [self _hidePasteMenuWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
+    [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::DeniedForGesture];
 
     using HandledByInputMethod = WebKit::NativeWebKeyboardEvent::HandledByInputMethod;
@@ -6657 +6636 @@
 }
 
-- (void)_requestDOMPasteAccessForCategory:(WebCore::DOMPasteAccessCategory)pasteAccessCategory elementRect:(const WebCore::IntRect&)elementRect originIdentifier:(const String&)originIdentifier completionHandler:(CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&)completionHandler
+- (void)_requestDOMPasteAccessWithElementRect:(const WebCore::IntRect&)elementRect originIdentifier:(const String&)originIdentifier completionHandler:(CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&)completionHandler
 {
     if (auto existingCompletionHandler = std::exchange(_domPasteRequestHandler, WTFMove(completionHandler))) {
@@ -6664 +6643 @@
     }
 
-    if (allPasteboardItemOriginsMatchOrigin(pasteboardForAccessCategory(pasteAccessCategory), originIdentifier)) {
-        [self _handleDOMPasteRequestForCategory:pasteAccessCategory result:WebCore::DOMPasteAccessResponse::GrantedForCommand];
+    if (allPasteboardItemOriginsMatchOrigin(UIPasteboard.generalPasteboard, originIdentifier)) {
+        [self _handleDOMPasteRequestWithResult:WebCore::DOMPasteAccessResponse::GrantedForCommand];
         return;
     }

trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm

@@ -1545 +1545 @@
 #endif
 
-void WebPageProxy::willPerformPasteCommand(DOMPasteAccessCategory pasteAccessCategory)
-{
-    switch (pasteAccessCategory) {
-    case DOMPasteAccessCategory::General:
-        grantAccessToCurrentPasteboardData(UIPasteboardNameGeneral);
-        return;
-    }
+void WebPageProxy::willPerformPasteCommand()
+{
+    grantAccessToCurrentPasteboardData(UIPasteboardNameGeneral);
 }
 

trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h

@@ -226 +226 @@
     void didRemoveNavigationGestureSnapshot() override;
 
-    void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
+    void requestDOMPasteAccess(const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
 
     void makeViewBlank(bool) final;

trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm

@@ -1001 +1001 @@
 }
 
-void PageClientImpl::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAccessCategory, const WebCore::IntRect& elementRect, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completion)
-{
-    m_impl->requestDOMPasteAccess(pasteAccessCategory, elementRect, originIdentifier, WTFMove(completion));
+void PageClientImpl::requestDOMPasteAccess(const WebCore::IntRect& elementRect, const String& originIdentifier, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completion)
+{
+    m_impl->requestDOMPasteAccess(elementRect, originIdentifier, WTFMove(completion));
 }
 

trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm

@@ -652 +652 @@
 #endif
 
-void WebPageProxy::willPerformPasteCommand(DOMPasteAccessCategory pasteAccessCategory)
-{
-    switch (pasteAccessCategory) {
-    case DOMPasteAccessCategory::General:
-        grantAccessToCurrentPasteboardData(NSPasteboardNameGeneral);
-        return;
-    }
+void WebPageProxy::willPerformPasteCommand()
+{
+    grantAccessToCurrentPasteboardData(NSPasteboardNameGeneral);
 }
 

trunk/Source/WebKit/UIProcess/playstation/PageClientImpl.cpp

@@ -318 +318 @@
 }
 
-void PageClientImpl::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
+void PageClientImpl::requestDOMPasteAccess(const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
 {
     completionHandler(WebCore::DOMPasteAccessResponse::DeniedForGesture);

trunk/Source/WebKit/UIProcess/playstation/PageClientImpl.h

@@ -150 +150 @@
     WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection() override;
 
-    void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) override;
+    void requestDOMPasteAccess(const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) override;
 
     PlayStationWebView& m_view;

trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp

@@ -374 +374 @@
 }
 
-void PageClientImpl::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
+void PageClientImpl::requestDOMPasteAccess(const IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&& completionHandler)
 {
     completionHandler(WebCore::DOMPasteAccessResponse::DeniedForGesture);

trunk/Source/WebKit/UIProcess/win/PageClientImpl.h

@@ -36 +36 @@
 
 namespace WebCore {
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 }
@@ -150 +149 @@
     WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection() override { return WebCore::UserInterfaceLayoutDirection::LTR; }
 
-    void requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
+    void requestDOMPasteAccess(const WebCore::IntRect&, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
 
     // Members of PageClientImpl class

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.cpp

@@ -333 +333 @@
 }
 
-WebCore::DOMPasteAccessResponse WebEditorClient::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAccessCategory, const String& originIdentifier)
-{
-    return m_page->requestDOMPasteAccess(pasteAccessCategory, originIdentifier);
+WebCore::DOMPasteAccessResponse WebEditorClient::requestDOMPasteAccess(const String& originIdentifier)
+{
+    return m_page->requestDOMPasteAccess(originIdentifier);
 }
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.h

@@ -30 +30 @@
 
 namespace WebCore {
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 }
@@ -95 +94 @@
     void clearUndoRedoOperations() final;
 
-    WebCore::DOMPasteAccessResponse requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const String& originIdentifier) final;
+    WebCore::DOMPasteAccessResponse requestDOMPasteAccess(const String& originIdentifier) final;
 
     bool canCopyCut(WebCore::Frame*, bool defaultValue) const final;

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -7208 +7208 @@
 }
 
-WebCore::DOMPasteAccessResponse WebPage::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAccessCategory, const String& originIdentifier)
+WebCore::DOMPasteAccessResponse WebPage::requestDOMPasteAccess(const String& originIdentifier)
 {
     auto response = WebCore::DOMPasteAccessResponse::DeniedForGesture;
@@ -7218 +7218 @@
     send(Messages::WebPageProxy::HandleAutocorrectionContext(autocorrectionContext()));
 #endif
-    sendSyncWithDelayedReply(Messages::WebPageProxy::RequestDOMPasteAccess(pasteAccessCategory, rectForElementAtInteractionLocation(), originIdentifier), Messages::WebPageProxy::RequestDOMPasteAccess::Reply(response));
+    sendSyncWithDelayedReply(Messages::WebPageProxy::RequestDOMPasteAccess(rectForElementAtInteractionLocation(), originIdentifier), Messages::WebPageProxy::RequestDOMPasteAccess::Reply(response));
     return response;
 }

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -225 +225 @@
 enum class COEPDisposition : bool;
 enum class CreateNewGroupForHighlight : bool;
-enum class DOMPasteAccessCategory : uint8_t;
 enum class DOMPasteAccessResponse : uint8_t;
 enum class DragApplicationFlags : uint8_t;
@@ -1341 +1340 @@
     }
 
-    WebCore::DOMPasteAccessResponse requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const String& originIdentifier);
+    WebCore::DOMPasteAccessResponse requestDOMPasteAccess(const String& originIdentifier);
     WebCore::IntRect rectForElementAtInteractionLocation() const;
 

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2021-12-08  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, reverting r286632.
+
+        Broke 3 tests on iOS
+
+        Reverted changeset:
+
+        "Add a `DOMPasteAccessCategory` to control which pasteboard
+        the WebProcess is granted access to when pasting"
+        https://bugs.webkit.org/show_bug.cgi?id=233939
+        https://commits.webkit.org/r286632
+
 2021-12-07  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h

@@ -84 +84 @@
 
     void setInsertionPasteboard(const String&) final;
-    WebCore::DOMPasteAccessResponse requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const String&) final { return WebCore::DOMPasteAccessResponse::DeniedForGesture; }
+    WebCore::DOMPasteAccessResponse requestDOMPasteAccess(const String&) final { return WebCore::DOMPasteAccessResponse::DeniedForGesture; }
 
 #if USE(APPKIT)

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2021-12-08  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, reverting r286632.
+
+        Broke 3 tests on iOS
+
+        Reverted changeset:
+
+        "Add a `DOMPasteAccessCategory` to control which pasteboard
+        the WebProcess is granted access to when pasting"
+        https://bugs.webkit.org/show_bug.cgi?id=233939
+        https://commits.webkit.org/r286632
+
 2021-12-07  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.h

@@ -118 +118 @@
     bool performTwoStepDrop(WebCore::DocumentFragment&, const WebCore::SimpleRange&, bool) final { return false; }
 
-    WebCore::DOMPasteAccessResponse requestDOMPasteAccess(WebCore::DOMPasteAccessCategory, const String&) final { return WebCore::DOMPasteAccessResponse::DeniedForGesture; }
+    WebCore::DOMPasteAccessResponse requestDOMPasteAccess(const String&) final { return WebCore::DOMPasteAccessResponse::DeniedForGesture; }
 
     WebCore::TextCheckerClient* textChecker() final { return this; }