瀏覽代碼

LibWeb: Allow bypassing transient activation checks for tests

We have a 5 second timeout between a user-activated event occurring and
an activation-gated API being invoked in order for that API to succeed.
This is quite fine in normal circumstances, but the machines used in CI
often exceed that limit (we see upwards of 10 seconds passing between
generating the user-activated event and the API call running).

So instead of generating a user-activated event, add a hook to allow
tests to bypass the very next activation check.
Timothy Flynn 1 年之前
父節點
當前提交
e52c30cbd5

+ 1 - 4
Tests/LibWeb/Text/input/clipboard.html

@@ -16,10 +16,7 @@
 
     asyncTest((done) => {
         writeText(() => {
-            const button = document.getElementById("button");
-            internals.dispatchUserActivatedEvent(button, new Event("mousedown"));
-            button.dispatchEvent(new Event("click"));
-
+            internals.bypassNextTransientActivationTest = true;
             writeText(done);
         });
     });

+ 14 - 2
Userland/Libraries/LibWeb/HTML/Window.cpp

@@ -134,6 +134,7 @@ void Window::visit_edges(JS::Cell::Visitor& visitor)
         visitor.visit(mime_type_object);
     visitor.visit(m_count_queuing_strategy_size_function);
     visitor.visit(m_byte_length_queuing_strategy_size_function);
+    visitor.visit(m_internals);
 }
 
 void Window::finalize()
@@ -605,6 +606,14 @@ bool Window::has_transient_activation() const
     // perceive the link between an interaction with the page and the page calling the activation-gated API.
     auto transient_activation_duration = 5;
 
+    // AD-HOC: Due to resource limitations on CI, we cannot rely on the time between the activation timestamp and the
+    //         transient activation timeout being predictable. So we allow tests to indicate when they want the next
+    //         check for a user gesture to succeed.
+    if (m_internals && m_internals->bypass_next_transient_activation_test()) {
+        m_internals->set_bypass_next_transient_activation_test(false);
+        return true;
+    }
+
     // When the current high resolution time given W
     auto unsafe_shared_time = HighResolutionTime::unsafe_shared_current_time();
     auto current_time = HighResolutionTime::relative_high_resolution_time(unsafe_shared_time, realm().global_object());
@@ -813,8 +822,11 @@ WebIDL::ExceptionOr<void> Window::initialize_web_interfaces(Badge<WindowEnvironm
 
     if (s_inspector_object_exposed)
         define_direct_property("inspector", heap().allocate<Internals::Inspector>(realm, realm), JS::default_attributes);
-    if (s_internals_object_exposed)
-        define_direct_property("internals", heap().allocate<Internals::Internals>(realm, realm), JS::default_attributes);
+
+    if (s_internals_object_exposed) {
+        m_internals = heap().allocate<Internals::Internals>(realm, realm);
+        define_direct_property("internals", m_internals, JS::default_attributes);
+    }
 
     return {};
 }

+ 2 - 0
Userland/Libraries/LibWeb/HTML/Window.h

@@ -282,6 +282,8 @@ private:
     // https://html.spec.whatwg.org/multipage/nav-history-apis.html#dom-window-status
     // When the Window object is created, the attribute must be set to the empty string. It does not do anything else.
     String m_status;
+
+    JS::GCPtr<Internals::Internals> m_internals;
 };
 
 void run_animation_frame_callbacks(DOM::Document&, double now);

+ 0 - 6
Userland/Libraries/LibWeb/Internals/Internals.cpp

@@ -89,10 +89,4 @@ void Internals::wheel(double x, double y, double delta_x, double delta_y)
     page.handle_mousewheel({ x, y }, { x, y }, 0, 0, 0, delta_x, delta_y);
 }
 
-WebIDL::ExceptionOr<bool> Internals::dispatch_user_activated_event(DOM::EventTarget& target, DOM::Event& event)
-{
-    event.set_is_trusted(true);
-    return target.dispatch_event(event);
-}
-
 }

+ 4 - 1
Userland/Libraries/LibWeb/Internals/Internals.h

@@ -28,11 +28,14 @@ public:
     void click(double x, double y);
     void wheel(double x, double y, double delta_x, double delta_y);
 
-    WebIDL::ExceptionOr<bool> dispatch_user_activated_event(DOM::EventTarget&, DOM::Event& event);
+    bool bypass_next_transient_activation_test() const { return m_bypass_next_transient_activation_test; }
+    void set_bypass_next_transient_activation_test(bool bypass_next_transient_activation_test) { m_bypass_next_transient_activation_test = bypass_next_transient_activation_test; }
 
 private:
     explicit Internals(JS::Realm&);
     virtual void initialize(JS::Realm&) override;
+
+    bool m_bypass_next_transient_activation_test { false };
 };
 
 }

+ 1 - 1
Userland/Libraries/LibWeb/Internals/Internals.idl

@@ -13,6 +13,6 @@
     undefined click(double x, double y);
     undefined wheel(double x, double y, double deltaX, double deltaY);
 
-    boolean dispatchUserActivatedEvent(EventTarget target, Event event);
+    attribute boolean bypassNextTransientActivationTest;
 
 };