Title: [277048] branches/safari-612.1.13-branch/Source/WebKit
- Revision
- 277048
- Author
- [email protected]
- Date
- 2021-05-05 16:01:42 -0700 (Wed, 05 May 2021)
Log Message
Cherry-pick r277026. rdar://problem/77579962
REGRESSION (r276633): ASSERTION FAILED: !forbidMallocUseScopeCount || disableMallocRestrictionScopeCount
https://bugs.webkit.org/show_bug.cgi?id=225374
<rdar://problem/77533237>
Reviewed by Chris Dumez.
Disable memory allocation checks in speech recognition code path.
No change of behavior.
* WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp:
(WebKit::SpeechRecognitionRealtimeMediaSourceManager::Source::storageChanged):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277026 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.13-branch/Source/WebKit/ChangeLog (277047 => 277048)
--- branches/safari-612.1.13-branch/Source/WebKit/ChangeLog 2021-05-05 22:46:02 UTC (rev 277047)
+++ branches/safari-612.1.13-branch/Source/WebKit/ChangeLog 2021-05-05 23:01:42 UTC (rev 277048)
@@ -1,5 +1,38 @@
2021-05-05 Ruben Turcios <[email protected]>
+ Cherry-pick r277026. rdar://problem/77579962
+
+ REGRESSION (r276633): ASSERTION FAILED: !forbidMallocUseScopeCount || disableMallocRestrictionScopeCount
+ https://bugs.webkit.org/show_bug.cgi?id=225374
+ <rdar://problem/77533237>
+
+ Reviewed by Chris Dumez.
+
+ Disable memory allocation checks in speech recognition code path.
+ No change of behavior.
+
+ * WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp:
+ (WebKit::SpeechRecognitionRealtimeMediaSourceManager::Source::storageChanged):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277026 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-05-05 Youenn Fablet <[email protected]>
+
+ REGRESSION (r276633): ASSERTION FAILED: !forbidMallocUseScopeCount || disableMallocRestrictionScopeCount
+ https://bugs.webkit.org/show_bug.cgi?id=225374
+ <rdar://problem/77533237>
+
+ Reviewed by Chris Dumez.
+
+ Disable memory allocation checks in speech recognition code path.
+ No change of behavior.
+
+ * WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp:
+ (WebKit::SpeechRecognitionRealtimeMediaSourceManager::Source::storageChanged):
+
+2021-05-05 Ruben Turcios <[email protected]>
+
Cherry-pick r277030. rdar://problem/77573075
Sampled Page Top Color: take additional snapshots further down the page to see if the sampled top color is more than just a tiny strip
Modified: branches/safari-612.1.13-branch/Source/WebKit/WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp (277047 => 277048)
--- branches/safari-612.1.13-branch/Source/WebKit/WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp 2021-05-05 22:46:02 UTC (rev 277047)
+++ branches/safari-612.1.13-branch/Source/WebKit/WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp 2021-05-05 23:01:42 UTC (rev 277048)
@@ -109,6 +109,7 @@
void audioSamplesAvailable(const MediaTime& time, const PlatformAudioData& audioData, const AudioStreamDescription& description, size_t numberOfFrames) final
{
#if PLATFORM(COCOA)
+ DisableMallocRestrictionsForCurrentThreadScope scope;
if (m_description != description) {
ASSERT(description.platformDescription().type == PlatformDescription::CAAudioStreamBasicType);
m_description = *WTF::get<const AudioStreamBasicDescription*>(description.platformDescription().description);
@@ -132,6 +133,7 @@
void storageChanged(SharedMemory* storage)
{
+ DisableMallocRestrictionsForCurrentThreadScope scope;
SharedMemory::Handle handle;
if (storage)
storage->createHandle(handle, SharedMemory::Protection::ReadOnly);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
