admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete implicit conversion from raw pointer to scoped_ref_ptr

Browse Source 
Followup to https://webrtc-review.googlesource.com/c/src/+/242363

Bug: webrtc:13464
Change-Id: I44358e8cfedeea92aac4ef47c540aff9a4865cdc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/247362
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35897}
This commit is contained in:
Niels Möller 2022-01-25 15:54:17 +01:00 committed by WebRTC LUCI CQ
parent 63c3b136a8
commit 7b370b935e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/scoped_refptr.h
View File

@ -74,10 +74,9 @@ class scoped_refptr {
typedef T element_type; typedef T element_type;
scoped_refptr() : ptr_(nullptr) {} scoped_refptr() : ptr_(nullptr) {}
scoped_refptr(std::nullptr_t) : ptr_(nullptr) {} // NOLINT(runtime/explicit)
// TODO(bugs.webrtc.org/13464): Implicit construction is deprecated. Mark explicit scoped_refptr(T* p) : ptr_(p) {
// explicit, and add a new implicit constructor accepting a nullptr_t.
scoped_refptr(T* p) : ptr_(p) { // NOLINT(runtime/explicit)
if (ptr_) if (ptr_)
ptr_->AddRef(); ptr_->AddRef();
} }

3
modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
View File

@ -691,7 +691,8 @@ SharedScreenCastStream::~SharedScreenCastStream() {}
rtc::scoped_refptr<SharedScreenCastStream> rtc::scoped_refptr<SharedScreenCastStream>
SharedScreenCastStream::CreateDefault() { SharedScreenCastStream::CreateDefault() {
return new SharedScreenCastStream(); // Explicit new, to access non-public constructor.
return rtc::scoped_refptr(new SharedScreenCastStream());
} }
bool SharedScreenCastStream::StartScreenCastStream(uint32_t stream_node_id, bool SharedScreenCastStream::StartScreenCastStream(uint32_t stream_node_id,