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

Side by Side Diff: Source/modules/encryptedmedia/MediaKeys.h

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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 namespace WebCore { 48 namespace WebCore {
49 49
50 class ContentDecryptionModule; 50 class ContentDecryptionModule;
51 class HTMLMediaElement; 51 class HTMLMediaElement;
52 class ExceptionState; 52 class ExceptionState;
53 53
54 // References are held by JS and HTMLMediaElement. 54 // References are held by JS and HTMLMediaElement.
55 // The ContentDecryptionModule has the same lifetime as this object. 55 // The ContentDecryptionModule has the same lifetime as this object.
56 class MediaKeys : public RefCountedWillBeGarbageCollectedFinalized<MediaKeys>, p ublic ContextLifecycleObserver, public ScriptWrappable { 56 class MediaKeys : public RefCountedWillBeGarbageCollectedFinalized<MediaKeys>, p ublic ContextLifecycleObserver, public ScriptWrappable {
57 DECLARE_GC_INFO;
58 public: 57 public:
59 static PassRefPtrWillBeRawPtr<MediaKeys> create(ExecutionContext*, const Str ing& keySystem, ExceptionState&); 58 static PassRefPtrWillBeRawPtr<MediaKeys> create(ExecutionContext*, const Str ing& keySystem, ExceptionState&);
60 ~MediaKeys(); 59 ~MediaKeys();
61 60
62 PassRefPtrWillBeRawPtr<MediaKeySession> createSession(ExecutionContext*, con st String& contentType, Uint8Array* initData, ExceptionState&); 61 PassRefPtrWillBeRawPtr<MediaKeySession> createSession(ExecutionContext*, con st String& contentType, Uint8Array* initData, ExceptionState&);
63 62
64 const String& keySystem() const { return m_keySystem; } 63 const String& keySystem() const { return m_keySystem; }
65 64
66 void setMediaElement(HTMLMediaElement*); 65 void setMediaElement(HTMLMediaElement*);
67 66
(...skipping 27 matching lines...) Expand all
95 }; 94 };
96 Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData; 95 Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData;
97 Timer<MediaKeys> m_initializeNewSessionTimer; 96 Timer<MediaKeys> m_initializeNewSessionTimer;
98 97
99 WeakPtrFactory<MediaKeys> m_weakFactory; 98 WeakPtrFactory<MediaKeys> m_weakFactory;
100 }; 99 };
101 100
102 } 101 }
103 102
104 #endif // MediaKeys_h 103 #endif // MediaKeys_h
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.cpp ('k') | Source/modules/encryptedmedia/MediaKeys.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698