Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1371)

Unified Diff: content/renderer/media/rtc_peer_connection_handler.cc

Issue 1023443007: Make sure Blink WebRTCSessionDescriptionRequest and WebRTCVoidRequest are deleted on the correct th… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/rtc_peer_connection_handler.cc
diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc
index 20288bb9cfb0830e3330c32817f6a06e8078a789..cdd11c9afaf92445505c22b4633a2c232e2a12ea 100644
--- a/content/renderer/media/rtc_peer_connection_handler.cc
+++ b/content/renderer/media/rtc_peer_connection_handler.cc
@@ -262,6 +262,7 @@ class CreateSessionDescriptionRequest
tracker_.TrackOnSuccess(desc);
webkit_request_.requestSucceeded(CreateWebKitSessionDescription(desc));
+ webkit_request_.reset();
delete desc;
}
void OnFailure(const std::string& error) override {
@@ -273,10 +274,13 @@ class CreateSessionDescriptionRequest
tracker_.TrackOnFailure(error);
webkit_request_.requestFailed(base::UTF8ToUTF16(error));
+ webkit_request_.reset();
}
protected:
- ~CreateSessionDescriptionRequest() override {}
+ ~CreateSessionDescriptionRequest() override {
+ DCHECK(webkit_request_.isNull());
+ }
const scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
blink::WebRTCSessionDescriptionRequest webkit_request_;
@@ -307,6 +311,7 @@ class SetSessionDescriptionRequest
}
tracker_.TrackOnSuccess(NULL);
webkit_request_.requestSucceeded();
+ webkit_request_.reset();
}
void OnFailure(const std::string& error) override {
if (!main_thread_->BelongsToCurrentThread()) {
@@ -316,10 +321,13 @@ class SetSessionDescriptionRequest
}
tracker_.TrackOnFailure(error);
webkit_request_.requestFailed(base::UTF8ToUTF16(error));
+ webkit_request_.reset();
}
protected:
- ~SetSessionDescriptionRequest() override {}
+ ~SetSessionDescriptionRequest() override {
+ DCHECK(webkit_request_.isNull());
+ }
private:
const scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698