Commit f885567a authored by Gijs Kruitbosch's avatar Gijs Kruitbosch
Browse files

Bug 1586220 - still treat shortcut/modifier keypresses as interaction for the... 

Bug 1586220 - still treat shortcut/modifier keypresses as interaction for the purposes of GCs/timers and so on, just not for the website, r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D48623

--HG--
extra : moz-landing-system : lando
parent 4c452850

dom/events/EventStateManager.cpp

+6 −5
Original line number Diff line number Diff line
@@ -487,8 +487,7 @@ nsresult EventStateManager::PreHandleEvent(nsPresContext* aPresContext, 
       aEvent->mClass == eWheelEventClass ||

       aEvent->mClass == ePointerEventClass ||

       aEvent->mClass == eTouchEventClass ||

       (aEvent->mClass == eKeyboardEventClass &&

        IsKeyboardEventUserActivity(aEvent)) ||

       aEvent->mClass == eKeyboardEventClass ||

       (aEvent->mClass == eDragEventClass && aEvent->mMessage == eDrop) ||

       IsMessageGamepadUserActivity(aEvent->mMessage))) {

    if (gMouseOrKeyboardEventCounter == 0) {
@@ -502,9 +501,11 @@ nsresult EventStateManager::PreHandleEvent(nsPresContext* aPresContext, 
    ++gMouseOrKeyboardEventCounter;



    nsCOMPtr<nsINode> node = aTargetContent;

    if (node && (aEvent->mMessage == eKeyUp || aEvent->mMessage == eMouseUp ||

                 aEvent->mMessage == eWheel || aEvent->mMessage == eTouchEnd ||

                 aEvent->mMessage == ePointerUp || aEvent->mMessage == eDrop)) {

    if (node &&

        ((aEvent->mMessage == eKeyUp && IsKeyboardEventUserActivity(aEvent)) ||

         aEvent->mMessage == eMouseUp || aEvent->mMessage == eWheel ||

         aEvent->mMessage == eTouchEnd || aEvent->mMessage == ePointerUp ||

         aEvent->mMessage == eDrop)) {

      Document* doc = node->OwnerDoc();

      while (doc) {

        doc->SetUserHasInteracted();