Title: [187099] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187099
- Author
- matthew_han...@apple.com
- Date
- 2015-07-20 22:56:40 -0700 (Mon, 20 Jul 2015)
Log Message
Merge r187098. rdar://problem/21878275
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187098 => 187099)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 05:39:55 UTC (rev 187098)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 05:56:40 UTC (rev 187099)
@@ -1,5 +1,21 @@
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r187098. rdar://problem/21878275
+
+ 2015-07-20 Ada Chan <adac...@apple.com>
+
+ Follow-up to my earlier fix for r147085
+ https://bugs.webkit.org/show_bug.cgi?id=147085
+
+ Reviewed by Eric Carlson.
+
+ * Modules/webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::isPlayingAudioDidChange):
+ Null-check document() before dereferencing it in case the audio context's document is destroyed
+ by the time the code block is called on the main thread.
+
+2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r187053. rdar://problem/21778212
2015-07-20 Nan Wang <n_w...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/Modules/webaudio/AudioContext.cpp (187098 => 187099)
--- branches/safari-601.1-branch/Source/WebCore/Modules/webaudio/AudioContext.cpp 2015-07-21 05:39:55 UTC (rev 187098)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/webaudio/AudioContext.cpp 2015-07-21 05:56:40 UTC (rev 187099)
@@ -1073,7 +1073,8 @@
// we could be on the audio I/O thread here and the call into WebCore could block.
RefPtr<AudioContext> strongThis(this);
callOnMainThread([strongThis] {
- strongThis->document()->updateIsPlayingMedia();
+ if (strongThis->document())
+ strongThis->document()->updateIsPlayingMedia();
});
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
