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

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

Issue 2866093002: blink: m_foo -> foo_ in logging strings. (Closed)
Patch Set: rebase Created 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1012 1012
1013 ExecutionContext* MediaKeySession::GetExecutionContext() const { 1013 ExecutionContext* MediaKeySession::GetExecutionContext() const {
1014 return ContextLifecycleObserver::GetExecutionContext(); 1014 return ContextLifecycleObserver::GetExecutionContext();
1015 } 1015 }
1016 1016
1017 bool MediaKeySession::HasPendingActivity() const { 1017 bool MediaKeySession::HasPendingActivity() const {
1018 // Remain around if there are pending events or MediaKeys is still around 1018 // Remain around if there are pending events or MediaKeys is still around
1019 // and we're not closed. 1019 // and we're not closed.
1020 DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) 1020 DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL)
1021 << __func__ << "(" << this << ")" 1021 << __func__ << "(" << this << ")"
1022 << (!pending_actions_.IsEmpty() ? " !m_pendingActions.isEmpty()" : "") 1022 << (!pending_actions_.IsEmpty() ? " !pending_actions_.IsEmpty()" : "")
1023 << (async_event_queue_->HasPendingEvents() 1023 << (async_event_queue_->HasPendingEvents()
1024 ? " m_asyncEventQueue->hasPendingEvents()" 1024 ? " async_event_queue_->HasPendingEvents()"
1025 : "") 1025 : "")
1026 << ((media_keys_ && !is_closed_) ? " m_mediaKeys && !m_isClosed" : ""); 1026 << ((media_keys_ && !is_closed_) ? " media_keys_ && !is_closed_" : "");
1027 1027
1028 return !pending_actions_.IsEmpty() || 1028 return !pending_actions_.IsEmpty() ||
1029 async_event_queue_->HasPendingEvents() || (media_keys_ && !is_closed_); 1029 async_event_queue_->HasPendingEvents() || (media_keys_ && !is_closed_);
1030 } 1030 }
1031 1031
1032 void MediaKeySession::ContextDestroyed(ExecutionContext*) { 1032 void MediaKeySession::ContextDestroyed(ExecutionContext*) {
1033 // Stop the CDM from firing any more events for this session. 1033 // Stop the CDM from firing any more events for this session.
1034 session_.reset(); 1034 session_.reset();
1035 is_closed_ = true; 1035 is_closed_ = true;
1036 action_timer_.Stop(); 1036 action_timer_.Stop();
1037 pending_actions_.clear(); 1037 pending_actions_.clear();
1038 async_event_queue_->Close(); 1038 async_event_queue_->Close();
1039 } 1039 }
1040 1040
1041 DEFINE_TRACE(MediaKeySession) { 1041 DEFINE_TRACE(MediaKeySession) {
1042 visitor->Trace(async_event_queue_); 1042 visitor->Trace(async_event_queue_);
1043 visitor->Trace(pending_actions_); 1043 visitor->Trace(pending_actions_);
1044 visitor->Trace(media_keys_); 1044 visitor->Trace(media_keys_);
1045 visitor->Trace(key_statuses_map_); 1045 visitor->Trace(key_statuses_map_);
1046 visitor->Trace(closed_promise_); 1046 visitor->Trace(closed_promise_);
1047 EventTargetWithInlineData::Trace(visitor); 1047 EventTargetWithInlineData::Trace(visitor);
1048 ContextLifecycleObserver::Trace(visitor); 1048 ContextLifecycleObserver::Trace(visitor);
1049 } 1049 }
1050 1050
1051 } // namespace blink 1051 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698