third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp - Issue 1712903002: Remove prefixed EME.

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix isRenewalMessage() in browser tests. Created 4 years, 10 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:

« no previous file with comments | « third_party/WebKit/Source/modules/encryptedmedia/MediaKeyMessageEvent.h ('k') | third_party/WebKit/Source/modules/mediasource/MediaSource.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 16 matching lines...) Expand all Loading...
27	27

28 #include "bindings/core/v8/DOMWrapperWorld.h"	28 #include "bindings/core/v8/DOMWrapperWorld.h"

29 #include "bindings/core/v8/ScriptPromise.h"	29 #include "bindings/core/v8/ScriptPromise.h"

30 #include "bindings/core/v8/ScriptPromiseResolver.h"	30 #include "bindings/core/v8/ScriptPromiseResolver.h"

31 #include "bindings/core/v8/ScriptState.h"	31 #include "bindings/core/v8/ScriptState.h"

32 #include "core/dom/DOMArrayBuffer.h"	32 #include "core/dom/DOMArrayBuffer.h"

33 #include "core/dom/DOMException.h"	33 #include "core/dom/DOMException.h"

34 #include "core/dom/ExceptionCode.h"	34 #include "core/dom/ExceptionCode.h"

35 #include "core/events/Event.h"	35 #include "core/events/Event.h"

36 #include "core/events/GenericEventQueue.h"	36 #include "core/events/GenericEventQueue.h"

37 #include "core/html/MediaKeyError.h"

38 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"	37 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"

39 #include "modules/encryptedmedia/EncryptedMediaUtils.h"	38 #include "modules/encryptedmedia/EncryptedMediaUtils.h"

40 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"	39 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"

41 #include "modules/encryptedmedia/MediaKeys.h"	40 #include "modules/encryptedmedia/MediaKeys.h"

42 #include "modules/encryptedmedia/SimpleContentDecryptionModuleResultPromise.h"	41 #include "modules/encryptedmedia/SimpleContentDecryptionModuleResultPromise.h"

43 #include "platform/ContentDecryptionModuleResult.h"	42 #include "platform/ContentDecryptionModuleResult.h"

44 #include "platform/ContentType.h"	43 #include "platform/ContentType.h"

45 #include "platform/Logging.h"	44 #include "platform/Logging.h"

46 #include "platform/Timer.h"	45 #include "platform/Timer.h"

47 #include "public/platform/WebContentDecryptionModule.h"	46 #include "public/platform/WebContentDecryptionModule.h"

(...skipping 876 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
924 visitor->trace(m_asyncEventQueue);	923 visitor->trace(m_asyncEventQueue);

925 visitor->trace(m_pendingActions);	924 visitor->trace(m_pendingActions);

926 visitor->trace(m_mediaKeys);	925 visitor->trace(m_mediaKeys);

927 visitor->trace(m_keyStatusesMap);	926 visitor->trace(m_keyStatusesMap);

928 visitor->trace(m_closedPromise);	927 visitor->trace(m_closedPromise);

929 RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession>::trace( visitor);	928 RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession>::trace( visitor);

930 ActiveDOMObject::trace(visitor);	929 ActiveDOMObject::trace(visitor);

931 }	930 }

932	931

933 } // namespace blink	932 } // namespace blink

OLD	NEW