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 3330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3341 { | 3341 { |
3342 if (!controls() || !inDocument()) { | 3342 if (!controls() || !inDocument()) { |
3343 if (hasMediaControls()) | 3343 if (hasMediaControls()) |
3344 mediaControls()->hide(); | 3344 mediaControls()->hide(); |
3345 return; | 3345 return; |
3346 } | 3346 } |
3347 | 3347 |
3348 if (!hasMediaControls() && !createMediaControls()) | 3348 if (!hasMediaControls() && !createMediaControls()) |
3349 return; | 3349 return; |
3350 | 3350 |
| 3351 mediaControls()->reset(); |
3351 mediaControls()->show(); | 3352 mediaControls()->show(); |
3352 } | 3353 } |
3353 | 3354 |
3354 void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assu
mption) | 3355 void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assu
mption) |
3355 { | 3356 { |
3356 ASSERT(m_textTracks); | 3357 ASSERT(m_textTracks); |
3357 WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay"); | 3358 WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay"); |
3358 | 3359 |
3359 if (m_processingPreferenceChange) | 3360 if (m_processingPreferenceChange) |
3360 return; | 3361 return; |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3641 { | 3642 { |
3642 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); | 3643 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); |
3643 } | 3644 } |
3644 | 3645 |
3645 bool HTMLMediaElement::isInteractiveContent() const | 3646 bool HTMLMediaElement::isInteractiveContent() const |
3646 { | 3647 { |
3647 return fastHasAttribute(controlsAttr); | 3648 return fastHasAttribute(controlsAttr); |
3648 } | 3649 } |
3649 | 3650 |
3650 } | 3651 } |
OLD | NEW |