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

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

Issue 257503003: Oilpan: Enable Oilpan by default in modules/encryptedmedia (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef HTMLMediaElementEncryptedMedia_h 5 #ifndef HTMLMediaElementEncryptedMedia_h
6 #define HTMLMediaElementEncryptedMedia_h 6 #define HTMLMediaElementEncryptedMedia_h
7 7
8 #include "modules/EventTargetModules.h" 8 #include "modules/EventTargetModules.h"
9 #include "platform/Supplementable.h" 9 #include "platform/Supplementable.h"
10 #include "platform/graphics/media/MediaPlayer.h" 10 #include "platform/graphics/media/MediaPlayer.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 // check (and set if necessary) the encrypted media extensions (EME) mode 70 // check (and set if necessary) the encrypted media extensions (EME) mode
71 // (v0.1b or WD). Returns whether the mode is allowed and successfully set. 71 // (v0.1b or WD). Returns whether the mode is allowed and successfully set.
72 bool setEmeMode(EmeMode, ExceptionState&); 72 bool setEmeMode(EmeMode, ExceptionState&);
73 73
74 blink::WebContentDecryptionModule* contentDecryptionModule(); 74 blink::WebContentDecryptionModule* contentDecryptionModule();
75 void setMediaKeysInternal(HTMLMediaElement&, MediaKeys*); 75 void setMediaKeysInternal(HTMLMediaElement&, MediaKeys*);
76 76
77 EmeMode m_emeMode; 77 EmeMode m_emeMode;
78 78
79 RefPtrWillBeMember<MediaKeys> m_mediaKeys; 79 PersistentWillBeMember<MediaKeys> m_mediaKeys;
80 }; 80 };
81 81
82 } 82 }
83 83
84 #endif 84 #endif
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698