Title: [174977] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 174977
- Author
- [email protected]
- Date
- 2014-10-21 09:42:23 -0700 (Tue, 21 Oct 2014)
Log Message
Merge r174720 - REGRESSION (r159208): Crash when clicking scrubber after navigating away/back to video
https://bugs.webkit.org/show_bug.cgi?id=137715
Reviewed by Darin Adler.
Simple null-check of m_player in refreshCachedTime.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::refreshCachedTime):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174976 => 174977)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:41:21 UTC (rev 174976)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:42:23 UTC (rev 174977)
@@ -1,3 +1,15 @@
+2014-10-14 Jer Noble <[email protected]>
+
+ REGRESSION (r159208): Crash when clicking scrubber after navigating away/back to video
+ https://bugs.webkit.org/show_bug.cgi?id=137715
+
+ Reviewed by Darin Adler.
+
+ Simple null-check of m_player in refreshCachedTime.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::refreshCachedTime):
+
2014-10-14 Zalan Bujtas <[email protected]>
REGRESSION (Safari 7.1/8.0): Border-radius and overflow hidden renders incorrectly.
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLMediaElement.cpp (174976 => 174977)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLMediaElement.cpp 2014-10-21 16:41:21 UTC (rev 174976)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLMediaElement.cpp 2014-10-21 16:42:23 UTC (rev 174977)
@@ -2472,6 +2472,9 @@
void HTMLMediaElement::refreshCachedTime() const
{
+ if (!m_player)
+ return;
+
m_cachedTime = m_player->currentTime();
if (!m_cachedTime) {
// Do not use m_cachedTime until the media engine returns a non-zero value because we can't
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
