OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Victor Carbune (victor@rosedu.org) | 2 * Copyright (C) 2012 Victor Carbune (victor@rosedu.org) |
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 |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 | |
28 #include "core/rendering/RenderTextTrackCue.h" | 27 #include "core/rendering/RenderTextTrackCue.h" |
29 | 28 |
29 #include "RuntimeEnabledFeatures.h" | |
acolwell GONE FROM CHROMIUM
2013/10/08 22:09:06
nit: not needed anymore
vcarbune.chromium
2013/10/12 22:33:55
Done.
| |
30 #include "core/html/track/TextTrackCue.h" | 30 #include "core/html/track/TextTrackCue.h" |
31 #include "core/rendering/RenderView.h" | 31 #include "core/rendering/RenderView.h" |
32 | 32 |
33 namespace WebCore { | 33 namespace WebCore { |
34 | 34 |
35 RenderTextTrackCue::RenderTextTrackCue(TextTrackCueBox* element) | 35 RenderTextTrackCue::RenderTextTrackCue(TextTrackCueBox* element) |
36 : RenderBlockFlow(element) | 36 : RenderBlockFlow(element) |
37 , m_cue(element->getCue()) | 37 , m_cue(element->getCue()) |
38 { | 38 { |
39 } | 39 } |
40 | 40 |
41 void RenderTextTrackCue::layout() | 41 void RenderTextTrackCue::layout() |
42 { | 42 { |
43 RenderBlockFlow::layout(); | 43 RenderBlockFlow::layout(); |
44 | 44 |
45 #if ENABLE(WEBVTT_REGIONS) | |
46 // If WebVTT Regions are used, the regular WebVTT layout algorithm is no | 45 // If WebVTT Regions are used, the regular WebVTT layout algorithm is no |
47 // longer necessary, since cues having the region parameter set do not have | 46 // longer necessary, since cues having the region parameter set do not have |
48 // any positioning parameters. Also, in this case, the regions themselves | 47 // any positioning parameters. Also, in this case, the regions themselves |
49 // have positioning information. | 48 // have positioning information. |
50 if (!m_cue->regionId().isEmpty()) | 49 if (!m_cue->regionId().isEmpty()) |
51 return; | 50 return; |
52 #endif | |
53 | 51 |
54 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo rm() || hasReflection() || style()->isFlippedBlocksWritingMode()); | 52 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo rm() || hasReflection() || style()->isFlippedBlocksWritingMode()); |
55 | 53 |
56 if (m_cue->cueType() == TextTrackCue::WebVTT) { | 54 if (m_cue->cueType() == TextTrackCue::WebVTT) { |
57 if (m_cue->snapToLines()) | 55 if (m_cue->snapToLines()) |
58 repositionCueSnapToLinesSet(); | 56 repositionCueSnapToLinesSet(); |
59 else | 57 else |
60 repositionCueSnapToLinesNotSet(); | 58 repositionCueSnapToLinesNotSet(); |
61 } | 59 } |
62 | 60 |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
264 } | 262 } |
265 } | 263 } |
266 | 264 |
267 void RenderTextTrackCue::repositionCueSnapToLinesNotSet() | 265 void RenderTextTrackCue::repositionCueSnapToLinesNotSet() |
268 { | 266 { |
269 // FIXME: Implement overlapping detection when snap-to-lines is not set. htt p://wkb.ug/84296 | 267 // FIXME: Implement overlapping detection when snap-to-lines is not set. htt p://wkb.ug/84296 |
270 } | 268 } |
271 | 269 |
272 } // namespace WebCore | 270 } // namespace WebCore |
273 | 271 |
OLD | NEW |