Title: [154378] trunk/Source/WebCore
- Revision
- 154378
- Author
- [email protected]
- Date
- 2013-08-20 21:01:52 -0700 (Tue, 20 Aug 2013)
Log Message
<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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154377 => 154378)
--- trunk/Source/WebCore/ChangeLog 2013-08-20 23:52:50 UTC (rev 154377)
+++ trunk/Source/WebCore/ChangeLog 2013-08-21 04:01:52 UTC (rev 154378)
@@ -1,3 +1,16 @@
+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-20 David Barr <[email protected]>, Gyuyoung Kim <[email protected]>
<https://webkit.org/b/92330> [CSS] Pass an image orientation data to drawImage()
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (154377 => 154378)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-08-20 23:52:50 UTC (rev 154377)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-08-21 04:01:52 UTC (rev 154378)
@@ -4148,6 +4148,10 @@
if (m_textTracks)
configureTextTrackDisplay();
#endif
+
+#if PLATFORM(MAC)
+ updateDisableSleep();
+#endif
}
bool HTMLMediaElement::canSuspend() const
@@ -4180,6 +4184,10 @@
// the media player now. Note that userCancelledLoad will already have cleared the player
// if the media was not fully loaded. This handles all other cases.
m_player.clear();
+
+#if PLATFORM(MAC)
+ updateDisableSleep();
+#endif
}
void HTMLMediaElement::suspend(ReasonForSuspension why)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
