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

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 306
307 // We don't need the CDM anymore. Only destroyed after all related 307 // We don't need the CDM anymore. Only destroyed after all related
308 // ContextLifecycleObservers have been stopped. 308 // ContextLifecycleObservers have been stopped.
309 cdm_.reset(); 309 cdm_.reset();
310 } 310 }
311 311
312 bool MediaKeys::HasPendingActivity() const { 312 bool MediaKeys::HasPendingActivity() const {
313 // Remain around if there are pending events. 313 // Remain around if there are pending events.
314 DVLOG(MEDIA_KEYS_LOG_LEVEL) 314 DVLOG(MEDIA_KEYS_LOG_LEVEL)
315 << __func__ << "(" << this << ")" 315 << __func__ << "(" << this << ")"
316 << (!pending_actions_.IsEmpty() ? " !m_pendingActions.isEmpty()" : "") 316 << (!pending_actions_.IsEmpty() ? " !pending_actions_.isEmpty()" : "")
317 << (reserved_for_media_element_ ? " m_reservedForMediaElement" : ""); 317 << (reserved_for_media_element_ ? " reserved_for_media_element_" : "");
318 318
319 return !pending_actions_.IsEmpty() || reserved_for_media_element_; 319 return !pending_actions_.IsEmpty() || reserved_for_media_element_;
320 } 320 }
321 321
322 } // namespace blink 322 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698