Migrate sticky and history-action user activation to explicit boolean flags by kate-k-lee · Pull Request #66459 · WebKit/WebKit

kate-k-lee · 2026-06-04T17:42:47Z

`a96f40e`

Migrate sticky and history-action user activation to explicit boolean flags
https://bugs.webkit.org/show_bug.cgi?id=316317

Reviewed by Youenn Fablet.

Per the user-activation data model change in the proposed
whatwg/html#11454, track sticky activation and history-action activation
as explicit booleans on LocalDOMWindow instead of deriving them from the
last activation timestamp. m_lastActivationTimestamp continues to drive
transient activation only.

notifyActivated and its ancestor/descendant propagation, consume-history-
action, and WebPage::updateUserActivationTimestamps now update the
booleans alongside the timestamp. This is not gated behind a preference.
Behavior is preserved, except that consuming transient activation no
longer resurrects an already-consumed history-action activation, which
matches the proposed explicit boolean model.

* Source/WebCore/page/LocalDOMWindow.cpp:
(WebCore::LocalDOMWindow::hasStickyActivation const):
(WebCore::LocalDOMWindow::hasHistoryActionActivation const):
(WebCore::LocalDOMWindow::consumeHistoryActionUserActivation):
(WebCore::LocalDOMWindow::notifyActivated):
* Source/WebCore/page/LocalDOMWindow.h:
(WebCore::LocalDOMWindow::setHasStickyActivation):
(WebCore::LocalDOMWindow::setHasHistoryActionActivation):
* Source/WebKit/UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didNotifyUserActivation):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updateUserActivationState):
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/WebPage.messages.in:

Canonical link: https://commits.webkit.org/315598@main

d2874f9

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	❌ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision		✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-intel-wk2	✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge	✅ 🧪 vision-wk2	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv	✅ 🧪 mac-site-isolation
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-06-04T17:42:54Z

EWS run on previous version of this PR (hash 05222b5)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	~~🛠 ios~~	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~
✅ 🧪 bindings	~~🛠 ios-sim~~	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 win-tests~~
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
	~~🧪 api-ios~~	✅ 🧪 mac-wk1	✅ 🛠 gtk
	~~🛠 ios-safer-cpp~~	✅ 🧪 mac-wk2	~~🧪 gtk-wk2~~
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🛠 playstation~~
	✅ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	~~🛠 tv-sim~~	✅ 🧪 mac-site-isolation
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-06-04T18:17:30Z

EWS run on previous version of this PR (hash d1898cf)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	❌ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-wk2	❌ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🛠 playstation~~
	✅ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim	❌ 🧪 mac-site-isolation
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-06-05T14:31:57Z

EWS run on previous version of this PR (hash d1ae363)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	❌ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	❌ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🛠 playstation~~
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim	❌ 🧪 mac-site-isolation
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-06-08T02:51:56Z

EWS run on previous version of this PR (hash d5ade5f)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	~~🧪 win-tests~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🛠 playstation~~
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim	❌ 🧪 mac-site-isolation
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-06-08T06:07:17Z

EWS run on previous version of this PR (hash 697c44d)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	❌ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	❌ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-intel-wk2	~~🛠 playstation~~
	✅ 🧪 vision-wk2	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv	❌ 🧪 mac-site-isolation
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

kate-k-lee · 2026-06-08T14:27:12Z

@youennf

Hi, Anne suggested you might be a good person to review this, as you're more familiar with this area of the code. Would you mind taking a look when you have a chance?

This PR implements just the user-activation data-model change from whatwg/html#11454 (https://github.com/whatwg/html/pull/11454/changes) — migrating sticky and history-action activation from timestamp-derived state to explicit boolean flags on LocalDOMWindow. It's behavior-preserving and not gated. I'd like to land this refactor first, before the actual "preserve sticky activation" feature, which is in a separate PR (#63952).

