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

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

Issue 169293002: Oilpan: Remove GC_INFO_{DEFINE,DECLARE} macros (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixheaptest Created 6 years, 10 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 20 matching lines...) Expand all
31 #include "core/dom/ExceptionCode.h" 31 #include "core/dom/ExceptionCode.h"
32 #include "core/events/GenericEventQueue.h" 32 #include "core/events/GenericEventQueue.h"
33 #include "core/html/MediaKeyError.h" 33 #include "core/html/MediaKeyError.h"
34 #include "modules/encryptedmedia/MediaKeyMessageEvent.h" 34 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"
35 #include "modules/encryptedmedia/MediaKeys.h" 35 #include "modules/encryptedmedia/MediaKeys.h"
36 #include "platform/Logging.h" 36 #include "platform/Logging.h"
37 #include "platform/drm/ContentDecryptionModule.h" 37 #include "platform/drm/ContentDecryptionModule.h"
38 38
39 namespace WebCore { 39 namespace WebCore {
40 40
41 DEFINE_GC_INFO(MediaKeySession);
42
43 PassOwnPtr<MediaKeySession::PendingAction> MediaKeySession::PendingAction::Creat ePendingUpdate(PassRefPtr<Uint8Array> data) 41 PassOwnPtr<MediaKeySession::PendingAction> MediaKeySession::PendingAction::Creat ePendingUpdate(PassRefPtr<Uint8Array> data)
44 { 42 {
45 return adoptPtr(new PendingAction(Update, data)); 43 return adoptPtr(new PendingAction(Update, data));
46 } 44 }
47 45
48 PassOwnPtr<MediaKeySession::PendingAction> MediaKeySession::PendingAction::Creat ePendingRelease() 46 PassOwnPtr<MediaKeySession::PendingAction> MediaKeySession::PendingAction::Creat ePendingRelease()
49 { 47 {
50 return adoptPtr(new PendingAction(Release, PassRefPtr<Uint8Array>())); 48 return adoptPtr(new PendingAction(Release, PassRefPtr<Uint8Array>()));
51 } 49 }
52 50
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 m_session.clear(); 262 m_session.clear();
265 m_isClosed = true; 263 m_isClosed = true;
266 264
267 if (m_actionTimer.isActive()) 265 if (m_actionTimer.isActive())
268 m_actionTimer.stop(); 266 m_actionTimer.stop();
269 m_pendingActions.clear(); 267 m_pendingActions.clear();
270 m_asyncEventQueue->close(); 268 m_asyncEventQueue->close();
271 } 269 }
272 270
273 } 271 }
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.h ('k') | Source/modules/encryptedmedia/MediaKeys.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698