Changeset 227529 in webkit

Timestamp:

Jan 24, 2018 10:07:18 AM (6 years ago)

Author:

eric.carlson@apple.com

Message:

REGRESSION(r227457): Release assert in updateLayout while destructing a media element
​https://bugs.webkit.org/show_bug.cgi?id=182038
<rdar://problem/36812083>

Reviewed by Jer Noble.

• html/MediaElementSession.cpp:

(WebCore::isMainContentForPurposesOfAutoplay): Early return if element.isSuspended().

• platform/audio/mac/MediaSessionManagerMac.mm:

(WebCore::MediaSessionManagerMac::clientCharacteristicsChanged): Call scheduleUpdateNowPlayingInfo
instead of updateNowPlayingInfo.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/MediaElementSession.cpp (modified) (2 diffs)
• platform/audio/mac/MediaSessionManagerMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-24  Eric Carlson  <eric.carlson@apple.com>
+
+        REGRESSION(r227457): Release assert in updateLayout while destructing a media element
+        https://bugs.webkit.org/show_bug.cgi?id=182038
+        <rdar://problem/36812083>
+
+        Reviewed by Jer Noble.
+
+        * html/MediaElementSession.cpp:
+        (WebCore::isMainContentForPurposesOfAutoplay): Early return if element.isSuspended().
+        * platform/audio/mac/MediaSessionManagerMac.mm:
+        (WebCore::MediaSessionManagerMac::clientCharacteristicsChanged): Call scheduleUpdateNowPlayingInfo
+        instead of updateNowPlayingInfo.
+
 2018-01-24  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/html/MediaElementSession.cpp

@@ -696 +696 @@
 {
     Document& document = element.document();
-    if (!document.isSafeToUpdateStyleOrLayout() || !element.hasAudio() || !element.hasVideo())
+    if (element.isSuspended() || !element.hasAudio() || !element.hasVideo())
         return false;
 
@@ -716 +716 @@
 
     // Main content elements must be in the main frame.
-    if (!document.frame() || !document.frame()->isMainFrame())
+    if (!document.frame() || !document.frame()->isMainFrame() || !document.isSafeToUpdateStyleOrLayout())
         return false;
 

trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.mm

@@ -103 +103 @@
 {
     LOG(Media, "MediaSessionManagerMac::clientCharacteristicsChanged");
-    updateNowPlayingInfo();
+    scheduleUpdateNowPlayingInfo();
 }