-
Notifications
You must be signed in to change notification settings - Fork 15.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick 913247c378d5 from chromium (#23011)
- Loading branch information
Showing
2 changed files
with
58 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
patches/chromium/use_supportsweakptr_for_messaging_from_rendering_thread_to_main.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Hongchan Choi <hongchan@chromium.org> | ||
Date: Wed, 4 Mar 2020 00:45:41 +0000 | ||
Subject: Use SupportsWeakPtr for messaging from rendering thread to main | ||
thread | ||
|
||
In cross-thread messaging, the associated execution context can be | ||
already gone when a posted task is performed sometime later in the task | ||
runner's queue. | ||
|
||
By using WeakPtr, the task runner will not perform a scheduled task | ||
in the queue when the target object is invalid. | ||
|
||
Test: Locally confirmed that the repro does not crash. | ||
Bug: 1057627 | ||
Change-Id: I51737594c918f6a4924c9a7ffe30db3e8de9a683 | ||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2082897 | ||
Commit-Queue: Hongchan Choi <hongchan@chromium.org> | ||
Reviewed-by: Raymond Toy <rtoy@chromium.org> | ||
Cr-Commit-Position: refs/heads/master@{#746613} | ||
|
||
diff --git a/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc b/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc | ||
index 9594f5fe1c2783e7c5aa5f3b20440bd0abc1f548..8e9c4c60163e0b0a2403292df53926a069ebe3e7 100644 | ||
--- a/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc | ||
+++ b/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc | ||
@@ -250,7 +250,7 @@ void AudioScheduledSourceHandler::Finish() { | ||
PostCrossThreadTask( | ||
*task_runner_, FROM_HERE, | ||
CrossThreadBindOnce(&AudioScheduledSourceHandler::NotifyEnded, | ||
- WrapRefCounted(this))); | ||
+ AsWeakPtr())); | ||
} | ||
|
||
void AudioScheduledSourceHandler::NotifyEnded() { | ||
diff --git a/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.h b/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.h | ||
index 2fdb9bac867bee1ad79bf98ee5b963e86321becb..d526a776c4c243d4bc186497f729d29b3bd7ef09 100644 | ||
--- a/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.h | ||
+++ b/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.h | ||
@@ -30,6 +30,7 @@ | ||
#define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBAUDIO_AUDIO_SCHEDULED_SOURCE_NODE_H_ | ||
|
||
#include <atomic> | ||
+#include "base/memory/weak_ptr.h" | ||
#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h" | ||
#include "third_party/blink/renderer/modules/webaudio/audio_node.h" | ||
|
||
@@ -38,7 +39,9 @@ namespace blink { | ||
class BaseAudioContext; | ||
class AudioBus; | ||
|
||
-class AudioScheduledSourceHandler : public AudioHandler { | ||
+class AudioScheduledSourceHandler | ||
+ : public AudioHandler, | ||
+ public base::SupportsWeakPtr<AudioScheduledSourceHandler> { | ||
public: | ||
// These are the possible states an AudioScheduledSourceNode can be in: | ||
// |