Title: [278439] trunk/Source/WebCore
Revision
278439
Author
[email protected]
Date
2021-06-03 17:43:09 -0700 (Thu, 03 Jun 2021)

Log Message

REGRESSION(r278336): fast/dom/Window/property-access-on-cached-window-after-frame-removed.html (layout-test) is a constant crash
https://bugs.webkit.org/show_bug.cgi?id=226570
rdar://78784709

Reviewed by Eric Carlson.

Now that the coordinator attribute is no longer optional following bug 226328, it can
be iterated while in closed state. Check that the MediaSessionCoordinatorPrivate is set.
Fix crash in existing test.
Fly-by fixes: trailing whitespaces and make header declaration conditional.

* Modules/mediasession/MediaSession.h:
* Modules/mediasession/MediaSessionCoordinator.h:
(WebCore::MediaSessionCoordinator::identifier const): Add nullptr check, return empty String if so.
* Modules/mediasession/MediaSessionCoordinator.idl: Remove trailing whitespace

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (278438 => 278439)


--- trunk/Source/WebCore/ChangeLog	2021-06-04 00:41:01 UTC (rev 278438)
+++ trunk/Source/WebCore/ChangeLog	2021-06-04 00:43:09 UTC (rev 278439)
@@ -1,3 +1,21 @@
+2021-06-03  Jean-Yves Avenard  <[email protected]>
+
+        REGRESSION(r278336): fast/dom/Window/property-access-on-cached-window-after-frame-removed.html (layout-test) is a constant crash
+        https://bugs.webkit.org/show_bug.cgi?id=226570
+        rdar://78784709
+
+        Reviewed by Eric Carlson.
+
+        Now that the coordinator attribute is no longer optional following bug 226328, it can
+        be iterated while in closed state. Check that the MediaSessionCoordinatorPrivate is set.
+        Fix crash in existing test.
+        Fly-by fixes: trailing whitespaces and make header declaration conditional.
+
+        * Modules/mediasession/MediaSession.h:
+        * Modules/mediasession/MediaSessionCoordinator.h:
+        (WebCore::MediaSessionCoordinator::identifier const): Add nullptr check, return empty String if so.
+        * Modules/mediasession/MediaSessionCoordinator.idl: Remove trailing whitespace
+
 2021-06-03  Devin Rousso  <[email protected]>
 
         [Payment Request] allow additional line items and/or an override total to be specified in `ApplePayModifier`

Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (278438 => 278439)


--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h	2021-06-04 00:41:01 UTC (rev 278438)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h	2021-06-04 00:43:09 UTC (rev 278439)
@@ -123,7 +123,9 @@
     void notifyActionHandlerObservers();
     void notifyReadyStateObservers();
 
+#if ENABLE(MEDIA_SESSION_COORDINATOR)
     void createCoordinator(MediaSessionCoordinatorPrivate*);
+#endif
 
     // ActiveDOMObject
     const char* activeDOMObjectName() const final { return "MediaSession"; }

Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.h (278438 => 278439)


--- trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.h	2021-06-04 00:41:01 UTC (rev 278438)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.h	2021-06-04 00:43:09 UTC (rev 278439)
@@ -56,7 +56,7 @@
     ExceptionOr<void> leave();
     void close();
 
-    String identifier() const { return m_privateCoordinator->identifier(); }
+    String identifier() const { return m_privateCoordinator ? m_privateCoordinator->identifier() : String(); }
     MediaSessionCoordinatorState state() const { return m_state; }
 
     void seekTo(double, DOMPromiseDeferred<void>&&);

Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.idl (278438 => 278439)


--- trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.idl	2021-06-04 00:41:01 UTC (rev 278438)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.idl	2021-06-04 00:43:09 UTC (rev 278439)
@@ -37,7 +37,7 @@
 
     readonly attribute MediaSessionCoordinatorState state;
     attribute EventHandler oncoordinatorstatechange;
-    
+
     readonly attribute DOMString? identifier;
 
     Promise<undefined> seekTo(unrestricted double time);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to