| 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 22 matching lines...) Expand all Loading... |
| 33 #include "core/html/track/CueTimeline.h" | 33 #include "core/html/track/CueTimeline.h" |
| 34 #include "core/layout/LayoutTextTrackContainer.h" | 34 #include "core/layout/LayoutTextTrackContainer.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 TextTrackContainer::TextTrackContainer(Document& document) | 38 TextTrackContainer::TextTrackContainer(Document& document) |
| 39 : HTMLDivElement(document) | 39 : HTMLDivElement(document) |
| 40 { | 40 { |
| 41 } | 41 } |
| 42 | 42 |
| 43 PassRefPtrWillBeRawPtr<TextTrackContainer> TextTrackContainer::create(Document&
document) | 43 RawPtr<TextTrackContainer> TextTrackContainer::create(Document& document) |
| 44 { | 44 { |
| 45 RefPtrWillBeRawPtr<TextTrackContainer> element = adoptRefWillBeNoop(new Text
TrackContainer(document)); | 45 RawPtr<TextTrackContainer> element = new TextTrackContainer(document); |
| 46 element->setShadowPseudoId(AtomicString("-webkit-media-text-track-container"
, AtomicString::ConstructFromLiteral)); | 46 element->setShadowPseudoId(AtomicString("-webkit-media-text-track-container"
, AtomicString::ConstructFromLiteral)); |
| 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) |
| (...skipping 65 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 |