Title: [182529] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 182529
- Author
- [email protected]
- Date
- 2015-04-08 01:14:10 -0700 (Wed, 08 Apr 2015)
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.4/Source/WebCore/ChangeLog (182528 => 182529)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-08 08:08:03 UTC (rev 182528)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-08 08:14:10 UTC (rev 182529)
@@ -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 Dan Bernstein <[email protected]>
URLs that start with http:/// and https:/// lose two slashes when parsed, causing assertion failure and inconsistent behavior
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/html/HTMLMediaElement.cpp (182528 => 182529)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-08 08:08:03 UTC (rev 182528)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-08 08:14:10 UTC (rev 182529)
@@ -2437,6 +2437,9 @@
void HTMLMediaElement::refreshCachedTime() const
{
+ if (!m_player)
+ return;
+
m_cachedTime = m_player->currentTime();
m_clockTimeAtLastCachedTimeUpdate = monotonicallyIncreasingTime();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
