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

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

Issue 212983012: Fix build when compiling with the clang plugin. (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/modules/device_orientation/DeviceOrientationController.h ('k') | no next file » | 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 protected: 75 protected:
76 MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebC ontentDecryptionModule>); 76 MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebC ontentDecryptionModule>);
77 void initializeNewSessionTimerFired(Timer<MediaKeys>*); 77 void initializeNewSessionTimerFired(Timer<MediaKeys>*);
78 78
79 HTMLMediaElement* m_mediaElement; 79 HTMLMediaElement* m_mediaElement;
80 const String m_keySystem; 80 const String m_keySystem;
81 OwnPtr<blink::WebContentDecryptionModule> m_cdm; 81 OwnPtr<blink::WebContentDecryptionModule> m_cdm;
82 82
83 // FIXME: Check whether |initData| can be changed by JS. Maybe we should not pass it as a pointer. 83 // FIXME: Check whether |initData| can be changed by JS. Maybe we should not pass it as a pointer.
84 struct InitializeNewSessionData { 84 struct InitializeNewSessionData {
85 ALLOW_ONLY_INLINE_ALLOCATION();
86 public:
85 InitializeNewSessionData(PassRefPtrWillBeRawPtr<MediaKeySession> session , const String& contentType, PassRefPtr<Uint8Array> initData) 87 InitializeNewSessionData(PassRefPtrWillBeRawPtr<MediaKeySession> session , const String& contentType, PassRefPtr<Uint8Array> initData)
86 : session(session) 88 : session(session)
87 , contentType(contentType) 89 , contentType(contentType)
88 , initData(initData) { } 90 , initData(initData) { }
89 91
90 void trace(Visitor*); 92 void trace(Visitor*);
91 93
92 RefPtrWillBeMember<MediaKeySession> session; 94 RefPtrWillBeMember<MediaKeySession> session;
93 String contentType; 95 String contentType;
94 RefPtr<Uint8Array> initData; 96 RefPtr<Uint8Array> initData;
95 }; 97 };
96 Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData; 98 Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData;
97 Timer<MediaKeys> m_initializeNewSessionTimer; 99 Timer<MediaKeys> m_initializeNewSessionTimer;
98 100
99 WeakPtrFactory<MediaKeys> m_weakFactory; 101 WeakPtrFactory<MediaKeys> m_weakFactory;
100 }; 102 };
101 103
102 } 104 }
103 105
104 #endif // MediaKeys_h 106 #endif // MediaKeys_h
OLDNEW
« no previous file with comments | « Source/modules/device_orientation/DeviceOrientationController.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698