From f467ea41bc284a00d4871d8e104b9fbbf94d7ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 29 Jan 2021 13:30:40 +0000
Subject: [PATCH] Bug 1689317 - Clipboard events should be composed. r=smaug

Automate some of the copy event tests which tested for this, since there
seems we/WPT don't have a lot of coverage for them.

Differential Revision: https://phabricator.services.mozilla.com/D103428
---
 ...{copy-event-manual.html => copy-event.html} | 18 ++++++++++++++++--
 widget/BasicEvents.h                           |  3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)
 rename testing/web-platform/tests/clipboard-apis/events/{copy-event-manual.html => copy-event.html} (55%)

diff --git a/testing/web-platform/tests/clipboard-apis/events/copy-event-manual.html b/testing/web-platform/tests/clipboard-apis/events/copy-event.html
similarity index 55%
rename from testing/web-platform/tests/clipboard-apis/events/copy-event-manual.html
rename to testing/web-platform/tests/clipboard-apis/events/copy-event.html
index 9f9f1950e7ca..c8c0593a9880 100644
--- a/testing/web-platform/tests/clipboard-apis/events/copy-event-manual.html
+++ b/testing/web-platform/tests/clipboard-apis/events/copy-event.html
@@ -3,11 +3,23 @@
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#clipboard-event-copy">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <div id=log></div>
-<p>Select and copy any part of this text to continue.
+<button id="copy">Trigger copy</button>
+<input id="copyTarget" value="this text should be copied">
 <script>
-setup({explicit_timeout: true});
 async_test(t => {
+  let button = document.getElementById("copy");
+
+  button.addEventListener("click", function(e) {
+    let input = document.getElementById("copyTarget");
+    input.focus();
+    input.select();
+    document.execCommand("copy");
+  });
+
   document.oncopy = t.step_func_done(event => {
     // Nothing can be asserted about the event target until
     // https://github.com/w3c/clipboard-apis/issues/70 is resolved.
@@ -15,5 +27,7 @@ async_test(t => {
     assert_true(event.isTrusted, 'event.isTrusted');
     assert_true(event.composed, 'event.composed');
   });
+
+  test_driver.click(button);
 });
 </script>
diff --git a/widget/BasicEvents.h b/widget/BasicEvents.h
index eb66579e1083..52fc2009f573 100644
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -859,6 +859,9 @@ class WidgetEvent : public WidgetEventTime {
    */
   void SetDefaultComposed() {
     switch (mClass) {
+      case eClipboardEventClass:
+        mFlags.mComposed = true;
+        break;
       case eCompositionEventClass:
         mFlags.mComposed =
             mMessage == eCompositionStart || mMessage == eCompositionUpdate ||