|
@@ -1,7 +1,7 @@
|
|
|
-From 98bcf9ef5cdd3a19f8b739f2cc6b2afdb01b7694 Mon Sep 17 00:00:00 2001
|
|
|
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
From: Tommy Steimel <[email protected]>
|
|
|
Date: Tue, 23 Apr 2024 19:29:23 +0000
|
|
|
-Subject: [PATCH] [M124][document pip] Don't assume the enter event window is a LocalDOMWindow
|
|
|
+Subject: Don't assume the enter event window is a LocalDOMWindow
|
|
|
|
|
|
This CL changes DocumentPictureInPictureEvent to store a DOMWindow
|
|
|
instead of a LocalDOMWindow to prevent crashes when the window it gets
|
|
@@ -20,13 +20,12 @@ Auto-Submit: Tommy Steimel <[email protected]>
|
|
|
Commit-Queue: Frank Liberato <[email protected]>
|
|
|
Cr-Commit-Position: refs/branch-heads/6367@{#974}
|
|
|
Cr-Branched-From: d158c6dc6e3604e6f899041972edf26087a49740-refs/heads/main@{#1274542}
|
|
|
----
|
|
|
|
|
|
diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc
|
|
|
-index 037813c..572d0803 100644
|
|
|
+index 037813c62c2f0dfc78b3451320a799a349ffde23..572d0803c25a99ef5dfd631e7872b05a681f0444 100644
|
|
|
--- a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc
|
|
|
+++ b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.cc
|
|
|
-@@ -8,7 +8,7 @@
|
|
|
+@@ -8,7 +8,7 @@ namespace blink {
|
|
|
|
|
|
DocumentPictureInPictureEvent* DocumentPictureInPictureEvent::Create(
|
|
|
const AtomicString& type,
|
|
@@ -35,7 +34,7 @@ index 037813c..572d0803 100644
|
|
|
return MakeGarbageCollected<DocumentPictureInPictureEvent>(
|
|
|
type, document_picture_in_picture_window);
|
|
|
}
|
|
|
-@@ -19,13 +19,13 @@
|
|
|
+@@ -19,13 +19,13 @@ DocumentPictureInPictureEvent* DocumentPictureInPictureEvent::Create(
|
|
|
return MakeGarbageCollected<DocumentPictureInPictureEvent>(type, initializer);
|
|
|
}
|
|
|
|
|
@@ -51,7 +50,7 @@ index 037813c..572d0803 100644
|
|
|
: Event(type, Bubbles::kYes, Cancelable::kNo),
|
|
|
document_picture_in_picture_window_(document_picture_in_picture_window) {}
|
|
|
|
|
|
-@@ -33,8 +33,7 @@
|
|
|
+@@ -33,8 +33,7 @@ DocumentPictureInPictureEvent::DocumentPictureInPictureEvent(
|
|
|
AtomicString const& type,
|
|
|
const DocumentPictureInPictureEventInit* initializer)
|
|
|
: Event(type, initializer),
|
|
@@ -62,7 +61,7 @@ index 037813c..572d0803 100644
|
|
|
void DocumentPictureInPictureEvent::Trace(Visitor* visitor) const {
|
|
|
visitor->Trace(document_picture_in_picture_window_);
|
|
|
diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h
|
|
|
-index 7af20221..59cd8cb 100644
|
|
|
+index 7af2022146905a3c3d71e1420aaa68da30e6a9ce..59cd8cb7a2e3a2e2a81db1d146f8075b13755c0e 100644
|
|
|
--- a/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h
|
|
|
+++ b/third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h
|
|
|
@@ -6,7 +6,7 @@
|
|
@@ -74,7 +73,7 @@ index 7af20221..59cd8cb 100644
|
|
|
#include "third_party/blink/renderer/modules/event_modules.h"
|
|
|
#include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
|
|
|
|
|
|
-@@ -18,22 +18,21 @@
|
|
|
+@@ -18,22 +18,21 @@ class MODULES_EXPORT DocumentPictureInPictureEvent final : public Event {
|
|
|
DEFINE_WRAPPERTYPEINFO();
|
|
|
|
|
|
public:
|