| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 #if ENABLE(ASSERT) | 48 #if ENABLE(ASSERT) |
| 49 namespace { | 49 namespace { |
| 50 | 50 |
| 51 // The list of possible values for |sessionType| passed to createSession(). | 51 // The list of possible values for |sessionType| passed to createSession(). |
| 52 const char* kTemporary = "temporary"; | 52 const char* kTemporary = "temporary"; |
| 53 const char* kPersistent = "persistent"; | 53 const char* kPersistent = "persistent"; |
| 54 | 54 |
| 55 } // namespace | 55 } // namespace |
| 56 #endif | 56 #endif |
| 57 | 57 |
| 58 namespace WebCore { | 58 namespace blink { |
| 59 | 59 |
| 60 static bool isKeySystemSupportedWithContentType(const String& keySystem, const S
tring& contentType) | 60 static bool isKeySystemSupportedWithContentType(const String& keySystem, const S
tring& contentType) |
| 61 { | 61 { |
| 62 ASSERT(!keySystem.isEmpty()); | 62 ASSERT(!keySystem.isEmpty()); |
| 63 | 63 |
| 64 ContentType type(contentType); | 64 ContentType type(contentType); |
| 65 String codecs = type.parameter("codecs"); | 65 String codecs = type.parameter("codecs"); |
| 66 return MIMETypeRegistry::isSupportedEncryptedMediaMIMEType(keySystem, type.t
ype(), codecs); | 66 return MIMETypeRegistry::isSupportedEncryptedMediaMIMEType(keySystem, type.t
ype(), codecs); |
| 67 } | 67 } |
| 68 | 68 |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 | 274 |
| 275 void MediaKeys::contextDestroyed() | 275 void MediaKeys::contextDestroyed() |
| 276 { | 276 { |
| 277 ContextLifecycleObserver::contextDestroyed(); | 277 ContextLifecycleObserver::contextDestroyed(); |
| 278 | 278 |
| 279 // We don't need the CDM anymore. | 279 // We don't need the CDM anymore. |
| 280 m_cdm.clear(); | 280 m_cdm.clear(); |
| 281 } | 281 } |
| 282 | 282 |
| 283 } | 283 } |
| OLD | NEW |