Title: [199615] trunk/Source/WebKit2
Revision
199615
Author
[email protected]
Date
2016-04-15 17:01:59 -0700 (Fri, 15 Apr 2016)

Log Message

REGRESSION( r199603): Pandora crashes WebKit in WebPlaybackSessionManager::removeClientForContext
https://bugs.webkit.org/show_bug.cgi?id=156648
<rdar://problem/25758117>

Reviewed by Beth Dakin.

Mistakenly checked in a reversed condition check, which causes a subsequent assert and crash.

* WebProcess/cocoa/WebPlaybackSessionManager.mm:
(WebKit::WebPlaybackSessionManager::clearPlaybackControlsManager):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (199614 => 199615)


--- trunk/Source/WebKit2/ChangeLog	2016-04-15 22:37:42 UTC (rev 199614)
+++ trunk/Source/WebKit2/ChangeLog	2016-04-16 00:01:59 UTC (rev 199615)
@@ -1,3 +1,16 @@
+2016-04-15  Jer Noble  <[email protected]>
+
+        REGRESSION( r199603): Pandora crashes WebKit in WebPlaybackSessionManager::removeClientForContext
+        https://bugs.webkit.org/show_bug.cgi?id=156648
+        <rdar://problem/25758117>
+
+        Reviewed by Beth Dakin.
+
+        Mistakenly checked in a reversed condition check, which causes a subsequent assert and crash.
+
+        * WebProcess/cocoa/WebPlaybackSessionManager.mm:
+        (WebKit::WebPlaybackSessionManager::clearPlaybackControlsManager):
+
 2016-04-15  Chris Dumez  <[email protected]>
 
         Mark NetworkLoad as FastAllocated

Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm (199614 => 199615)


--- trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm	2016-04-15 22:37:42 UTC (rev 199614)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm	2016-04-16 00:01:59 UTC (rev 199615)
@@ -256,7 +256,7 @@
 void WebPlaybackSessionManager::clearPlaybackControlsManager(WebCore::HTMLMediaElement& mediaElement)
 {
 #if PLATFORM(MAC)
-    if (m_mediaElements.contains(&mediaElement))
+    if (!m_mediaElements.contains(&mediaElement))
         return;
 
     uint64_t contextId = m_mediaElements.get(&mediaElement);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to