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

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

Issue 463543002: Oilpan: Ensure that classes with virtual trace methods always have vtables for their left-most base… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 const String& keySystem() const { return m_keySystem; } 53 const String& keySystem() const { return m_keySystem; }
54 54
55 ScriptPromise createSession(ScriptState*, const String& initDataType, ArrayB uffer* initData, const String& sessionType); 55 ScriptPromise createSession(ScriptState*, const String& initDataType, ArrayB uffer* initData, const String& sessionType);
56 ScriptPromise createSession(ScriptState*, const String& initDataType, ArrayB ufferView* initData, const String& sessionType); 56 ScriptPromise createSession(ScriptState*, const String& initDataType, ArrayB ufferView* initData, const String& sessionType);
57 57
58 static bool isTypeSupported(const String& keySystem, const String& contentTy pe); 58 static bool isTypeSupported(const String& keySystem, const String& contentTy pe);
59 59
60 blink::WebContentDecryptionModule* contentDecryptionModule(); 60 blink::WebContentDecryptionModule* contentDecryptionModule();
61 61
62 void trace(Visitor*); 62 virtual void trace(Visitor*);
63 63
64 // ContextLifecycleObserver 64 // ContextLifecycleObserver
65 virtual void contextDestroyed() OVERRIDE; 65 virtual void contextDestroyed() OVERRIDE;
66 66
67 private: 67 private:
68 friend class MediaKeysInitializer; 68 friend class MediaKeysInitializer;
69 MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebC ontentDecryptionModule>); 69 MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebC ontentDecryptionModule>);
70 70
71 ScriptPromise createSessionInternal(ScriptState*, const String& initDataType , PassRefPtr<ArrayBuffer> initData, const String& sessionType); 71 ScriptPromise createSessionInternal(ScriptState*, const String& initDataType , PassRefPtr<ArrayBuffer> initData, const String& sessionType);
72 72
73 const String m_keySystem; 73 const String m_keySystem;
74 OwnPtr<blink::WebContentDecryptionModule> m_cdm; 74 OwnPtr<blink::WebContentDecryptionModule> m_cdm;
75 }; 75 };
76 76
77 } 77 }
78 78
79 #endif // MediaKeys_h 79 #endif // MediaKeys_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698