This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
88 lines
2.3 KiB
C++
88 lines
2.3 KiB
C++
/*
|
|
* Copyright 2016 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/base/weak_ptr.h"
|
|
|
|
// The implementation is borrowed from chromium except that it does not
|
|
// implement SupportsWeakPtr.
|
|
|
|
namespace rtc {
|
|
namespace internal {
|
|
|
|
WeakReference::Flag::Flag() : is_valid_(true) {
|
|
// Flags only become bound when checked for validity, or invalidated,
|
|
// so that we can check that later validity/invalidation operations on
|
|
// the same Flag take place on the same sequence.
|
|
checker_.Detach();
|
|
}
|
|
|
|
void WeakReference::Flag::Invalidate() {
|
|
RTC_DCHECK(checker_.CalledSequentially())
|
|
<< "WeakPtrs must be invalidated on the same sequence.";
|
|
is_valid_ = false;
|
|
}
|
|
|
|
bool WeakReference::Flag::IsValid() const {
|
|
RTC_DCHECK(checker_.CalledSequentially())
|
|
<< "WeakPtrs must be checked on the same sequence.";
|
|
return is_valid_;
|
|
}
|
|
|
|
WeakReference::Flag::~Flag() {}
|
|
|
|
WeakReference::WeakReference() {}
|
|
|
|
WeakReference::WeakReference(const Flag* flag) : flag_(flag) {}
|
|
|
|
WeakReference::~WeakReference() {}
|
|
|
|
WeakReference::WeakReference(WeakReference&& other) = default;
|
|
|
|
WeakReference::WeakReference(const WeakReference& other) = default;
|
|
|
|
bool WeakReference::is_valid() const {
|
|
return flag_.get() && flag_->IsValid();
|
|
}
|
|
|
|
WeakReferenceOwner::WeakReferenceOwner() {
|
|
checker_.Detach();
|
|
}
|
|
|
|
WeakReferenceOwner::~WeakReferenceOwner() {
|
|
RTC_DCHECK(checker_.CalledSequentially());
|
|
Invalidate();
|
|
}
|
|
|
|
WeakReference WeakReferenceOwner::GetRef() const {
|
|
RTC_DCHECK(checker_.CalledSequentially());
|
|
// If we hold the last reference to the Flag then create a new one.
|
|
if (!HasRefs())
|
|
flag_ = new RefCountedObject<WeakReference::Flag>();
|
|
|
|
return WeakReference(flag_.get());
|
|
}
|
|
|
|
void WeakReferenceOwner::Invalidate() {
|
|
RTC_DCHECK(checker_.CalledSequentially());
|
|
if (flag_.get()) {
|
|
flag_->Invalidate();
|
|
flag_ = nullptr;
|
|
}
|
|
}
|
|
|
|
WeakPtrBase::WeakPtrBase() {}
|
|
|
|
WeakPtrBase::~WeakPtrBase() {}
|
|
|
|
WeakPtrBase::WeakPtrBase(const WeakReference& ref) : ref_(ref) {}
|
|
|
|
} // namespace internal
|
|
} // namespace rtc
|