Move destruction of an adopted-but-not-inserted portal into...

Move destruction of an adopted-but-not-inserted portal into HTMLPortalElement::ExpireAdoptionLifetime.

Change-Id: Id7323e014838ae9c06434369f4d7e1124062275a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761400Reviewed-by: Lucas Gadani <lfg@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689110}

third_party/blink/renderer/core/frame/web_local_frame_impl.cc

@@ -2586,21 +2586,6 @@ void WebLocalFrameImpl::OnPortalActivated(
   if (debugger)
     debugger->ExternalAsyncTaskFinished(blink_data.sender_stack_trace_id);
   event->ExpireAdoptionLifetime();
-
-  // After dispatching the portalactivate event, we check to see if we need to
-  // cleanup the portal hosting the predecessor. If the portal was created,
-  // but wasn't inserted or activated, we destroy it.
-  //
-  // TODO(jbroman): This should probably be done as part of
-  // ExpireAdoptionLifetime, now that the event knows about the adopted
-  // HTMLPortalElement explicitly.
-  HTMLPortalElement* portal_element =
-      DocumentPortals::From(*(GetFrame()->GetDocument()))
-          .GetPortal(portal_token);
-  if (portal_element && !portal_element->isConnected() &&
-      !portal_element->IsActivating()) {
-    portal_element->ConsumePortal();
-  }
 }
 
 void WebLocalFrameImpl::ForwardMessageFromHost(

third_party/blink/renderer/core/html/portal/html_portal_element.cc

@@ -87,6 +87,12 @@ void HTMLPortalElement::ConsumePortal() {
 
 void HTMLPortalElement::ExpireAdoptionLifetime() {
   was_just_adopted_ = false;
+
+  // After dispatching the portalactivate event, we check to see if we need to
+  // cleanup the portal hosting the predecessor. If the portal was created,
+  // but wasn't inserted or activated, we destroy it.
+  if (!CanHaveGuestContents() && !IsActivating())
+    ConsumePortal();
 }
 
 // https://wicg.github.io/portals/#htmlportalelement-may-have-a-guest-browsing-context