Title: [183578] trunk/Source/WebCore
- Revision
- 183578
- Author
- [email protected]
- Date
- 2015-04-29 14:44:12 -0700 (Wed, 29 Apr 2015)
Log Message
Some media tests assert after r183096
https://bugs.webkit.org/show_bug.cgi?id=144098
Reviewed by Brent Fulgham.
Never assert when a MediaPlaybackTargetClient client calls one of the methods on Document
after it has been unregistered. A media element unregisters itself when it is removed from the
document, but scripts can still run and modify state that results in a call to
playbackTargetPickerClientStateDidChange. Remove the asserts instead of adding checks to
the various call sites.
* dom/Document.cpp:
(WebCore::Document::showPlaybackTargetPicker): Don't assert if the client has already
been unregistered.
(WebCore::Document::playbackTargetPickerClientStateDidChange): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183577 => 183578)
--- trunk/Source/WebCore/ChangeLog 2015-04-29 21:43:19 UTC (rev 183577)
+++ trunk/Source/WebCore/ChangeLog 2015-04-29 21:44:12 UTC (rev 183578)
@@ -1,3 +1,21 @@
+2015-04-29 Eric Carlson <[email protected]>
+
+ Some media tests assert after r183096
+ https://bugs.webkit.org/show_bug.cgi?id=144098
+
+ Reviewed by Brent Fulgham.
+
+ Never assert when a MediaPlaybackTargetClient client calls one of the methods on Document
+ after it has been unregistered. A media element unregisters itself when it is removed from the
+ document, but scripts can still run and modify state that results in a call to
+ playbackTargetPickerClientStateDidChange. Remove the asserts instead of adding checks to
+ the various call sites.
+
+ * dom/Document.cpp:
+ (WebCore::Document::showPlaybackTargetPicker): Don't assert if the client has already
+ been unregistered.
+ (WebCore::Document::playbackTargetPickerClientStateDidChange): Ditto.
+
2015-04-29 Zalan Bujtas <[email protected]>
Simple line layout: Web process spins endlessly below layoutSimpleLines.
Modified: trunk/Source/WebCore/dom/Document.cpp (183577 => 183578)
--- trunk/Source/WebCore/dom/Document.cpp 2015-04-29 21:43:19 UTC (rev 183577)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-04-29 21:44:12 UTC (rev 183578)
@@ -6571,7 +6571,6 @@
return;
auto it = m_clientToIDMap.find(&client);
- ASSERT(it != m_clientToIDMap.end());
if (it == m_clientToIDMap.end())
return;
@@ -6585,7 +6584,6 @@
return;
auto it = m_clientToIDMap.find(&client);
- ASSERT(it != m_clientToIDMap.end());
if (it == m_clientToIDMap.end())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes