| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 // 4. Add the new object to an internal list of session objects. | 111 // 4. Add the new object to an internal list of session objects. |
| 112 m_sessions.append(session); | 112 m_sessions.append(session); |
| 113 | 113 |
| 114 // 5. Schedule a task to generate a key request, providing type, initData, a
nd the new object. | 114 // 5. Schedule a task to generate a key request, providing type, initData, a
nd the new object. |
| 115 session->generateKeyRequest(type, initData); | 115 session->generateKeyRequest(type, initData); |
| 116 | 116 |
| 117 // 6. Return the new object to the caller. | 117 // 6. Return the new object to the caller. |
| 118 return session; | 118 return session; |
| 119 } | 119 } |
| 120 | 120 |
| 121 void MediaKeys::setMediaElement(HTMLMediaElement* element) | 121 void MediaKeys::setMediaElement(const Handle<HTMLMediaElement>& element) |
| 122 { | 122 { |
| 123 m_mediaElement = element; | 123 m_mediaElement = element.raw(); |
| 124 } | 124 } |
| 125 | 125 |
| 126 MediaPlayer* MediaKeys::cdmMediaPlayer(const CDM*) const | 126 MediaPlayer* MediaKeys::cdmMediaPlayer(const CDM*) const |
| 127 { | 127 { |
| 128 if (m_mediaElement) | 128 if (m_mediaElement) |
| 129 return m_mediaElement->player(); | 129 return m_mediaElement->player(); |
| 130 return 0; | 130 return 0; |
| 131 } | 131 } |
| 132 | 132 |
| 133 } | 133 } |
| 134 | 134 |
| 135 #endif | 135 #endif |
| OLD | NEW |