| OLD | NEW | 
|---|
| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 54 MediaKeySession::PendingAction::PendingAction(Type type, PassRefPtr<Uint8Array> 
     data) | 54 MediaKeySession::PendingAction::PendingAction(Type type, PassRefPtr<Uint8Array> 
     data) | 
| 55     : type(type) | 55     : type(type) | 
| 56     , data(data) | 56     , data(data) | 
| 57 { | 57 { | 
| 58 } | 58 } | 
| 59 | 59 | 
| 60 MediaKeySession::PendingAction::~PendingAction() | 60 MediaKeySession::PendingAction::~PendingAction() | 
| 61 { | 61 { | 
| 62 } | 62 } | 
| 63 | 63 | 
| 64 PassRefPtrWillBeRawPtr<MediaKeySession> MediaKeySession::create(ExecutionContext
     * context, blink::WebContentDecryptionModule* cdm, WeakPtrWillBeRawPtr<MediaKeys
     > keys) | 64 MediaKeySession* MediaKeySession::create(ExecutionContext* context, blink::WebCo
     ntentDecryptionModule* cdm, MediaKeys* keys) | 
| 65 { | 65 { | 
| 66     RefPtrWillBeRawPtr<MediaKeySession> session(adoptRefWillBeRefCountedGarbageC
     ollected(new MediaKeySession(context, cdm, keys))); | 66     MediaKeySession* session = adoptRefCountedGarbageCollected(new MediaKeySessi
     on(context, cdm, keys)); | 
| 67     session->suspendIfNeeded(); | 67     session->suspendIfNeeded(); | 
| 68     return session.release(); | 68     return session; | 
| 69 } | 69 } | 
| 70 | 70 | 
| 71 MediaKeySession::MediaKeySession(ExecutionContext* context, blink::WebContentDec
     ryptionModule* cdm, WeakPtrWillBeRawPtr<MediaKeys> keys) | 71 MediaKeySession::MediaKeySession(ExecutionContext* context, blink::WebContentDec
     ryptionModule* cdm, MediaKeys* keys) | 
| 72     : ActiveDOMObject(context) | 72     : ActiveDOMObject(context) | 
| 73     , m_keySystem(keys->keySystem()) | 73     , m_keySystem(keys->keySystem()) | 
| 74     , m_asyncEventQueue(GenericEventQueue::create(this)) | 74     , m_asyncEventQueue(GenericEventQueue::create(this)) | 
| 75     , m_session(adoptPtr(cdm->createSession(this))) | 75     , m_session(adoptPtr(cdm->createSession(this))) | 
| 76     , m_keys(keys) | 76     , m_keys(keys) | 
| 77     , m_isClosed(false) | 77     , m_isClosed(false) | 
| 78     , m_actionTimer(this, &MediaKeySession::actionTimerFired) | 78     , m_actionTimer(this, &MediaKeySession::actionTimerFired) | 
| 79 { | 79 { | 
| 80     WTF_LOG(Media, "MediaKeySession::MediaKeySession"); | 80     WTF_LOG(Media, "MediaKeySession::MediaKeySession"); | 
| 81     ScriptWrappable::init(this); | 81     ScriptWrappable::init(this); | 
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 270     m_pendingActions.clear(); | 270     m_pendingActions.clear(); | 
| 271     m_asyncEventQueue->close(); | 271     m_asyncEventQueue->close(); | 
| 272 } | 272 } | 
| 273 | 273 | 
| 274 void MediaKeySession::trace(Visitor* visitor) | 274 void MediaKeySession::trace(Visitor* visitor) | 
| 275 { | 275 { | 
| 276     visitor->trace(m_keys); | 276     visitor->trace(m_keys); | 
| 277 } | 277 } | 
| 278 | 278 | 
| 279 } | 279 } | 
| OLD | NEW | 
|---|