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

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

Issue 540283003: bindings: Retires ScriptWrappable::init, etc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed a review comment. Created 6 years, 3 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 | Annotate | Revision Log
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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 : ActiveDOMObject(context) 313 : ActiveDOMObject(context)
314 , m_keySystem(keys->keySystem()) 314 , m_keySystem(keys->keySystem())
315 , m_asyncEventQueue(GenericEventQueue::create(this)) 315 , m_asyncEventQueue(GenericEventQueue::create(this))
316 , m_session(cdmSession) 316 , m_session(cdmSession)
317 , m_keys(keys) 317 , m_keys(keys)
318 , m_isClosed(false) 318 , m_isClosed(false)
319 , m_closedPromise(new ClosedPromise(context, this, ClosedPromise::Closed)) 319 , m_closedPromise(new ClosedPromise(context, this, ClosedPromise::Closed))
320 , m_actionTimer(this, &MediaKeySession::actionTimerFired) 320 , m_actionTimer(this, &MediaKeySession::actionTimerFired)
321 { 321 {
322 WTF_LOG(Media, "MediaKeySession(%p)::MediaKeySession", this); 322 WTF_LOG(Media, "MediaKeySession(%p)::MediaKeySession", this);
323 ScriptWrappable::init(this);
324 m_session->setClientInterface(this); 323 m_session->setClientInterface(this);
325 324
326 // Resume MediaKeys::createSession() at step 7.6. 325 // Resume MediaKeys::createSession() at step 7.6.
327 // 7.6.1 Set the error attribute to null. 326 // 7.6.1 Set the error attribute to null.
328 ASSERT(!m_error); 327 ASSERT(!m_error);
329 328
330 // 7.6.2 Set the sessionId attribute to session ID. 329 // 7.6.2 Set the sessionId attribute to session ID.
331 ASSERT(!sessionId().isEmpty()); 330 ASSERT(!sessionId().isEmpty());
332 331
333 // 7.6.3 Let expiration be NaN. 332 // 7.6.3 Let expiration be NaN.
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 { 623 {
625 visitor->trace(m_error); 624 visitor->trace(m_error);
626 visitor->trace(m_asyncEventQueue); 625 visitor->trace(m_asyncEventQueue);
627 visitor->trace(m_pendingActions); 626 visitor->trace(m_pendingActions);
628 visitor->trace(m_keys); 627 visitor->trace(m_keys);
629 visitor->trace(m_closedPromise); 628 visitor->trace(m_closedPromise);
630 EventTargetWithInlineData::trace(visitor); 629 EventTargetWithInlineData::trace(visitor);
631 } 630 }
632 631
633 } // namespace blink 632 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeyNeededEvent.cpp ('k') | Source/modules/encryptedmedia/MediaKeys.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698