Note: the CI site-isolation timeouts are unrelated — the changed code only runs on an actual user activation and is behavior-preserving, and the failing tests trigger no activation (they also reproduce on unrelated commits, so they're pre-existing on the base).

Thanks so much! 🙏

youennf · 2026-06-16T06:34:34Z

+        if (RefPtr window = localFrame->window()) {
            window->setLastActivationTimestamp(activationTime);
+            window->setHasStickyActivation(true);
+            window->setHasHistoryActionActivation(true);


I would tend to introduce a routine that updates both time and the two booleans in a single method.
How about something like updateActivation(MonotonicTime)?

youennf · 2026-06-16T06:35:40Z

+// https://html.spec.whatwg.org/multipage/interaction.html#sticky-activation
+// The published spec still derives sticky activation from the last activation
+// timestamp; we track it as an explicit boolean per the proposed
+// whatwg/html#11454 (https://github.com/whatwg/html/pull/11454).


It would be slightly better to wait for the PR to get merged.

youennf · 2026-06-16T06:37:00Z

    MonotonicTime m_lastActivationTimestamp { MonotonicTime::infinity() };
-    MonotonicTime m_lastHistoryActionActivationTimestamp { MonotonicTime::infinity() };
+    bool m_hasStickyActivation { false };
+    bool m_hasHistoryActionActivation { false };


We could move these bools just after m_lastUserClickEvent so that they are next to other bools.

webkit-early-warning-system · 2026-06-21T09:06:01Z

EWS run on previous version of this PR (hash f9614cc)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	❌ 🛠 ios	❌ 🛠 mac	❌ 🛠 wpe	❌ 🛠 win
❌ 🧪 bindings	❌ 🛠 ios-sim	❌ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2	❌ 🧪 win-tests
❌ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	❌ 🧪 api-wpe
	❌ 🧪 ios-wk2-wpt	❌ 🧪 api-mac-debug	❌ 🛠 gtk3-libwebrtc
❌ 🧪 jsc-x86-64	❌ 🧪 api-ios	❌ 🧪 mac-wk2	❌ 🛠 gtk
	❌ 🛠 ios-safer-cpp	❌ 🧪 mac-AS-debug-wk2	❌ 🧪 gtk-wk2
	❌ 🛠 vision	❌ 🧪 mac-wk2-stress	❌ 🧪 api-gtk
	❌ 🛠 vision-sim	❌ 🧪 mac-intel-wk2	❌ 🛠 playstation
	❌ 🧪 vision-wk2	❌ 🛠 mac-safer-cpp
	❌ 🛠 tv	❌ 🧪 mac-site-isolation
	❌ 🛠 tv-sim
	❌ 🛠 watch
	❌ 🛠 watch-sim

webkit-early-warning-system · 2026-06-21T14:54:53Z

EWS run on previous version of this PR (hash 46c0ae9)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	❌ 🧪 win-tests
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	✅ 🧪 api-mac	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision		✅ 🧪 api-gtk
~~🛠 🧪 merge~~	✅ 🛠 vision-sim	✅ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv	✅ 🧪 mac-site-isolation
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-06-21T17:04:17Z

EWS run on current version of this PR (hash d2874f9)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	❌ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision		✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-intel-wk2	✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge	✅ 🧪 vision-wk2	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv	✅ 🧪 mac-site-isolation
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

kate-k-lee · 2026-06-22T14:08:39Z

The failing win-tests (9) and ios-wk2 (~60) results are pre-existing, unrelated to this change. The identical failures appear across many unrelated PRs on the same queues (e.g. win-tests builds #92998–#93005 all show the same 9 failures; ios-wk2 builds #34853–#34878 share ~57/60). This patch only migrates sticky/history-action user activation to boolean flags on LocalDOMWindow and touches none of these areas. Switching to unsafe-merge-queue.

… flags https://bugs.webkit.org/show_bug.cgi?id=316317 Reviewed by Youenn Fablet. Per the user-activation data model change in the proposed whatwg/html#11454, track sticky activation and history-action activation as explicit booleans on LocalDOMWindow instead of deriving them from the last activation timestamp. m_lastActivationTimestamp continues to drive transient activation only. notifyActivated and its ancestor/descendant propagation, consume-history- action, and WebPage::updateUserActivationTimestamps now update the booleans alongside the timestamp. This is not gated behind a preference. Behavior is preserved, except that consuming transient activation no longer resurrects an already-consumed history-action activation, which matches the proposed explicit boolean model. * Source/WebCore/page/LocalDOMWindow.cpp: (WebCore::LocalDOMWindow::hasStickyActivation const): (WebCore::LocalDOMWindow::hasHistoryActionActivation const): (WebCore::LocalDOMWindow::consumeHistoryActionUserActivation): (WebCore::LocalDOMWindow::notifyActivated): * Source/WebCore/page/LocalDOMWindow.h: (WebCore::LocalDOMWindow::setHasStickyActivation): (WebCore::LocalDOMWindow::setHasHistoryActionActivation): * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::didNotifyUserActivation): * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::updateUserActivationState): * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/WebPage.messages.in: Canonical link: https://commits.webkit.org/315598@main

webkit-commit-queue · 2026-06-22T14:10:50Z

Committed 315598@main (a96f40e): https://commits.webkit.org/315598@main

Reviewed commits have been landed. Closing PR #66459 and removing active labels.

kate-k-lee requested a review from cdumez as a code owner June 4, 2026 17:42

kate-k-lee self-assigned this Jun 4, 2026

kate-k-lee added the DOM For bugs specific to XML/HTML DOM elements (including parsing). label Jun 4, 2026

kate-k-lee force-pushed the eng/Migrate-user-activation-to-boolean-flags branch from 05222b5 to d1898cf Compare June 4, 2026 18:17

kate-k-lee requested a review from annevk June 4, 2026 18:17

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 4, 2026

kate-k-lee removed the merging-blocked Applied to prevent a change from being merged label Jun 5, 2026

kate-k-lee force-pushed the eng/Migrate-user-activation-to-boolean-flags branch from d1898cf to d1ae363 Compare June 5, 2026 14:31

kate-k-lee force-pushed the eng/Migrate-user-activation-to-boolean-flags branch from d1ae363 to d5ade5f Compare June 8, 2026 02:51

kate-k-lee force-pushed the eng/Migrate-user-activation-to-boolean-flags branch from d5ade5f to 697c44d Compare June 8, 2026 06:07

kate-k-lee requested a review from youennf June 8, 2026 14:12

youennf approved these changes Jun 16, 2026

View reviewed changes

kate-k-lee force-pushed the eng/Migrate-user-activation-to-boolean-flags branch from 697c44d to f9614cc Compare June 21, 2026 09:05

kate-k-lee force-pushed the eng/Migrate-user-activation-to-boolean-flags branch from f9614cc to 46c0ae9 Compare June 21, 2026 14:54

kate-k-lee force-pushed the eng/Migrate-user-activation-to-boolean-flags branch from 46c0ae9 to d2874f9 Compare June 21, 2026 17:04

kate-k-lee added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merge-queue Applied to send a pull request to merge-queue labels Jun 22, 2026

webkit-commit-queue force-pushed the eng/Migrate-user-activation-to-boolean-flags branch from d2874f9 to a96f40e Compare June 22, 2026 14:10

webkit-commit-queue merged commit a96f40e into WebKit:main Jun 22, 2026

webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jun 22, 2026

Uh oh!

Conversation

kate-k-lee commented Jun 4, 2026 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

a96f40e

Uh oh!

webkit-early-warning-system commented Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kate-k-lee commented Jun 8, 2026

Uh oh!

youennf Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

youennf Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

youennf Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Jun 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kate-k-lee commented Jun 22, 2026

Uh oh!

webkit-commit-queue commented Jun 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

kate-k-lee commented Jun 4, 2026 •

edited by webkit-early-warning-system

Loading

`a96f40e`

webkit-early-warning-system commented Jun 4, 2026 •

edited

Loading

webkit-early-warning-system commented Jun 4, 2026 •

edited

Loading

webkit-early-warning-system commented Jun 5, 2026 •

edited

Loading

webkit-early-warning-system commented Jun 8, 2026 •

edited

Loading

webkit-early-warning-system commented Jun 8, 2026 •

edited

Loading

webkit-early-warning-system commented Jun 21, 2026 •

edited

Loading

webkit-early-warning-system commented Jun 21, 2026 •

edited

Loading

webkit-early-warning-system commented Jun 21, 2026 •

edited

Loading