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

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

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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 | « content/renderer/media/rtc_video_renderer.cc ('k') | content/renderer/media/video_capture_impl_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/video_capture_impl.cc
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 8f358ca6928da80fbe2b18665acc7225c93d8e9c..1382c8fe169b188b707d156009172e05981e0a29 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -238,7 +238,7 @@ void VideoCaptureImpl::DoFeedBufferOnCaptureThread(
CachedDIB::iterator it;
for (it = cached_dibs_.begin(); it != cached_dibs_.end(); ++it) {
- if (buffer == it->second->mapped_memory)
+ if (buffer.get() == it->second->mapped_memory.get())
break;
}
@@ -292,7 +292,7 @@ void VideoCaptureImpl::DoBufferReceivedOnCaptureThread(
media::VideoCapture::VideoFrameBuffer* buffer;
DCHECK(cached_dibs_.find(buffer_id) != cached_dibs_.end());
- buffer = cached_dibs_[buffer_id]->mapped_memory;
+ buffer = cached_dibs_[buffer_id]->mapped_memory.get();
buffer->timestamp = timestamp;
for (ClientInfo::iterator it = clients_.begin(); it != clients_.end(); ++it) {
« no previous file with comments | « content/renderer/media/rtc_video_renderer.cc ('k') | content/renderer/media/video_capture_impl_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698