| 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 | 247 |
| 248 // We don't need the CDM anymore. Only destroyed after all related | 248 // We don't need the CDM anymore. Only destroyed after all related |
| 249 // ActiveDOMObjects have been stopped. | 249 // ActiveDOMObjects have been stopped. |
| 250 m_cdm.clear(); | 250 m_cdm.clear(); |
| 251 } | 251 } |
| 252 | 252 |
| 253 bool MediaKeys::hasPendingActivity() const | 253 bool MediaKeys::hasPendingActivity() const |
| 254 { | 254 { |
| 255 // Remain around if there are pending events. | 255 // Remain around if there are pending events. |
| 256 WTF_LOG(Media, "MediaKeys(%p)::hasPendingActivity %s%s%s", this, | 256 WTF_LOG(Media, "MediaKeys(%p)::hasPendingActivity %s%s%s", this, |
| 257 ActiveDOMObject::hasPendingActivity() ? " ActiveDOMObject::hasPendingAct
ivity()" : "", | 257 ScriptWrappable::hasPendingActivity() ? " ActiveDOMObject::hasPendingAct
ivity()" : "", |
| 258 !m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "", | 258 !m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "", |
| 259 m_reservedForMediaElement ? " m_reservedForMediaElement" : ""); | 259 m_reservedForMediaElement ? " m_reservedForMediaElement" : ""); |
| 260 | 260 |
| 261 return ActiveDOMObject::hasPendingActivity() || !m_pendingActions.isEmpty()
|| m_reservedForMediaElement; | 261 return ScriptWrappable::hasPendingActivity() || !m_pendingActions.isEmpty()
|| m_reservedForMediaElement; |
| 262 } | 262 } |
| 263 | 263 |
| 264 void MediaKeys::stop() | 264 void MediaKeys::stop() |
| 265 { | 265 { |
| 266 ActiveDOMObject::stop(); | 266 ActiveDOMObject::stop(); |
| 267 | 267 |
| 268 if (m_timer.isActive()) | 268 if (m_timer.isActive()) |
| 269 m_timer.stop(); | 269 m_timer.stop(); |
| 270 m_pendingActions.clear(); | 270 m_pendingActions.clear(); |
| 271 } | 271 } |
| 272 | 272 |
| 273 } // namespace blink | 273 } // namespace blink |
| OLD | NEW |