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

Unified Diff: media/video/capture/mac/video_capture_device_mac.mm

Issue 193303002: WeakPtr destruction order cleanup: media edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
Index: media/video/capture/mac/video_capture_device_mac.mm
diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm
index 1c69bdb2ebba15eb950d67126e4b033c54a0b68c..31ad944498d39ed32f4821202c1162d6d81cb6f8 100644
--- a/media/video/capture/mac/video_capture_device_mac.mm
+++ b/media/video/capture/mac/video_capture_device_mac.mm
@@ -127,7 +127,6 @@ VideoCaptureDeviceMac::VideoCaptureDeviceMac(const Name& device_name)
task_runner_(base::MessageLoopProxy::current()),
state_(kNotInitialized),
weak_factory_(this),
- weak_this_(weak_factory_.GetWeakPtr()),
capture_device_(nil) {
}
@@ -320,8 +319,9 @@ void VideoCaptureDeviceMac::ReceiveFrame(
void VideoCaptureDeviceMac::ReceiveError(const std::string& reason) {
task_runner_->PostTask(FROM_HERE,
- base::Bind(&VideoCaptureDeviceMac::SetErrorState, weak_this_,
- reason));
+ base::Bind(&VideoCaptureDeviceMac::SetErrorState,
+ weak_factory_.AsWeakPtr(),
Ami GONE FROM CHROMIUM 2014/03/10 22:02:08 s/As/Get/??
DaleCurtis 2014/03/10 23:47:46 Done.
+ reason));
}
void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) {
« media/filters/vpx_video_decoder.h ('K') | « media/video/capture/mac/video_capture_device_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698