Attachment 361847 Details for Bug 194271 – Part 2 (for landing)

[patch] Part 2 (for landing)

bug-194271-20190212145048.patch (text/plain), 56.86 KB, created by Wenson Hsieh on 2019-02-12 14:50:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-02-12 14:50:49 PST

Size: 56.86 KB

patch

obsolete

>Subversion Revision: 241315
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1586f5552dd4fb3fda2e82e2bdfc542ffea619d8..14c99f0b9bf8a43095dec7cca37f9a8bd9bc34cb 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-02-12  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Allow pages to trigger programmatic paste from script on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=194271
>+        <rdar://problem/47808810>
>+
>+        Reviewed by Tim Horton.
>+
>+        Tests: editing/pasteboard/ios/dom-paste-confirmation.html
>+               editing/pasteboard/ios/dom-paste-consecutive-confirmations.html
>+               editing/pasteboard/ios/dom-paste-rejection.html
>+               editing/pasteboard/ios/dom-paste-requires-user-gesture.html
>+
>+        * dom/UserGestureIndicator.cpp:
>+        (WebCore::UserGestureIndicator::~UserGestureIndicator):
>+
>+        Reset a gesture token's DOM paste access when exiting the scope of a user gesture. This prevents DOM paste
>+        access permissions from leaking into `setTimeout()` callbacks when we forward user gesture tokens.
>+
>+        * dom/UserGestureIndicator.h:
>+        (WebCore::UserGestureToken::resetDOMPasteAccess):
>+
> 2019-02-12  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Allow pages to trigger programmatic paste from script on iOS
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index acd0e85573e141b1ec4cc9d24ba6f89087ced835..8fd45f47a204665616fd5580a8aeaa14d66265e7 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-02-12  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Allow pages to trigger programmatic paste from script on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=194271
>+        <rdar://problem/47808810>
>+
>+        Reviewed by Tim Horton.
>+
>+        Cancel the pending DOM paste access handler when the menu is about to hide, rather than when the hiding
>+        animation has completed. This ensures that if the page (on behalf of the user) requests DOM paste again during
>+        user interaction before the callout bar has finished fading after the previous DOM paste, we won't automatically
>+        cancel the incoming DOM paste access request because the callout bar animation finished.
>+
>+        This scenario is exercised in the layout test editing/pasteboard/ios/dom-paste-consecutive-confirmations.html.
>+
>+        * Platform/spi/ios/UIKitSPI.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView setupInteraction]):
>+        (-[WKContentView _willHideMenu:]):
>+        (-[WKContentView _didHideMenu:]):
>+
> 2019-02-12  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Allow pages to trigger programmatic paste from script on iOS
>diff --git a/Source/WebCore/dom/UserGestureIndicator.cpp b/Source/WebCore/dom/UserGestureIndicator.cpp
>index f691d386d6bad1ae989d489cf095dc3e47380267..35665dd1c31d1d208274da8a938d62ade521a95d 100644
>--- a/Source/WebCore/dom/UserGestureIndicator.cpp
>+++ b/Source/WebCore/dom/UserGestureIndicator.cpp
>@@ -87,6 +87,9 @@ UserGestureIndicator::~UserGestureIndicator()
>     if (!isMainThread())
>         return;
>     
>+    if (auto token = currentToken())
>+        token->resetDOMPasteAccess();
>+
>     currentToken() = m_previousToken;
> }
> 
>diff --git a/Source/WebCore/dom/UserGestureIndicator.h b/Source/WebCore/dom/UserGestureIndicator.h
>index 3e5ea4306325a245b76de5236ce56604de9df6e6..ddcbdd6490066875de58dd4006b57534c63e3089 100644
>--- a/Source/WebCore/dom/UserGestureIndicator.h
>+++ b/Source/WebCore/dom/UserGestureIndicator.h
>@@ -66,6 +66,7 @@ public:
> 
>     DOMPasteAccessPolicy domPasteAccessPolicy() const { return m_domPasteAccessPolicy; }
>     void didRequestDOMPasteAccess(bool granted) { m_domPasteAccessPolicy = granted ? DOMPasteAccessPolicy::Granted : DOMPasteAccessPolicy::Denied; }
>+    void resetDOMPasteAccess() { m_domPasteAccessPolicy = DOMPasteAccessPolicy::NotRequestedYet; }
> 
> private:
>     UserGestureToken(ProcessingUserGestureState state, UserGestureType gestureType)
>diff --git a/Source/WebKit/Platform/spi/ios/UIKitSPI.h b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>index 9d72b4a1ac27de60d6ca0f844e853b956fe20463..02c60018d4a45fa4696c82f62defe08c029e3f03 100644
>--- a/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>+++ b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
>@@ -980,6 +980,12 @@ typedef NS_OPTIONS(NSUInteger, UIDragOperation)
> -(void)remove;
> @end
> 
>+@interface UIURLDragPreviewView : UIView
>++ (instancetype)viewWithTitle:(NSString *)title URL:(NSURL *)url;
>+@end
>+
>+#endif
>+
> @interface UICalloutBar : UIView
> + (void)fadeSharedCalloutBar;
> @end
>@@ -991,12 +997,6 @@ typedef NS_OPTIONS(NSUInteger, UIDragOperation)
> + (UITextEffectsWindow *)sharedTextEffectsWindow;
> @end
> 
>-@interface UIURLDragPreviewView : UIView
>-+ (instancetype)viewWithTitle:(NSString *)title URL:(NSURL *)url;
>-@end
>-
>-#endif
>-
> @interface _UIVisualEffectLayerConfig : NSObject
> + (instancetype)layerWithFillColor:(UIColor *)fillColor opacity:(CGFloat)opacity filterType:(NSString *)filterType;
> - (void)configureLayerView:(UIView *)view;
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index a0a77c8f65189930d73b5dffce4881b4fe83a33f..ae3485299a093b79fbebb3b63342418967477f96 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -740,6 +740,7 @@ - (void)setupInteraction
> #endif
> 
>     NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
>+    [center addObserver:self selector:@selector(_willHideMenu:) name:UIMenuControllerWillHideMenuNotification object:nil];
>     [center addObserver:self selector:@selector(_didHideMenu:) name:UIMenuControllerDidHideMenuNotification object:nil];
>     [center addObserver:self selector:@selector(_keyboardDidRequestDismissal:) name:UIKeyboardPrivateDidRequestDismissalNotification object:nil];
> 
>@@ -2810,11 +2811,15 @@ - (id)targetForActionForWebView:(SEL)action withSender:(id)sender
>     return [super targetForAction:action withSender:sender];
> }
> 
>+- (void)_willHideMenu:(NSNotification *)notification
>+{
>+    [self _handleDOMPasteRequestWithResult:NO];
>+}
>+
> - (void)_didHideMenu:(NSNotification *)notification
> {
>     _showingTextStyleOptions = NO;
>     [_textSelectionAssistant hideTextStyleOptions];
>-    [self _handleDOMPasteRequestWithResult:NO];
> }
> 
> - (void)_keyboardDidRequestDismissal:(NSNotification *)notification
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index d9df5083ab86b14ff6a9b697926fb54a5865ab49..5e93a8a73e5f4aead5efda645f57ab1db8344bd0 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,96 @@
>+2019-02-12  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Allow pages to trigger programmatic paste from script on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=194271
>+        <rdar://problem/47808810>
>+
>+        Reviewed by Tim Horton.
>+
>+        Add support for interacting with the callout bar on iOS during layout tests. See below for more detail.
>+
>+        * DumpRenderTree/ios/UIScriptControllerIOS.mm:
>+        (WTR::UIScriptController::platformSetDidShowMenuCallback):
>+        (WTR::UIScriptController::platformSetDidHideMenuCallback):
>+        (WTR::UIScriptController::rectForMenuAction const):
>+
>+        Add new mechanisms to make it possible to interact with and query the state of the callout menu on iOS. This
>+        includes determining the rect (in content view coordinates) of the menu's controls, and callbacks to register
>+        for when the menu is shown or hidden.
>+
>+        * TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl:
>+        * TestRunnerShared/UIScriptContext/UIScriptContext.h:
>+        * TestRunnerShared/UIScriptContext/UIScriptController.cpp:
>+        (WTR::UIScriptController::setDidShowMenuCallback):
>+        (WTR::UIScriptController::didShowMenuCallback const):
>+        (WTR::UIScriptController::setDidHideMenuCallback):
>+        (WTR::UIScriptController::didHideMenuCallback const):
>+        (WTR::UIScriptController::platformSetDidShowMenuCallback):
>+        (WTR::UIScriptController::platformSetDidHideMenuCallback):
>+        (WTR::UIScriptController::rectForMenuAction const):
>+        * TestRunnerShared/UIScriptContext/UIScriptController.h:
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::resetPreferencesToConsistentValues):
>+        (WTR::updateTestOptionsFromTestHeader):
>+        * WebKitTestRunner/TestOptions.h:
>+
>+        Add a new test option to determine whether DOM paste is enabled. DOM paste is currently enabled everywhere by
>+        default, but these new programmatic paste tests require it to be disabled in order for confirmation UI to show.
>+
>+        (WTR::TestOptions::hasSameInitializationOptions const):
>+        * WebKitTestRunner/UIScriptControllerCocoa.mm:
>+        (WTR::UIScriptController::calendarType const):
>+        (WTR::UIScriptController::platformUndoManager const):
>+        * WebKitTestRunner/cocoa/TestRunnerWKWebView.h:
>+        * WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
>+        (-[TestRunnerWKWebView initWithFrame:configuration:]):
>+        (-[TestRunnerWKWebView dealloc]):
>+        (-[TestRunnerWKWebView _didShowMenu]):
>+        (-[TestRunnerWKWebView _didHideMenu]):
>+
>+        Listen to when the callout bar is presented and dismissed, and invoke testing callbacks as needed.
>+
>+        * WebKitTestRunner/ios/TestControllerIOS.mm:
>+        (WTR::handleMenuWillHideNotification):
>+        (WTR::handleMenuDidHideNotification):
>+        (WTR::TestController::platformInitialize):
>+        (WTR::TestController::platformDestroy):
>+        (WTR::TestController::platformResetStateToConsistentValues):
>+
>+        Additionally ensure that any callout menu presented by a previous layout test is dismissed before running the
>+        next test by hiding the callout bar if necessary, and then waiting for the "DidHide" notification.
>+
>+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
>+        (WTR::forEachViewInHierarchy):
>+        (WTR::findViewInHierarchyOfType):
>+
>+        Move `forEachViewInHierarchy` so that we can use it throughout the file, and then add some additional helper
>+        functions that dig through a given view's hierarchy in search of a view of a given class.
>+
>+        (WTR::UIScriptController::selectionStartGrabberViewRect const):
>+        (WTR::UIScriptController::selectionEndGrabberViewRect const):
>+        (WTR::UIScriptController::selectionCaretViewRect const):
>+        (WTR::UIScriptController::selectionRangeViewRects const):
>+        (WTR::UIScriptController::platformSetDidShowMenuCallback):
>+        (WTR::UIScriptController::platformSetDidHideMenuCallback):
>+
>+        Tweak these to use `platformContentView` instead of grabbing the content view from WKWebView directly.
>+
>+        (WTR::UIScriptController::rectForMenuAction const):
>+
>+        Add a new UIScriptController method to get the rect of the action in the contextual menu (on iOS, this is the
>+        callout bar) whose label matches the given string.
>+
>+        (WTR::UIScriptController::platformContentView const):
>+
>+        Add a `platformContentView()` helper on UIScriptController so that we can stop grabbing the value for key
>+        "_currentContentView" from various places in this file. Additionally, rewrite `platformUndoManager()` in terms
>+        of this new helper, and move the code out from iOS/macOS-specific files into UIScriptControllerCocoa.
>+
>+        (WTR::UIScriptController::platformUndoManager const): Deleted.
>+        * WebKitTestRunner/mac/UIScriptControllerMac.mm:
>+        (WTR::UIScriptController::platformContentView const):
>+        (WTR::UIScriptController::platformUndoManager const): Deleted.
>+
> 2019-02-12  Alex Christensen  <achristensen@webkit.org>
> 
>         WebPage::close needs to remove all message receivers associated with that WebPage, not WebPage::~WebPage
>diff --git a/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm b/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm
>index f32c10423e38b291adc3f052231e53e45800d6b6..ffb4dea6a2c7e0b0bb56710ee433dd11c0971640 100644
>--- a/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm
>+++ b/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm
>@@ -324,6 +324,19 @@ void UIScriptController::platformSetDidHideKeyboardCallback()
> {
> }
> 
>+void UIScriptController::platformSetDidShowMenuCallback()
>+{
>+}
>+
>+void UIScriptController::platformSetDidHideMenuCallback()
>+{
>+}
>+
>+JSObjectRef UIScriptController::rectForMenuAction(JSStringRef) const
>+{
>+    return nullptr;
>+}
>+
> void UIScriptController::platformSetDidEndScrollingCallback()
> {
> }
>diff --git a/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl b/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
>index 350b29a1711104a7ef4a67ecbdcdb78d87b8a859..3a9c3e29b9c122f47623c02ca1e8f36e29a6576a 100644
>--- a/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
>+++ b/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
>@@ -223,6 +223,10 @@ interface UIScriptController {
>     attribute object didHideKeyboardCallback;
>     readonly attribute boolean isShowingKeyboard;
> 
>+    attribute object didShowMenuCallback;
>+    attribute object didHideMenuCallback;
>+    object rectForMenuAction(DOMString action);
>+
>     attribute object willBeginZoomingCallback;
>     attribute object didEndZoomingCallback;
> 
>diff --git a/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.h b/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.h
>index 4ec18293a0331155ff9cb2354ac555ba1408dbbc..8040647a23f237618a3ebd65d76227e8c4a2b6df 100644
>--- a/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.h
>+++ b/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.h
>@@ -54,6 +54,8 @@ typedef enum  {
>     CallbackTypeDidEndZooming,
>     CallbackTypeDidShowKeyboard,
>     CallbackTypeDidHideKeyboard,
>+    CallbackTypeDidShowMenu,
>+    CallbackTypeDidHideMenu,
>     CallbackTypeDidEndScrolling,
>     CallbackTypeDidStartFormControlInteraction,
>     CallbackTypeDidEndFormControlInteraction,
>diff --git a/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp b/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp
>index e3b216bf5a1134e678d3086fa314a1c5767f7bf6..b9472d0fd17769eb8adfaf4bf3cbc796b3de8c60 100644
>--- a/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp
>+++ b/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp
>@@ -205,6 +205,28 @@ JSValueRef UIScriptController::didHideKeyboardCallback() const
>     return m_context->callbackWithID(CallbackTypeDidHideKeyboard);
> }
> 
>+void UIScriptController::setDidShowMenuCallback(JSValueRef callback)
>+{
>+    m_context->registerCallback(callback, CallbackTypeDidShowMenu);
>+    platformSetDidShowMenuCallback();
>+}
>+
>+JSValueRef UIScriptController::didShowMenuCallback() const
>+{
>+    return m_context->callbackWithID(CallbackTypeDidShowMenu);
>+}
>+
>+void UIScriptController::setDidHideMenuCallback(JSValueRef callback)
>+{
>+    m_context->registerCallback(callback, CallbackTypeDidHideMenu);
>+    platformSetDidHideMenuCallback();
>+}
>+
>+JSValueRef UIScriptController::didHideMenuCallback() const
>+{
>+    return m_context->callbackWithID(CallbackTypeDidHideMenu);
>+}
>+
> #if !PLATFORM(COCOA)
> 
> void UIScriptController::zoomToScale(double, JSValueRef)
>@@ -502,6 +524,19 @@ void UIScriptController::platformSetDidHideKeyboardCallback()
> {
> }
> 
>+void UIScriptController::platformSetDidShowMenuCallback()
>+{
>+}
>+
>+void UIScriptController::platformSetDidHideMenuCallback()
>+{
>+}
>+
>+JSObjectRef UIScriptController::rectForMenuAction(JSStringRef) const
>+{
>+    return nullptr;
>+}
>+
> void UIScriptController::platformClearAllCallbacks()
> {
> }
>diff --git a/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h b/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h
>index 9f5431a840f419a50b4b258b2a9150c793d3171a..5f335ed21399f18b024b1f678cbbd0be4db46e1d 100644
>--- a/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h
>+++ b/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h
>@@ -32,6 +32,8 @@
> #include <wtf/Ref.h>
> 
> OBJC_CLASS NSUndoManager;
>+OBJC_CLASS NSView;
>+OBJC_CLASS UIView;
> 
> namespace WebCore {
> class FloatRect;
>@@ -156,6 +158,14 @@ public:
> 
>     bool isShowingKeyboard() const;
> 
>+    void setDidHideMenuCallback(JSValueRef);
>+    JSValueRef didHideMenuCallback() const;
>+
>+    void setDidShowMenuCallback(JSValueRef);
>+    JSValueRef didShowMenuCallback() const;
>+
>+    JSObjectRef rectForMenuAction(JSStringRef action) const;
>+
>     void setDidEndScrollingCallback(JSValueRef);
>     JSValueRef didEndScrollingCallback() const;
> 
>@@ -230,6 +240,8 @@ private:
>     void platformSetDidEndZoomingCallback();
>     void platformSetDidShowKeyboardCallback();
>     void platformSetDidHideKeyboardCallback();
>+    void platformSetDidShowMenuCallback();
>+    void platformSetDidHideMenuCallback();
>     void platformSetDidEndScrollingCallback();
>     void platformClearAllCallbacks();
>     void platformPlayBackEventStream(JSStringRef, JSValueRef);
>@@ -238,6 +250,13 @@ private:
>     NSUndoManager *platformUndoManager() const;
> #endif
> 
>+#if PLATFORM(IOS_FAMILY)
>+    UIView *platformContentView() const;
>+#endif
>+#if PLATFORM(MAC)
>+    NSView *platformContentView() const;
>+#endif
>+
>     JSClassRef wrapperClass() final;
> 
>     JSObjectRef objectFromRect(const WebCore::FloatRect&) const;
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 7747f8d07b4968289a0ac83285f6817a5b18be72..07aee9feb2c1b8abab2df6f176331f2ec50ab363 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -748,7 +748,7 @@ void TestController::resetPreferencesToConsistentValues(const TestOptions& optio
>     WKPreferencesSetJavaScriptRuntimeFlags(preferences, kWKJavaScriptRuntimeFlagsAllEnabled);
>     WKPreferencesSetJavaScriptCanOpenWindowsAutomatically(preferences, true);
>     WKPreferencesSetJavaScriptCanAccessClipboard(preferences, true);
>-    WKPreferencesSetDOMPasteAllowed(preferences, true);
>+    WKPreferencesSetDOMPasteAllowed(preferences, options.domPasteAllowed);
>     WKPreferencesSetUniversalAccessFromFileURLsAllowed(preferences, true);
>     WKPreferencesSetFileAccessFromFileURLsAllowed(preferences, true);
> #if ENABLE(FULLSCREEN_API)
>@@ -1269,6 +1269,8 @@ static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const std:
>             testOptions.applicationManifest = parseStringTestHeaderValueAsRelativePath(value, pathOrURL);
>         else if (key == "allowCrossOriginSubresourcesToAskForCredentials")
>             testOptions.allowCrossOriginSubresourcesToAskForCredentials = parseBooleanTestHeaderValue(value);
>+        else if (key == "domPasteAllowed")
>+            testOptions.domPasteAllowed = parseBooleanTestHeaderValue(value);
>         else if (key == "enableProcessSwapOnNavigation")
>             testOptions.enableProcessSwapOnNavigation = parseBooleanTestHeaderValue(value);
>         else if (key == "enableProcessSwapOnWindowOpen")
>diff --git a/Tools/WebKitTestRunner/TestOptions.h b/Tools/WebKitTestRunner/TestOptions.h
>index 0ac586eb1eabe5e1901cad638b648328a74ea882..392d8e70b409e88e5924e3fddc0de77628dd91d4 100644
>--- a/Tools/WebKitTestRunner/TestOptions.h
>+++ b/Tools/WebKitTestRunner/TestOptions.h
>@@ -57,6 +57,7 @@ struct TestOptions {
>     bool shouldShowTouches { false };
>     bool dumpJSConsoleLogInStdErr { false };
>     bool allowCrossOriginSubresourcesToAskForCredentials { false };
>+    bool domPasteAllowed { true };
>     bool enableProcessSwapOnNavigation { true };
>     bool enableProcessSwapOnWindowOpen { false };
>     bool enableColorFilter { false };
>@@ -105,6 +106,7 @@ struct TestOptions {
>             || dumpJSConsoleLogInStdErr != options.dumpJSConsoleLogInStdErr
>             || applicationManifest != options.applicationManifest
>             || allowCrossOriginSubresourcesToAskForCredentials != options.allowCrossOriginSubresourcesToAskForCredentials
>+            || domPasteAllowed != options.domPasteAllowed
>             || enableProcessSwapOnNavigation != options.enableProcessSwapOnNavigation
>             || enableProcessSwapOnWindowOpen != options.enableProcessSwapOnWindowOpen
>             || enableColorFilter != options.enableColorFilter
>diff --git a/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm b/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm
>index b2b45dfde4cf35d05b6acf1a300ad6b664336d79..74f381331d26157714fffaee65459e54da92f5f4 100644
>--- a/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm
>+++ b/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm
>@@ -190,4 +190,9 @@ JSRetainPtr<JSStringRef> UIScriptController::firstRedoLabel() const
>     return JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().redoActionName);
> }
> 
>+NSUndoManager *UIScriptController::platformUndoManager() const
>+{
>+    return platformContentView().undoManager;
>+}
>+
> } // namespace WTR
>diff --git a/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.h b/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.h
>index 5bc2cb7288bd075b31cf7dc08b03360707d369d7..28d57ac2a66ceb10e6150e11b68da0c2c9ae7688 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.h
>+++ b/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.h
>@@ -43,6 +43,8 @@
> @property (nonatomic, copy) void (^didEndZoomingCallback)(void);
> @property (nonatomic, copy) void (^didShowKeyboardCallback)(void);
> @property (nonatomic, copy) void (^didHideKeyboardCallback)(void);
>+@property (nonatomic, copy) void (^didShowMenuCallback)(void);
>+@property (nonatomic, copy) void (^didHideMenuCallback)(void);
> @property (nonatomic, copy) void (^didEndScrollingCallback)(void);
> @property (nonatomic, copy) void (^rotationDidEndCallback)(void);
> @property (nonatomic, copy) NSString *accessibilitySpeakSelectionContent;
>diff --git a/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm b/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm
>index fbfca09d8d351e9417bef8340d2f13a03cd550d0..155fd69a7ecec245af9175e88b0157411f008d43 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm
>+++ b/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm
>@@ -55,6 +55,7 @@ @interface TestRunnerWKWebView () <WKUIDelegatePrivate> {
> @property (nonatomic, copy) void (^zoomToScaleCompletionHandler)(void);
> @property (nonatomic, copy) void (^retrieveSpeakSelectionContentCompletionHandler)(void);
> @property (nonatomic, getter=isShowingKeyboard, setter=setIsShowingKeyboard:) BOOL showingKeyboard;
>+@property (nonatomic, getter=isShowingMenu, setter=setIsShowingMenu:) BOOL showingMenu;
> 
> @end
> 
>@@ -77,7 +78,8 @@ - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguratio
>         NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
>         [center addObserver:self selector:@selector(_invokeShowKeyboardCallbackIfNecessary) name:UIKeyboardDidShowNotification object:nil];
>         [center addObserver:self selector:@selector(_invokeHideKeyboardCallbackIfNecessary) name:UIKeyboardDidHideNotification object:nil];
>-
>+        [center addObserver:self selector:@selector(_didShowMenu) name:UIMenuControllerDidShowMenuNotification object:nil];
>+        [center addObserver:self selector:@selector(_didHideMenu) name:UIMenuControllerDidHideMenuNotification object:nil];
>         self.UIDelegate = self;
>     }
>     return self;
>@@ -95,6 +97,8 @@ - (void)dealloc
>     self.didEndZoomingCallback = nil;
>     self.didShowKeyboardCallback = nil;
>     self.didHideKeyboardCallback = nil;
>+    self.didShowMenuCallback = nil;
>+    self.didHideMenuCallback = nil;
>     self.didEndScrollingCallback = nil;
>     self.rotationDidEndCallback = nil;
> 
>@@ -172,6 +176,26 @@ - (void)_invokeHideKeyboardCallbackIfNecessary
>         self.didHideKeyboardCallback();
> }
> 
>+- (void)_didShowMenu
>+{
>+    if (self.showingMenu)
>+        return;
>+
>+    self.showingMenu = YES;
>+    if (self.didShowMenuCallback)
>+        self.didShowMenuCallback();
>+}
>+
>+- (void)_didHideMenu
>+{
>+    if (!self.showingMenu)
>+        return;
>+
>+    self.showingMenu = NO;
>+    if (self.didHideMenuCallback)
>+        self.didHideMenuCallback();
>+}
>+
> - (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(UIView *)view
> {
>     [super scrollViewWillBeginZooming:scrollView withView:view];
>diff --git a/Tools/WebKitTestRunner/ios/TestControllerIOS.mm b/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>index 21bd497785ca7302acb5df5118db702158301b40..b011bcb8bc4d25feff6047624be890aacdfe6a82 100644
>--- a/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>+++ b/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>@@ -53,6 +53,7 @@ static BOOL overrideIsInHardwareKeyboardMode()
> namespace WTR {
> 
> static bool isDoneWaitingForKeyboardToDismiss = true;
>+static bool isDoneWaitingForMenuToDismiss = true;
> 
> static void handleKeyboardWillHideNotification(CFNotificationCenterRef, void*, CFStringRef, const void*, CFDictionaryRef)
> {
>@@ -64,6 +65,16 @@ static void handleKeyboardDidHideNotification(CFNotificationCenterRef, void*, CF
>     isDoneWaitingForKeyboardToDismiss = true;
> }
> 
>+static void handleMenuWillHideNotification(CFNotificationCenterRef, void*, CFStringRef, const void*, CFDictionaryRef)
>+{
>+    isDoneWaitingForMenuToDismiss = false;
>+}
>+
>+static void handleMenuDidHideNotification(CFNotificationCenterRef, void*, CFStringRef, const void*, CFDictionaryRef)
>+{
>+    isDoneWaitingForMenuToDismiss = true;
>+}
>+
> void TestController::notifyDone()
> {
> }
>@@ -79,6 +90,8 @@ void TestController::platformInitialize()
>     auto center = CFNotificationCenterGetLocalCenter();
>     CFNotificationCenterAddObserver(center, this, handleKeyboardWillHideNotification, (CFStringRef)UIKeyboardWillHideNotification, nullptr, CFNotificationSuspensionBehaviorDeliverImmediately);
>     CFNotificationCenterAddObserver(center, this, handleKeyboardDidHideNotification, (CFStringRef)UIKeyboardDidHideNotification, nullptr, CFNotificationSuspensionBehaviorDeliverImmediately);
>+    CFNotificationCenterAddObserver(center, this, handleMenuWillHideNotification, (CFStringRef)UIMenuControllerWillHideMenuNotification, nullptr, CFNotificationSuspensionBehaviorDeliverImmediately);
>+    CFNotificationCenterAddObserver(center, this, handleMenuDidHideNotification, (CFStringRef)UIMenuControllerDidHideMenuNotification, nullptr, CFNotificationSuspensionBehaviorDeliverImmediately);
> 
>     // Override the implementation of +[UIKeyboard isInHardwareKeyboardMode] to ensure that test runs are deterministic
>     // regardless of whether a hardware keyboard is attached. We intentionally never restore the original implementation.
>@@ -92,6 +105,8 @@ void TestController::platformDestroy()
>     auto center = CFNotificationCenterGetLocalCenter();
>     CFNotificationCenterRemoveObserver(center, this, (CFStringRef)UIKeyboardWillHideNotification, nullptr);
>     CFNotificationCenterRemoveObserver(center, this, (CFStringRef)UIKeyboardDidHideNotification, nullptr);
>+    CFNotificationCenterRemoveObserver(center, this, (CFStringRef)UIMenuControllerWillHideMenuNotification, nullptr);
>+    CFNotificationCenterRemoveObserver(center, this, (CFStringRef)UIMenuControllerDidHideMenuNotification, nullptr);
> }
> 
> void TestController::initializeInjectedBundlePath()
>@@ -119,6 +134,7 @@ void TestController::platformResetStateToConsistentValues(const TestOptions& opt
> {
>     cocoaResetStateToConsistentValues(options);
> 
>+    UIMenuController.sharedMenuController.menuVisible = NO;
>     [[UIApplication sharedApplication] _cancelAllTouches];
>     [[UIDevice currentDevice] setOrientation:UIDeviceOrientationPortrait animated:NO];
> 
>@@ -145,6 +161,7 @@ void TestController::platformResetStateToConsistentValues(const TestOptions& opt
>     }
> 
>     runUntil(isDoneWaitingForKeyboardToDismiss, m_currentInvocation->shortTimeout());
>+    runUntil(isDoneWaitingForMenuToDismiss, m_currentInvocation->shortTimeout());
> 
>     if (shouldRestoreFirstResponder)
>         [mainWebView()->platformView() becomeFirstResponder];
>diff --git a/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm b/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>index 13834285e736b402932d508187eb6f95037bd8c5..06938902b3dce8cf1919e1522dee5a9a8d6166c6 100644
>--- a/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>+++ b/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>@@ -102,6 +102,44 @@ static Vector<String> parseModifierArray(JSContextRef context, JSValueRef arrayV
>     return modifiers;
> }
> 
>+static BOOL forEachViewInHierarchy(UIView *view, void(^mapFunction)(UIView *subview, BOOL *stop))
>+{
>+    BOOL stop = NO;
>+    mapFunction(view, &stop);
>+    if (stop)
>+        return YES;
>+
>+    for (UIView *subview in view.subviews) {
>+        stop = forEachViewInHierarchy(subview, mapFunction);
>+        if (stop)
>+            break;
>+    }
>+    return stop;
>+}
>+
>+static UIView *findViewInHierarchyOfType(UIView *view, Class viewClass)
>+{
>+    __block RetainPtr<UIView> foundView;
>+    forEachViewInHierarchy(view, ^(UIView *subview, BOOL *stop) {
>+        if (![subview isKindOfClass:viewClass])
>+            return;
>+
>+        foundView = subview;
>+        *stop = YES;
>+    });
>+    return foundView.autorelease();
>+}
>+
>+static NSArray<UIView *> *findAllViewsInHierarchyOfType(UIView *view, Class viewClass)
>+{
>+    __block RetainPtr<NSMutableArray> views = adoptNS([[NSMutableArray alloc] init]);
>+    forEachViewInHierarchy(view, ^(UIView *subview, BOOL *stop) {
>+        if ([subview isKindOfClass:viewClass])
>+            [views addObject:subview];
>+    });
>+    return views.autorelease();
>+}
>+
> void UIScriptController::checkForOutstandingCallbacks()
> {
>     if (![[HIDEventGenerator sharedHIDEventGenerator] checkForOutstandingCallbacks])
>@@ -629,8 +667,7 @@ JSObjectRef UIScriptController::textSelectionCaretRect() const
> 
> JSObjectRef UIScriptController::selectionStartGrabberViewRect() const
> {
>-    WKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    UIView *contentView = [webView valueForKeyPath:@"_currentContentView"];
>+    UIView *contentView = platformContentView();
>     UIView *selectionRangeView = [contentView valueForKeyPath:@"interactionAssistant.selectionView.rangeView"];
>     auto frameInContentCoordinates = [selectionRangeView convertRect:[[selectionRangeView valueForKeyPath:@"startGrabber"] frame] toView:contentView];
>     frameInContentCoordinates = CGRectIntersection(contentView.bounds, frameInContentCoordinates);
>@@ -640,8 +677,7 @@ JSObjectRef UIScriptController::selectionStartGrabberViewRect() const
> 
> JSObjectRef UIScriptController::selectionEndGrabberViewRect() const
> {
>-    WKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    UIView *contentView = [webView valueForKeyPath:@"_currentContentView"];
>+    UIView *contentView = platformContentView();
>     UIView *selectionRangeView = [contentView valueForKeyPath:@"interactionAssistant.selectionView.rangeView"];
>     auto frameInContentCoordinates = [selectionRangeView convertRect:[[selectionRangeView valueForKeyPath:@"endGrabber"] frame] toView:contentView];
>     frameInContentCoordinates = CGRectIntersection(contentView.bounds, frameInContentCoordinates);
>@@ -651,8 +687,7 @@ JSObjectRef UIScriptController::selectionEndGrabberViewRect() const
> 
> JSObjectRef UIScriptController::selectionCaretViewRect() const
> {
>-    WKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    UIView *contentView = [webView valueForKeyPath:@"_currentContentView"];
>+    UIView *contentView = platformContentView();
>     UIView *caretView = [contentView valueForKeyPath:@"interactionAssistant.selectionView.caretView"];
>     auto rectInContentViewCoordinates = CGRectIntersection([caretView convertRect:caretView.bounds toView:contentView], contentView.bounds);
>     return JSValueToObject(m_context->jsContext(), [JSValue valueWithObject:toNSDictionary(rectInContentViewCoordinates) inContext:[JSContext contextWithJSGlobalContextRef:m_context->jsContext()]].JSValueRef, nullptr);
>@@ -660,8 +695,7 @@ JSObjectRef UIScriptController::selectionCaretViewRect() const
> 
> JSObjectRef UIScriptController::selectionRangeViewRects() const
> {
>-    WKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    UIView *contentView = [webView valueForKeyPath:@"_currentContentView"];
>+    UIView *contentView = platformContentView();
>     UIView *rangeView = [contentView valueForKeyPath:@"interactionAssistant.selectionView.rangeView"];
>     auto rectsAsDictionaries = adoptNS([[NSMutableArray alloc] init]);
>     NSArray *textRectInfoArray = [rangeView valueForKeyPath:@"rects"];
>@@ -825,6 +859,58 @@ void UIScriptController::platformSetDidHideKeyboardCallback()
>     };
> }
> 
>+void UIScriptController::platformSetDidShowMenuCallback()
>+{
>+    TestController::singleton().mainWebView()->platformView().didShowMenuCallback = ^{
>+        if (!m_context)
>+            return;
>+        m_context->fireCallback(CallbackTypeDidShowMenu);
>+    };
>+}
>+
>+void UIScriptController::platformSetDidHideMenuCallback()
>+{
>+    TestController::singleton().mainWebView()->platformView().didHideMenuCallback = ^{
>+        if (!m_context)
>+            return;
>+        m_context->fireCallback(CallbackTypeDidHideMenu);
>+    };
>+}
>+
>+JSObjectRef UIScriptController::rectForMenuAction(JSStringRef jsAction) const
>+{
>+    auto action = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, jsAction));
>+
>+    UIWindow *windowForButton = nil;
>+    UIButton *buttonForAction = nil;
>+    for (UIWindow *window in UIApplication.sharedApplication.windows) {
>+        if (![window isKindOfClass:UITextEffectsWindow.class])
>+            continue;
>+
>+        UIView *calloutBar = findViewInHierarchyOfType(window, UICalloutBar.class);
>+        if (!calloutBar)
>+            continue;
>+
>+        for (UIButton *button in findAllViewsInHierarchyOfType(calloutBar, UIButton.class)) {
>+            NSString *buttonTitle = [button titleForState:UIControlStateNormal];
>+            if (!buttonTitle.length)
>+                continue;
>+
>+            if (![buttonTitle isEqualToString:(__bridge NSString *)action.get()])
>+                continue;
>+
>+            buttonForAction = button;
>+            windowForButton = window;
>+        }
>+    }
>+
>+    if (!buttonForAction)
>+        return nullptr;
>+
>+    CGRect rectInRootViewCoordinates = [buttonForAction convertRect:buttonForAction.bounds toView:platformContentView()];
>+    return m_context->objectFromRect(WebCore::FloatRect(rectInRootViewCoordinates.origin.x, rectInRootViewCoordinates.origin.y, rectInRootViewCoordinates.size.width, rectInRootViewCoordinates.size.height));
>+}
>+
> void UIScriptController::platformSetDidEndScrollingCallback()
> {
>     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
>@@ -870,21 +956,6 @@ void UIScriptController::completeBackSwipe(JSValueRef callback)
>     [webView _completeBackSwipeForTesting];
> }
> 
>-static BOOL forEachViewInHierarchy(UIView *view, void(^mapFunction)(UIView *subview, BOOL *stop))
>-{
>-    BOOL stop = NO;
>-    mapFunction(view, &stop);
>-    if (stop)
>-        return YES;
>-
>-    for (UIView *subview in view.subviews) {
>-        stop = forEachViewInHierarchy(subview, mapFunction);
>-        if (stop)
>-            break;
>-    }
>-    return stop;
>-}
>-
> bool UIScriptController::isShowingDataListSuggestions() const
> {
>     Class remoteKeyboardWindowClass = NSClassFromString(@"UIRemoteKeyboardWindow");
>@@ -989,9 +1060,9 @@ JSObjectRef UIScriptController::attachmentInfo(JSStringRef jsAttachmentIdentifie
>     return JSValueToObject(m_context->jsContext(), [JSValue valueWithObject:attachmentInfoDictionary inContext:[JSContext contextWithJSGlobalContextRef:m_context->jsContext()]].JSValueRef, nullptr);
> }
> 
>-NSUndoManager *UIScriptController::platformUndoManager() const
>+UIView *UIScriptController::platformContentView() const
> {
>-    return [(UIView *)[TestController::singleton().mainWebView()->platformView() valueForKeyPath:@"_currentContentView"] undoManager];
>+    return [TestController::singleton().mainWebView()->platformView() valueForKeyPath:@"_currentContentView"];
> }
> 
> JSObjectRef UIScriptController::calendarType() const
>diff --git a/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm b/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm
>index 7cc15311dbe874b94b23c4291443ed118ba872f6..d17a24e22cbbdb004474a81b87886796e4efadbd 100644
>--- a/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm
>+++ b/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm
>@@ -209,9 +209,9 @@ void UIScriptController::toggleCapsLock(JSValueRef callback)
>     doAsyncTask(callback);
> }
> 
>-NSUndoManager *UIScriptController::platformUndoManager() const
>+NSView *UIScriptController::platformContentView() const
> {
>-    return TestController::singleton().mainWebView()->platformView().undoManager;
>+    return TestController::singleton().mainWebView()->platformView();
> }
> 
> JSObjectRef UIScriptController::calendarType() const
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index fcc4fba1b4551409642beb4360931072bf4fc8bb..574a996f4b62da6311ec938950ca69c644383130 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,47 @@
>+2019-02-12  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Allow pages to trigger programmatic paste from script on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=194271
>+        <rdar://problem/47808810>
>+
>+        Reviewed by Tim Horton.
>+
>+        Add new tests to exercise programmatic pasting.
>+
>+        * TestExpectations:
>+        * editing/pasteboard/ios/dom-paste-confirmation-expected.txt: Added.
>+        * editing/pasteboard/ios/dom-paste-confirmation.html: Added.
>+
>+        Verify that the user can tap "Paste" to allow programmatic pasting.
>+
>+        * editing/pasteboard/ios/dom-paste-consecutive-confirmations-expected.txt: Added.
>+        * editing/pasteboard/ios/dom-paste-consecutive-confirmations.html: Added.
>+
>+        Verify that DOM paste access isn't carried over when using `setTimeout` in a user gesture event handler.
>+
>+        * editing/pasteboard/ios/dom-paste-rejection-expected.txt: Added.
>+        * editing/pasteboard/ios/dom-paste-rejection.html: Added.
>+
>+        Verify that resigning first responder dismisses the callout bar and does not allow programmatic pasting.
>+
>+        * editing/pasteboard/ios/dom-paste-requires-user-gesture-expected.txt: Added.
>+        * editing/pasteboard/ios/dom-paste-requires-user-gesture.html: Added.
>+
>+        Verify that user gesture is required to present the callout menu for a programmatic paste request.
>+
>+        * editing/pasteboard/ios/resources/dom-paste-helper.js: Added.
>+        (return.new.Promise.):
>+        (async._waitForOrTriggerPasteMenu):
>+        (async.triggerPasteMenuAfterTapAt):
>+        (async.waitForPasteMenu):
>+
>+        Add helpers to summon, wait for, and interact with the callout bar when the page attempts to trigger a paste.
>+
>+        * platform/ios-wk2/TestExpectations:
>+        * platform/win/TestExpectations:
>+
>+        Skip editing/pasteboard/ios by default, and enable it only in the modern WebKit port of iOS.
>+
> 2019-02-12  Justin Fan  <justin_fan@apple.com>
> 
>         [Web GPU] DepthStencilAttachment implementation
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index fe88082b85ecc0610bcfc844c34f6c2d3d8aaac0..e5f294a499d2baed35cf71523fbbd9d8890b64ac 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -52,6 +52,7 @@ http/tests/cookies/same-site [ Skip ]
> system-preview [ Skip ]
> editing/images [ Skip ]
> pointerevents/ios [ Skip ]
>+editing/pasteboard/ios [ Skip ]
> editing/pasteboard/mac [ Skip ]
> 
> # window.showModalDialog is only tested in DumpRenderTree on Mac.
>diff --git a/LayoutTests/editing/pasteboard/ios/dom-paste-confirmation-expected.txt b/LayoutTests/editing/pasteboard/ios/dom-paste-confirmation-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..1e522898bf671c3ddb50052a6a0dc78e0cc2c967
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/dom-paste-confirmation-expected.txt
>@@ -0,0 +1,18 @@
>+Click here to copy
>+Click here to copy
>+Click here to copy
>+Verifies that a callout is shown when the page programmatically triggers paste, and that tapping the callout allows the paste to happen. To manually test, tap the text on the bottom, tap the editable area above, and then select 'Paste' in the resulting callout menu. The text 'Click here to copy' should be pasted twice in the editable area.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+PASS document.queryCommandSupported('Paste') is true
>+PASS document.queryCommandEnabled('Paste') is true
>+PASS event.clipboardData.getData('text/plain') is "Click here to copy"
>+PASS document.execCommand('Paste') is true
>+PASS event.clipboardData.getData('text/plain') is "Click here to copy"
>+PASS document.execCommand('Paste') is true
>+PASS editor.textContent is "Click here to copyClick here to copy"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/editing/pasteboard/ios/dom-paste-confirmation.html b/LayoutTests/editing/pasteboard/ios/dom-paste-confirmation.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..74c589a1b978bc866f26a2181ce5c092a9c4f864
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/dom-paste-confirmation.html
>@@ -0,0 +1,73 @@
>+<!DOCTYPE html> 
>+<html>
>+<meta name="viewport" content="width=device-width, initial-scale=1">
>+<head>
>+<script src="./resources/dom-paste-helper.js"></script>
>+<script src="../../../resources/js-test.js"></script>
>+<script src="../../../resources/ui-helper.js"></script>
>+<style>
>+body {
>+    margin: 0;
>+}
>+
>+#copy, #editor {
>+    text-align: center;
>+}
>+
>+#copy {
>+    font-size: 40px;
>+    width: 100%;
>+    height: 50px;
>+    border: 1px dashed black;
>+}
>+
>+#editor {
>+    width: 100%;
>+    height: 100px;
>+    border: 1px dashed silver;
>+}
>+</style>
>+</head>
>+<body>
>+<div id="editor" contenteditable></div>
>+<div id="copy">Click here to copy</div>
>+<div id="description"></div>
>+<div id="console"></div>
>+<script>
>+jsTestIsAsync = true;
>+
>+const copy = document.getElementById("copy");
>+const editor = document.getElementById("editor");
>+
>+description("Verifies that a callout is shown when the page programmatically triggers paste, and that tapping the callout allows the paste to happen. To manually test, tap the text on the bottom, tap the editable area above, and then select 'Paste' in the resulting callout menu. The text 'Click here to copy' should be pasted <strong><em>twice</em></strong> in the editable area.");
>+
>+copy.addEventListener("click", () => {
>+    getSelection().selectAllChildren(copy);
>+    document.execCommand("Copy");
>+    getSelection().removeAllRanges();
>+});
>+
>+editor.addEventListener("paste", event => shouldBeEqualToString("event.clipboardData.getData('text/plain')", "Click here to copy"));
>+editor.addEventListener("click", event => {
>+    getSelection().setPosition(editor);
>+    shouldBe("document.queryCommandSupported('Paste')", "true");
>+    shouldBe("document.queryCommandEnabled('Paste')", "true");
>+    shouldBe("document.execCommand('Paste')", "true");
>+    document.execCommand('InsertParagraph');
>+    shouldBe("document.execCommand('Paste')", "true");
>+    shouldBeEqualToString("editor.textContent", "Click here to copyClick here to copy");
>+    event.preventDefault();
>+    editor.blur();
>+});
>+
>+(async () => {
>+    if (!window.testRunner)
>+        return;
>+
>+    await UIHelper.activateAt(160, 125);
>+    await triggerPasteMenuAfterTapAt(160, 50);
>+    finishJSTest();
>+})();
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/pasteboard/ios/dom-paste-consecutive-confirmations-expected.txt b/LayoutTests/editing/pasteboard/ios/dom-paste-consecutive-confirmations-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..ad36273ebc50464ad2af114ba325088443c9fc39
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/dom-paste-consecutive-confirmations-expected.txt
>@@ -0,0 +1,13 @@
>+Click here to copy
>+Verifies that no callout is shown when the page programmatically triggers paste on a timer after user interaction. To test manually, click the text on the bottom to copy, and then click the editable area above to trigger two programmatic pastes with the callout bar. Check that permissions for the first programmatic paste do not affect the second programmatic paste, since it is performed on a zero-delay timer.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+PASS document.execCommand('Paste') is true
>+PASS editor.textContent is "Click here to copy"
>+PASS document.execCommand('Paste') is true
>+PASS editor.textContent is "Click here to copy"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/editing/pasteboard/ios/dom-paste-consecutive-confirmations.html b/LayoutTests/editing/pasteboard/ios/dom-paste-consecutive-confirmations.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..7971a586f032f6e9098d92b361c6a94f5e897fa2
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/dom-paste-consecutive-confirmations.html
>@@ -0,0 +1,93 @@
>+<!DOCTYPE html> 
>+<html>
>+<meta name="viewport" content="width=device-width, initial-scale=1">
>+<head>
>+<script src="./resources/dom-paste-helper.js"></script>
>+<script src="../../../resources/js-test.js"></script>
>+<script src="../../../resources/ui-helper.js"></script>
>+<style>
>+body {
>+    margin: 0;
>+}
>+
>+#copy, #editor {
>+    text-align: center;
>+}
>+
>+#copy {
>+    font-size: 40px;
>+    width: 100%;
>+    height: 50px;
>+    border: 1px dashed black;
>+}
>+
>+#editor {
>+    width: 100%;
>+    height: 100px;
>+    border: 1px dashed silver;
>+}
>+</style>
>+</head>
>+<body>
>+<div id="editor" contenteditable></div>
>+<div id="copy">Click here to copy</div>
>+<div id="description"></div>
>+<div id="console"></div>
>+<script>
>+jsTestIsAsync = true;
>+
>+const copy = document.getElementById("copy");
>+const editor = document.getElementById("editor");
>+
>+description("Verifies that no callout is shown when the page programmatically triggers paste on a timer after user interaction. To test manually, click the text on the bottom to copy, and then click the editable area above to trigger two programmatic pastes with the callout bar. Check that permissions for the first programmatic paste do not affect the second programmatic paste, since it is performed on a zero-delay timer.");
>+
>+async function waitForAndTapPasteMenuTwice() {
>+    return new Promise(resolve => {
>+        testRunner.runUIScript(`
>+            (() => {
>+                doneCount = 0;
>+                function incrementProgress() {
>+                    if (++doneCount === 4)
>+                        uiController.uiScriptComplete();
>+                }
>+
>+                uiController.didHideMenuCallback = incrementProgress;
>+                uiController.didShowMenuCallback = () => {
>+                    const rect = uiController.rectForMenuAction("Paste");
>+                    uiController.singleTapAtPoint(rect.left + rect.width / 2, rect.top + rect.height / 2, incrementProgress);
>+                };
>+            })()`, resolve);
>+    });
>+}
>+
>+copy.addEventListener("click", () => {
>+    getSelection().selectAllChildren(copy);
>+    document.execCommand("Copy");
>+    getSelection().removeAllRanges();
>+});
>+
>+function paste() {
>+    getSelection().setPosition(editor);
>+    shouldBe("document.execCommand('Paste')", "true");
>+    shouldBeEqualToString("editor.textContent", "Click here to copy");
>+    editor.textContent = "";
>+    getSelection().removeAllRanges(editor);
>+}
>+
>+editor.addEventListener("click", event => {
>+    event.preventDefault();
>+    paste();
>+    setTimeout(paste, 0);
>+});
>+
>+(async () => {
>+    if (!window.testRunner || !window.internals)
>+        return;
>+
>+    waitForAndTapPasteMenuTwice().then(finishJSTest);
>+    await UIHelper.activateAt(160, 125);
>+    await UIHelper.activateAt(160, 50);
>+})();
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/pasteboard/ios/dom-paste-rejection-expected.txt b/LayoutTests/editing/pasteboard/ios/dom-paste-rejection-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..bccad1732b52aa3840657af38c7ff69c82320fa2
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/dom-paste-rejection-expected.txt
>@@ -0,0 +1,14 @@
>+Click here to copy
>+Verifies that a callout is shown when the page programmatically triggers paste, and that dismissing the callout prevents the paste from happening. To manually test, tap the text on the bottom, tap the editable area above, and then dismiss the resulting callout menu by scrolling or tapping elsewhere. The text 'Click here to copy' should not be pasted, and the callout bar should disappear.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+PASS document.queryCommandSupported('Paste') is true
>+PASS document.queryCommandEnabled('Paste') is true
>+PASS document.execCommand('Paste') is false
>+PASS document.execCommand('Paste') is false
>+PASS editor.textContent is ""
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/editing/pasteboard/ios/dom-paste-rejection.html b/LayoutTests/editing/pasteboard/ios/dom-paste-rejection.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..7515baa817e57a8412f694c6bb79bbec0dffcd97
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/dom-paste-rejection.html
>@@ -0,0 +1,72 @@
>+<!DOCTYPE html> 
>+<html>
>+<meta name="viewport" content="width=device-width, initial-scale=1">
>+<head>
>+<script src="./resources/dom-paste-helper.js"></script>
>+<script src="../../../resources/js-test.js"></script>
>+<script src="../../../resources/ui-helper.js"></script>
>+<style>
>+body {
>+    margin: 0;
>+}
>+
>+#copy, #editor {
>+    text-align: center;
>+}
>+
>+#copy {
>+    font-size: 40px;
>+    width: 100%;
>+    height: 50px;
>+    border: 1px dashed black;
>+}
>+
>+#editor {
>+    width: 100%;
>+    height: 100px;
>+    border: 1px dashed silver;
>+}
>+</style>
>+</head>
>+<body>
>+<div id="editor" contenteditable></div>
>+<div id="copy">Click here to copy</div>
>+<div id="description"></div>
>+<div id="console"></div>
>+<script>
>+jsTestIsAsync = true;
>+
>+const copy = document.getElementById("copy");
>+const editor = document.getElementById("editor");
>+
>+description("Verifies that a callout is shown when the page programmatically triggers paste, and that dismissing the callout prevents the paste from happening. To manually test, tap the text on the bottom, tap the editable area above, and then dismiss the resulting callout menu by scrolling or tapping elsewhere. The text 'Click here to copy' should <strong>not</strong> be pasted, and the callout bar should disappear.");
>+
>+copy.addEventListener("click", () => {
>+    getSelection().selectAllChildren(copy);
>+    document.execCommand("Copy");
>+    getSelection().removeAllRanges();
>+});
>+
>+editor.addEventListener("paste", event => shouldBeEqualToString("event.clipboardData.getData('text/plain')", "Click here to copy"));
>+editor.addEventListener("click", event => {
>+    getSelection().setPosition(editor);
>+    shouldBe("document.queryCommandSupported('Paste')", "true");
>+    shouldBe("document.queryCommandEnabled('Paste')", "true");
>+    shouldBe("document.execCommand('Paste')", "false");
>+    shouldBe("document.execCommand('Paste')", "false");
>+    shouldBeEqualToString("editor.textContent", "");
>+    event.preventDefault();
>+    editor.blur();
>+});
>+
>+(async () => {
>+    if (!window.testRunner)
>+        return;
>+
>+    await UIHelper.activateAt(160, 125);
>+    await triggerPasteMenuAfterTapAt(160, 50, false);
>+    finishJSTest();
>+})();
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/pasteboard/ios/dom-paste-requires-user-gesture-expected.txt b/LayoutTests/editing/pasteboard/ios/dom-paste-requires-user-gesture-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..67aaeca32ae25f8662d14c940df6139f7eebebed
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/dom-paste-requires-user-gesture-expected.txt
>@@ -0,0 +1,13 @@
>+Click here to copy
>+Click here to copy
>+Verifies that no callout is shown when the page programmatically triggers paste outside the scope of user interaction. This test requires WebKitTestRunner.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+PASS document.execCommand('Paste') is true
>+PASS document.execCommand('Paste') is false
>+PASS editor.textContent is "Click here to copy"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/editing/pasteboard/ios/dom-paste-requires-user-gesture.html b/LayoutTests/editing/pasteboard/ios/dom-paste-requires-user-gesture.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..5223f63e75fa7a8f65e4499191bedb56d9dec8a2
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/dom-paste-requires-user-gesture.html
>@@ -0,0 +1,62 @@
>+<!DOCTYPE html> 
>+<html>
>+<meta name="viewport" content="width=device-width, initial-scale=1">
>+<head>
>+<script src="./resources/dom-paste-helper.js"></script>
>+<script src="../../../resources/js-test.js"></script>
>+<script src="../../../resources/ui-helper.js"></script>
>+<style>
>+body {
>+    margin: 0;
>+}
>+
>+#copy, #editor {
>+    text-align: center;
>+}
>+
>+#copy {
>+    font-size: 40px;
>+    width: 100%;
>+    height: 50px;
>+    border: 1px dashed black;
>+}
>+
>+#editor {
>+    width: 100%;
>+    height: 100px;
>+    border: 1px dashed silver;
>+}
>+</style>
>+</head>
>+<body>
>+<div id="editor" contenteditable></div>
>+<div id="copy">Click here to copy</div>
>+<div id="description"></div>
>+<div id="console"></div>
>+<script>
>+jsTestIsAsync = true;
>+
>+const copy = document.getElementById("copy");
>+const editor = document.getElementById("editor");
>+
>+description("Verifies that no callout is shown when the page programmatically triggers paste outside the scope of user interaction. This test requires WebKitTestRunner.");
>+
>+copy.addEventListener("click", () => {
>+    getSelection().selectAllChildren(copy);
>+    document.execCommand("Copy");
>+    getSelection().removeAllRanges();
>+});
>+
>+UIHelper.activateAt(160, 125).then(() => {
>+    editor.focus();
>+    waitForPasteMenu().then(finishJSTest);
>+
>+    UIHelper.ensurePresentationUpdate().then(() => {
>+        internals.withUserGesture(() => shouldBe("document.execCommand('Paste')", "true"));
>+        shouldBe("document.execCommand('Paste')", "false");
>+        shouldBeEqualToString("editor.textContent", "Click here to copy");
>+    });
>+});
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/pasteboard/ios/resources/dom-paste-helper.js b/LayoutTests/editing/pasteboard/ios/resources/dom-paste-helper.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..bbcdb4fae56da0bc5b60fbdcb716291d372b0223
>--- /dev/null
>+++ b/LayoutTests/editing/pasteboard/ios/resources/dom-paste-helper.js
>@@ -0,0 +1,35 @@
>+
>+async function _waitForOrTriggerPasteMenu(x, y, proceedWithPaste, shouldTap) {
>+    return new Promise(resolve => {
>+        testRunner.runUIScript(`
>+            (() => {
>+                doneCount = 0;
>+                function checkDone() {
>+                    if (++doneCount === (${shouldTap} ? 3 : 2))
>+                        uiController.uiScriptComplete();
>+                }
>+
>+                uiController.didHideMenuCallback = checkDone;
>+                uiController.didShowMenuCallback = () => {
>+                    if (${proceedWithPaste}) {
>+                        const rect = uiController.rectForMenuAction("Paste");
>+                        uiController.singleTapAtPoint(rect.left + rect.width / 2, rect.top + rect.height / 2, checkDone);
>+                    } else {
>+                        uiController.resignFirstResponder();
>+                        checkDone();
>+                    }
>+                };
>+
>+                if (${shouldTap})
>+                    uiController.singleTapAtPoint(${x}, ${y}, checkDone);
>+            })()`, resolve);
>+    });
>+}
>+
>+async function triggerPasteMenuAfterTapAt(x, y, proceedWithPaste = true) {
>+    return _waitForOrTriggerPasteMenu(x, y, proceedWithPaste, true);
>+}
>+
>+async function waitForPasteMenu(proceedWithPaste = true) {
>+    return _waitForOrTriggerPasteMenu(null, null, proceedWithPaste, false);
>+}
>diff --git a/LayoutTests/platform/ios-wk2/TestExpectations b/LayoutTests/platform/ios-wk2/TestExpectations
>index 8dc1fb3fe08ddb2d20856bd78e92089b352f3e05..59a5103fbc2c1378670a4f7d0a1117a9f4bdc957 100644
>--- a/LayoutTests/platform/ios-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-wk2/TestExpectations
>@@ -15,6 +15,7 @@ scrollingcoordinator [ Pass ]
> fast/web-share [ Pass ]
> editing/find [ Pass ]
> editing/input/ios [ Pass ]
>+editing/pasteboard/ios [ Pass ]
> editing/undo-manager [ Pass ]
> 
> editing/selection/character-granularity-rect.html [ Failure ]
>diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
>index a918cef89348a9dc7a08671732c187c7c507d658..56bdb227908046db6e8332b9f230768ca64c0923 100644
>--- a/LayoutTests/platform/win/TestExpectations
>+++ b/LayoutTests/platform/win/TestExpectations
>@@ -1157,6 +1157,7 @@ media/track/track-in-band-cues-added-once.html [ Skip ] # Timeout
> ###### Pasteboard
> ###### These tests are very flaky.
> editing/pasteboard/ [ Pass Failure ]
>+editing/pasteboard/ios [ Skip ]
> [ Debug ] editing/pasteboard/copy-crash.html [ Skip ] # Debug Assertion
> [ Debug ] editing/pasteboard/copy-crash-with-extraneous-attribute.html [ Skip ] # Debug Assertion
> [ Debug ] editing/pasteboard/testcase-9507.html [ Skip ] # Debug Assertion

Actions: View | Formatted Diff | Diff

Attachments on bug 194271: 361202 | 361212 | 361252 | 361305 | 361306 | 361316 | 361350 | 361351 | 361397 | 361398 | 361537 | 361547 | 361582 | 361702 | 361837 | 361847