Title: [194943] branches/safari-601-branch/Source/WebCore
- Revision
- 194943
- Author
- matthew_han...@apple.com
- Date
- 2016-01-12 17:41:30 -0800 (Tue, 12 Jan 2016)
Log Message
Merge r194589. rdar://problem/24101250
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194942 => 194943)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-13 01:41:28 UTC (rev 194942)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-13 01:41:30 UTC (rev 194943)
@@ -1,5 +1,21 @@
2016-01-12 Matthew Hanson <matthew_han...@apple.com>
+ Merge r194589. rdar://problem/24101250
+
+ 2016-01-05 Eric Carlson <eric.carl...@apple.com>
+
+ Avoid NULL deference in Page::updateIsPlayingMedia
+ https://bugs.webkit.org/show_bug.cgi?id=152732
+
+ No new tests, this fixes a rare crash that I am unable to reproduce.
+
+ Reviewed by David Kilzer.
+
+ * page/Page.cpp:
+ (WebCore::Page::updateIsPlayingMedia): frame->document() can return NULL.
+
+2016-01-12 Matthew Hanson <matthew_han...@apple.com>
+
Merge r194908. rdar://problem/24101253
2016-01-11 Matthew Hanson <matthew_han...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/page/Page.cpp (194942 => 194943)
--- branches/safari-601-branch/Source/WebCore/page/Page.cpp 2016-01-13 01:41:28 UTC (rev 194942)
+++ branches/safari-601-branch/Source/WebCore/page/Page.cpp 2016-01-13 01:41:30 UTC (rev 194943)
@@ -1187,7 +1187,8 @@
{
MediaProducer::MediaStateFlags state = MediaProducer::IsNotPlaying;
for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
- state |= frame->document()->mediaState();
+ if (Document* document = frame->document())
+ state |= document->mediaState();
}
if (state == m_mediaState)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
