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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 this, 378 this,
379 ClosedPromise::Closed)), 379 ClosedPromise::Closed)),
380 m_actionTimer(this, &MediaKeySession::actionTimerFired) { 380 m_actionTimer(this, &MediaKeySession::actionTimerFired) {
381 DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")"; 381 DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
382 ThreadState::current()->registerPreFinalizer(this); 382 ThreadState::current()->registerPreFinalizer(this);
383 383
384 // Create the matching Chromium object. It will not be usable until 384 // Create the matching Chromium object. It will not be usable until
385 // initializeNewSession() is called in response to the user calling 385 // initializeNewSession() is called in response to the user calling
386 // generateRequest(). 386 // generateRequest().
387 WebContentDecryptionModule* cdm = mediaKeys->contentDecryptionModule(); 387 WebContentDecryptionModule* cdm = mediaKeys->contentDecryptionModule();
388 m_session = wrapUnique(cdm->createSession()); 388 m_session = WTF::wrapUnique(cdm->createSession());
389 m_session->setClientInterface(this); 389 m_session->setClientInterface(this);
390 390
391 // From https://w3c.github.io/encrypted-media/#createSession: 391 // From https://w3c.github.io/encrypted-media/#createSession:
392 // MediaKeys::createSession(), step 3. 392 // MediaKeys::createSession(), step 3.
393 // 3.1 Let the sessionId attribute be the empty string. 393 // 3.1 Let the sessionId attribute be the empty string.
394 DCHECK(sessionId().isEmpty()); 394 DCHECK(sessionId().isEmpty());
395 395
396 // 3.2 Let the expiration attribute be NaN. 396 // 3.2 Let the expiration attribute be NaN.
397 DCHECK(std::isnan(m_expiration)); 397 DCHECK(std::isnan(m_expiration));
398 398
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 visitor->trace(m_asyncEventQueue); 1045 visitor->trace(m_asyncEventQueue);
1046 visitor->trace(m_pendingActions); 1046 visitor->trace(m_pendingActions);
1047 visitor->trace(m_mediaKeys); 1047 visitor->trace(m_mediaKeys);
1048 visitor->trace(m_keyStatusesMap); 1048 visitor->trace(m_keyStatusesMap);
1049 visitor->trace(m_closedPromise); 1049 visitor->trace(m_closedPromise);
1050 EventTargetWithInlineData::trace(visitor); 1050 EventTargetWithInlineData::trace(visitor);
1051 ActiveDOMObject::trace(visitor); 1051 ActiveDOMObject::trace(visitor);
1052 } 1052 }
1053 1053
1054 } // namespace blink 1054 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698