diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/encryptedmedia/media_keys.h')
| -rw-r--r-- | chromium/third_party/blink/renderer/modules/encryptedmedia/media_keys.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/modules/encryptedmedia/media_keys.h b/chromium/third_party/blink/renderer/modules/encryptedmedia/media_keys.h index 542e066ab44..ba2d0093ba8 100644 --- a/chromium/third_party/blink/renderer/modules/encryptedmedia/media_keys.h +++ b/chromium/third_party/blink/renderer/modules/encryptedmedia/media_keys.h @@ -33,7 +33,7 @@ #include "third_party/blink/public/platform/web_vector.h" #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise.h" -#include "third_party/blink/renderer/core/execution_context/context_lifecycle_observer.h" +#include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" #include "third_party/blink/renderer/core/typed_arrays/dom_array_piece.h" #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" #include "third_party/blink/renderer/platform/timer.h" @@ -54,7 +54,7 @@ class WebContentDecryptionModule; // The WebContentDecryptionModule has the same lifetime as this object. class MediaKeys : public ScriptWrappable, public ActiveScriptWrappable<MediaKeys>, - public ContextLifecycleObserver { + public ExecutionContextLifecycleObserver { USING_GARBAGE_COLLECTED_MIXIN(MediaKeys); DEFINE_WRAPPERTYPEINFO(); @@ -70,7 +70,8 @@ class MediaKeys : public ScriptWrappable, ExceptionState&); ScriptPromise setServerCertificate(ScriptState*, - const DOMArrayPiece& server_certificate); + const DOMArrayPiece& server_certificate, + ExceptionState& exception_state); ScriptPromise getStatusForPolicy(ScriptState*, const MediaKeysPolicy*); @@ -92,12 +93,12 @@ class MediaKeys : public ScriptWrappable, WebContentDecryptionModule* ContentDecryptionModule(); - void Trace(blink::Visitor*) override; + void Trace(Visitor*) override; - // ContextLifecycleObserver implementation. - // FIXME: This class could derive from ContextLifecycleObserver + // ExecutionContextLifecycleObserver implementation. + // FIXME: This class could derive from ExecutionContextLifecycleObserver // again (http://crbug.com/483722). - void ContextDestroyed(ExecutionContext*) override; + void ContextDestroyed() override; // ScriptWrappable implementation. bool HasPendingActivity() const final; |