Title: [154397] branches/safari-537-branch/Source/WebCore
- Revision
- 154397
- Author
- [email protected]
- Date
- 2013-08-21 10:33:40 -0700 (Wed, 21 Aug 2013)
Log Message
Merged r154378. <rdar://problem/14765691>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (154396 => 154397)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-21 17:25:28 UTC (rev 154396)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-21 17:33:40 UTC (rev 154397)
@@ -1,3 +1,20 @@
+2013-08-21 Lucas Forschler <[email protected]>
+
+ Merge r154378
+
+ 2013-08-20 Jer Noble <[email protected]>
+
+ <https://webkit.org/b/120101> [Mac] Suspended HTMLMediaElements can still hold power assertion after playback stops.
+
+ Reviewed by Eric Carlson.
+
+ Call updateDisplaySleep() when we clear our MediaPlayer, as doing so may kill any in-flight
+ rateChanged() notifications.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::clearMediaPlayer):
+ (WebCore::HTMLMediaElement::stop):
+
2013-08-16 Lucas Forschler <[email protected]>
Merge r154147
Modified: branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.cpp (154396 => 154397)
--- branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.cpp 2013-08-21 17:25:28 UTC (rev 154396)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.cpp 2013-08-21 17:33:40 UTC (rev 154397)
@@ -4155,6 +4155,10 @@
if (m_textTracks)
configureTextTrackDisplay();
#endif
+
+#if PLATFORM(MAC)
+ updateDisableSleep();
+#endif
}
bool HTMLMediaElement::canSuspend() const
@@ -4182,6 +4186,10 @@
cancelPendingEventsAndCallbacks();
m_asyncEventQueue->close();
+
+#if PLATFORM(MAC)
+ updateDisableSleep();
+#endif
}
void HTMLMediaElement::suspend(ReasonForSuspension why)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
