| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 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 3529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3540 m_processingPreferenceChange = true; | 3540 m_processingPreferenceChange = true; |
| 3541 markCaptionAndSubtitleTracksAsUnconfigured(); | 3541 markCaptionAndSubtitleTracksAsUnconfigured(); |
| 3542 m_processingPreferenceChange = false; | 3542 m_processingPreferenceChange = false; |
| 3543 | 3543 |
| 3544 updateTextTrackDisplay(); | 3544 updateTextTrackDisplay(); |
| 3545 } | 3545 } |
| 3546 } | 3546 } |
| 3547 | 3547 |
| 3548 unsigned HTMLMediaElement::webkitAudioDecodedByteCount() const | 3548 unsigned HTMLMediaElement::webkitAudioDecodedByteCount() const |
| 3549 { | 3549 { |
| 3550 UseCounter::count(document(), UseCounter::PrefixedAudioDecodedByteCount); | |
| 3551 if (!m_player) | 3550 if (!m_player) |
| 3552 return 0; | 3551 return 0; |
| 3553 return m_player->audioDecodedByteCount(); | 3552 return m_player->audioDecodedByteCount(); |
| 3554 } | 3553 } |
| 3555 | 3554 |
| 3556 unsigned HTMLMediaElement::webkitVideoDecodedByteCount() const | 3555 unsigned HTMLMediaElement::webkitVideoDecodedByteCount() const |
| 3557 { | 3556 { |
| 3558 UseCounter::count(document(), UseCounter::PrefixedVideoDecodedByteCount); | |
| 3559 if (!m_player) | 3557 if (!m_player) |
| 3560 return 0; | 3558 return 0; |
| 3561 return m_player->videoDecodedByteCount(); | 3559 return m_player->videoDecodedByteCount(); |
| 3562 } | 3560 } |
| 3563 | 3561 |
| 3564 bool HTMLMediaElement::isURLAttribute(const Attribute& attribute) const | 3562 bool HTMLMediaElement::isURLAttribute(const Attribute& attribute) const |
| 3565 { | 3563 { |
| 3566 return attribute.name() == srcAttr || HTMLElement::isURLAttribute(attribute)
; | 3564 return attribute.name() == srcAttr || HTMLElement::isURLAttribute(attribute)
; |
| 3567 } | 3565 } |
| 3568 | 3566 |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3888 { | 3886 { |
| 3889 scheduleLayerUpdate(); | 3887 scheduleLayerUpdate(); |
| 3890 } | 3888 } |
| 3891 | 3889 |
| 3892 bool HTMLMediaElement::isInteractiveContent() const | 3890 bool HTMLMediaElement::isInteractiveContent() const |
| 3893 { | 3891 { |
| 3894 return fastHasAttribute(controlsAttr); | 3892 return fastHasAttribute(controlsAttr); |
| 3895 } | 3893 } |
| 3896 | 3894 |
| 3897 } | 3895 } |
| OLD | NEW |