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

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

Issue 331803005: Oilpan: move MediaKeyError to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void actionTimerFired(Timer<MediaKeySession>*); 116 void actionTimerFired(Timer<MediaKeySession>*);
117 117
118 // blink::WebContentDecryptionModuleSession::Client 118 // blink::WebContentDecryptionModuleSession::Client
119 virtual void message(const unsigned char* message, size_t messageLength, con st blink::WebURL& destinationURL) OVERRIDE; 119 virtual void message(const unsigned char* message, size_t messageLength, con st blink::WebURL& destinationURL) OVERRIDE;
120 virtual void ready() OVERRIDE; 120 virtual void ready() OVERRIDE;
121 virtual void close() OVERRIDE; 121 virtual void close() OVERRIDE;
122 virtual void error(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE; 122 virtual void error(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
123 virtual void error(blink::WebContentDecryptionModuleException, unsigned long systemCode, const blink::WebString& errorMessage) OVERRIDE; 123 virtual void error(blink::WebContentDecryptionModuleException, unsigned long systemCode, const blink::WebString& errorMessage) OVERRIDE;
124 124
125 String m_keySystem; 125 String m_keySystem;
126 RefPtr<MediaKeyError> m_error; 126 RefPtrWillBeMember<MediaKeyError> m_error;
127 OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue; 127 OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
128 OwnPtr<blink::WebContentDecryptionModuleSession> m_session; 128 OwnPtr<blink::WebContentDecryptionModuleSession> m_session;
129 129
130 // Used to determine if MediaKeys is still active. 130 // Used to determine if MediaKeys is still active.
131 WeakMember<MediaKeys> m_keys; 131 WeakMember<MediaKeys> m_keys;
132 132
133 // Is the CDM finished with this session? 133 // Is the CDM finished with this session?
134 bool m_isClosed; 134 bool m_isClosed;
135 135
136 Deque<OwnPtr<PendingAction> > m_pendingActions; 136 Deque<OwnPtr<PendingAction> > m_pendingActions;
137 Timer<MediaKeySession> m_actionTimer; 137 Timer<MediaKeySession> m_actionTimer;
138 }; 138 };
139 139
140 } 140 }
141 141
142 #endif // MediaKeySession_h 142 #endif // MediaKeySession_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698