diff options
Diffstat (limited to 'content/renderer')
-rw-r--r-- | content/renderer/gpu/queue_message_swap_promise.cc | 10 | ||||
-rw-r--r-- | content/renderer/gpu/queue_message_swap_promise.h | 2 | ||||
-rw-r--r-- | content/renderer/media/remote_media_stream_impl.cc | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/content/renderer/gpu/queue_message_swap_promise.cc b/content/renderer/gpu/queue_message_swap_promise.cc index 1cb5316..c8abf89 100644 --- a/content/renderer/gpu/queue_message_swap_promise.cc +++ b/content/renderer/gpu/queue_message_swap_promise.cc @@ -16,7 +16,7 @@ QueueMessageSwapPromise::QueueMessageSwapPromise( : message_sender_(message_sender), message_queue_(message_queue), source_frame_number_(source_frame_number) -#if DCHECK_IS_ON +#if DCHECK_IS_ON() , completed_(false) #endif @@ -27,13 +27,13 @@ QueueMessageSwapPromise::QueueMessageSwapPromise( QueueMessageSwapPromise::~QueueMessageSwapPromise() { // The promise should have either been kept or broken before it's deleted. -#if DCHECK_IS_ON +#if DCHECK_IS_ON() DCHECK(completed_); #endif } void QueueMessageSwapPromise::DidSwap(cc::CompositorFrameMetadata* metadata) { -#if DCHECK_IS_ON +#if DCHECK_IS_ON() DCHECK(!completed_); #endif message_queue_->DidSwap(source_frame_number_); @@ -42,7 +42,7 @@ void QueueMessageSwapPromise::DidSwap(cc::CompositorFrameMetadata* metadata) { } void QueueMessageSwapPromise::DidNotSwap(DidNotSwapReason reason) { -#if DCHECK_IS_ON +#if DCHECK_IS_ON() DCHECK(!completed_); #endif ScopedVector<IPC::Message> messages; @@ -57,7 +57,7 @@ void QueueMessageSwapPromise::DidNotSwap(DidNotSwapReason reason) { } void QueueMessageSwapPromise::PromiseCompleted() { -#if DCHECK_IS_ON +#if DCHECK_IS_ON() completed_ = true; #endif } diff --git a/content/renderer/gpu/queue_message_swap_promise.h b/content/renderer/gpu/queue_message_swap_promise.h index 4094b1b..245323e 100644 --- a/content/renderer/gpu/queue_message_swap_promise.h +++ b/content/renderer/gpu/queue_message_swap_promise.h @@ -37,7 +37,7 @@ class QueueMessageSwapPromise : public cc::SwapPromise { scoped_refptr<IPC::SyncMessageFilter> message_sender_; scoped_refptr<content::FrameSwapMessageQueue> message_queue_; int source_frame_number_; -#if DCHECK_IS_ON +#if DCHECK_IS_ON() bool completed_; #endif }; diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc index 5365251..1b0c647 100644 --- a/content/renderer/media/remote_media_stream_impl.cc +++ b/content/renderer/media/remote_media_stream_impl.cc @@ -213,7 +213,7 @@ class RemoteAudioTrackAdapter void OnChangedOnMainThread( webrtc::MediaStreamTrackInterface::TrackState state); -#if DCHECK_IS_ON +#if DCHECK_IS_ON() bool unregistered_; #endif @@ -227,7 +227,7 @@ RemoteAudioTrackAdapter::RemoteAudioTrackAdapter( const scoped_refptr<base::SingleThreadTaskRunner>& main_thread, webrtc::AudioTrackInterface* webrtc_track) : RemoteMediaStreamTrackAdapter(main_thread, webrtc_track), -#if DCHECK_IS_ON +#if DCHECK_IS_ON() unregistered_(false), #endif state_(observed_track()->state()) { @@ -243,13 +243,13 @@ RemoteAudioTrackAdapter::RemoteAudioTrackAdapter( } RemoteAudioTrackAdapter::~RemoteAudioTrackAdapter() { -#if DCHECK_IS_ON +#if DCHECK_IS_ON() DCHECK(unregistered_); #endif } void RemoteAudioTrackAdapter::Unregister() { -#if DCHECK_IS_ON +#if DCHECK_IS_ON() DCHECK(!unregistered_); unregistered_ = true; #endif |