| 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 3615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3626 { | 3626 { |
| 3627 if (!controls() || !inDocument()) { | 3627 if (!controls() || !inDocument()) { |
| 3628 if (hasMediaControls()) | 3628 if (hasMediaControls()) |
| 3629 mediaControls()->hide(); | 3629 mediaControls()->hide(); |
| 3630 return; | 3630 return; |
| 3631 } | 3631 } |
| 3632 | 3632 |
| 3633 if (!hasMediaControls() && !createMediaControls()) | 3633 if (!hasMediaControls() && !createMediaControls()) |
| 3634 return; | 3634 return; |
| 3635 | 3635 |
| 3636 mediaControls()->reset(); |
| 3636 mediaControls()->show(); | 3637 mediaControls()->show(); |
| 3637 } | 3638 } |
| 3638 | 3639 |
| 3639 void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assu
mption) | 3640 void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assu
mption) |
| 3640 { | 3641 { |
| 3641 ASSERT(m_textTracks); | 3642 ASSERT(m_textTracks); |
| 3642 WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay"); | 3643 WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay"); |
| 3643 | 3644 |
| 3644 if (m_processingPreferenceChange) | 3645 if (m_processingPreferenceChange) |
| 3645 return; | 3646 return; |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3929 { | 3930 { |
| 3930 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); | 3931 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); |
| 3931 } | 3932 } |
| 3932 | 3933 |
| 3933 bool HTMLMediaElement::isInteractiveContent() const | 3934 bool HTMLMediaElement::isInteractiveContent() const |
| 3934 { | 3935 { |
| 3935 return fastHasAttribute(controlsAttr); | 3936 return fastHasAttribute(controlsAttr); |
| 3936 } | 3937 } |
| 3937 | 3938 |
| 3938 } | 3939 } |
| OLD | NEW |