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

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

Issue 182063004: Rename adoptRefCountedWillBeRefCountedGarbageCollected to adoptRefWillBeRefCountedGarbageCollected (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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
« no previous file with comments | « Source/heap/HeapTest.cpp ('k') | Source/modules/mediasource/MediaSource.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 , data(data) 53 , data(data)
54 { 54 {
55 } 55 }
56 56
57 MediaKeySession::PendingAction::~PendingAction() 57 MediaKeySession::PendingAction::~PendingAction()
58 { 58 {
59 } 59 }
60 60
61 PassRefPtrWillBeRawPtr<MediaKeySession> MediaKeySession::create(ExecutionContext * context, ContentDecryptionModule* cdm, WeakPtr<MediaKeys> keys) 61 PassRefPtrWillBeRawPtr<MediaKeySession> MediaKeySession::create(ExecutionContext * context, ContentDecryptionModule* cdm, WeakPtr<MediaKeys> keys)
62 { 62 {
63 RefPtrWillBeRawPtr<MediaKeySession> session(adoptRefCountedWillBeRefCountedG arbageCollected(new MediaKeySession(context, cdm, keys))); 63 RefPtrWillBeRawPtr<MediaKeySession> session(adoptRefWillBeRefCountedGarbageC ollected(new MediaKeySession(context, cdm, keys)));
64 session->suspendIfNeeded(); 64 session->suspendIfNeeded();
65 return session.release(); 65 return session.release();
66 } 66 }
67 67
68 MediaKeySession::MediaKeySession(ExecutionContext* context, ContentDecryptionMod ule* cdm, WeakPtr<MediaKeys> keys) 68 MediaKeySession::MediaKeySession(ExecutionContext* context, ContentDecryptionMod ule* cdm, WeakPtr<MediaKeys> keys)
69 : ActiveDOMObject(context) 69 : ActiveDOMObject(context)
70 , m_keySystem(keys->keySystem()) 70 , m_keySystem(keys->keySystem())
71 , m_asyncEventQueue(GenericEventQueue::create(this)) 71 , m_asyncEventQueue(GenericEventQueue::create(this))
72 , m_session(cdm->createSession(this)) 72 , m_session(cdm->createSession(this))
73 , m_keys(keys) 73 , m_keys(keys)
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 m_session.clear(); 262 m_session.clear();
263 m_isClosed = true; 263 m_isClosed = true;
264 264
265 if (m_actionTimer.isActive()) 265 if (m_actionTimer.isActive())
266 m_actionTimer.stop(); 266 m_actionTimer.stop();
267 m_pendingActions.clear(); 267 m_pendingActions.clear();
268 m_asyncEventQueue->close(); 268 m_asyncEventQueue->close();
269 } 269 }
270 270
271 } 271 }
OLDNEW
« no previous file with comments | « Source/heap/HeapTest.cpp ('k') | Source/modules/mediasource/MediaSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698