diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/events/portal_activate_event.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/events/portal_activate_event.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/chromium/third_party/blink/renderer/core/events/portal_activate_event.cc b/chromium/third_party/blink/renderer/core/events/portal_activate_event.cc index d7666402f98..ddd5dfa8795 100644 --- a/chromium/third_party/blink/renderer/core/events/portal_activate_event.cc +++ b/chromium/third_party/blink/renderer/core/events/portal_activate_event.cc @@ -21,16 +21,16 @@ namespace blink { PortalActivateEvent* PortalActivateEvent::Create( LocalFrame* frame, const base::UnguessableToken& predecessor_portal_token, - mojom::blink::PortalAssociatedPtr predecessor_portal_ptr, - mojom::blink::PortalClientAssociatedRequest - predecessor_portal_client_request, + mojo::PendingAssociatedRemote<mojom::blink::Portal> predecessor_portal, + mojo::PendingAssociatedReceiver<mojom::blink::PortalClient> + predecessor_portal_client_receiver, scoped_refptr<SerializedScriptValue> data, MessagePortArray* ports, OnPortalActivatedCallback callback) { return MakeGarbageCollected<PortalActivateEvent>( frame->GetDocument(), predecessor_portal_token, - std::move(predecessor_portal_ptr), - std::move(predecessor_portal_client_request), + std::move(predecessor_portal), + std::move(predecessor_portal_client_receiver), SerializedScriptValue::Unpack(std::move(data)), ports, std::move(callback)); } @@ -44,21 +44,21 @@ PortalActivateEvent* PortalActivateEvent::Create( PortalActivateEvent::PortalActivateEvent( Document* document, const base::UnguessableToken& predecessor_portal_token, - mojom::blink::PortalAssociatedPtr predecessor_portal_ptr, - mojom::blink::PortalClientAssociatedRequest - predecessor_portal_client_request, + mojo::PendingAssociatedRemote<mojom::blink::Portal> predecessor_portal, + mojo::PendingAssociatedReceiver<mojom::blink::PortalClient> + predecessor_portal_client_receiver, UnpackedSerializedScriptValue* data, MessagePortArray* ports, OnPortalActivatedCallback callback) : Event(event_type_names::kPortalactivate, Bubbles::kNo, Cancelable::kNo, - CurrentTimeTicks()), + base::TimeTicks::Now()), document_(document), predecessor_portal_token_(predecessor_portal_token), - predecessor_portal_ptr_(std::move(predecessor_portal_ptr)), - predecessor_portal_client_request_( - std::move(predecessor_portal_client_request)), + predecessor_portal_(std::move(predecessor_portal)), + predecessor_portal_client_receiver_( + std::move(predecessor_portal_client_receiver)), data_(data), ports_(ports), on_portal_activated_callback_(std::move(callback)) {} @@ -120,7 +120,7 @@ const AtomicString& PortalActivateEvent::InterfaceName() const { HTMLPortalElement* PortalActivateEvent::adoptPredecessor( ExceptionState& exception_state) { - if (!predecessor_portal_ptr_) { + if (!predecessor_portal_) { exception_state.ThrowDOMException( DOMExceptionCode::kInvalidStateError, "The PortalActivateEvent is not associated with a predecessor browsing " @@ -129,16 +129,16 @@ HTMLPortalElement* PortalActivateEvent::adoptPredecessor( } HTMLPortalElement* portal = MakeGarbageCollected<HTMLPortalElement>( - *document_, predecessor_portal_token_, std::move(predecessor_portal_ptr_), - std::move(predecessor_portal_client_request_)); + *document_, predecessor_portal_token_, std::move(predecessor_portal_), + std::move(predecessor_portal_client_receiver_)); std::move(on_portal_activated_callback_).Run(true); return portal; } void PortalActivateEvent::DetachPortalIfNotAdopted() { - if (predecessor_portal_ptr_) { + if (predecessor_portal_) { std::move(on_portal_activated_callback_).Run(false); - predecessor_portal_ptr_.reset(); + predecessor_portal_.reset(); } } |