| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 return element.release(); | 47 return element.release(); |
| 48 } | 48 } |
| 49 | 49 |
| 50 LayoutObject* TextTrackContainer::createLayoutObject(const ComputedStyle&) | 50 LayoutObject* TextTrackContainer::createLayoutObject(const ComputedStyle&) |
| 51 { | 51 { |
| 52 return new LayoutTextTrackContainer(this); | 52 return new LayoutTextTrackContainer(this); |
| 53 } | 53 } |
| 54 | 54 |
| 55 void TextTrackContainer::updateDisplay(HTMLMediaElement& mediaElement, ExposingC
ontrols exposingControls) | 55 void TextTrackContainer::updateDisplay(HTMLMediaElement& mediaElement, ExposingC
ontrols exposingControls) |
| 56 { | 56 { |
| 57 if (!mediaElement.closedCaptionsVisible()) { | 57 if (!mediaElement.textTracksVisible()) { |
| 58 removeChildren(); | 58 removeChildren(); |
| 59 return; | 59 return; |
| 60 } | 60 } |
| 61 | 61 |
| 62 // http://dev.w3.org/html5/webvtt/#dfn-rules-for-updating-the-display-of-web
vtt-text-tracks | 62 // http://dev.w3.org/html5/webvtt/#dfn-rules-for-updating-the-display-of-web
vtt-text-tracks |
| 63 | 63 |
| 64 // 1. If the media element is an audio element, or is another playback | 64 // 1. If the media element is an audio element, or is another playback |
| 65 // mechanism with no rendering area, abort these steps. There is nothing to | 65 // mechanism with no rendering area, abort these steps. There is nothing to |
| 66 // render. | 66 // render. |
| 67 if (isHTMLAudioElement(mediaElement)) | 67 if (isHTMLAudioElement(mediaElement)) |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 | 121 |
| 122 cue->updateDisplay(*this); | 122 cue->updateDisplay(*this); |
| 123 cue->updatePastAndFutureNodes(movieTime); | 123 cue->updatePastAndFutureNodes(movieTime); |
| 124 } | 124 } |
| 125 | 125 |
| 126 // 11. Return output. | 126 // 11. Return output. |
| 127 // See the note for step 3 for why there is no output to return. | 127 // See the note for step 3 for why there is no output to return. |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace blink | 130 } // namespace blink |
| OLD | NEW |