Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: Source/core/rendering/RenderTextTrackCue.cpp

Issue 25798003: Enable WebVTT regions for runtime testing, updated tests and minor fixes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/page/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
30 #include "core/html/track/TextTrackCue.h" 29 #include "core/html/track/TextTrackCue.h"
31 #include "core/rendering/RenderView.h" 30 #include "core/rendering/RenderView.h"
32 31
33 namespace WebCore { 32 namespace WebCore {
34 33
35 RenderTextTrackCue::RenderTextTrackCue(TextTrackCueBox* element) 34 RenderTextTrackCue::RenderTextTrackCue(TextTrackCueBox* element)
36 : RenderBlockFlow(element) 35 : RenderBlockFlow(element)
37 , m_cue(element->getCue()) 36 , m_cue(element->getCue())
38 { 37 {
39 } 38 }
40 39
41 void RenderTextTrackCue::layout() 40 void RenderTextTrackCue::layout()
42 { 41 {
43 RenderBlockFlow::layout(); 42 RenderBlockFlow::layout();
44 43
45 #if ENABLE(WEBVTT_REGIONS)
46 // If WebVTT Regions are used, the regular WebVTT layout algorithm is no 44 // 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 45 // longer necessary, since cues having the region parameter set do not have
48 // any positioning parameters. Also, in this case, the regions themselves 46 // any positioning parameters. Also, in this case, the regions themselves
49 // have positioning information. 47 // have positioning information.
50 if (!m_cue->regionId().isEmpty()) 48 if (!m_cue->regionId().isEmpty())
51 return; 49 return;
52 #endif
53 50
54 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo rm() || hasReflection() || style()->isFlippedBlocksWritingMode()); 51 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo rm() || hasReflection() || style()->isFlippedBlocksWritingMode());
55 52
56 if (m_cue->cueType() == TextTrackCue::WebVTT) { 53 if (m_cue->cueType() == TextTrackCue::WebVTT) {
57 if (m_cue->snapToLines()) 54 if (m_cue->snapToLines())
58 repositionCueSnapToLinesSet(); 55 repositionCueSnapToLinesSet();
59 else 56 else
60 repositionCueSnapToLinesNotSet(); 57 repositionCueSnapToLinesNotSet();
61 } 58 }
62 59
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 } 261 }
265 } 262 }
266 263
267 void RenderTextTrackCue::repositionCueSnapToLinesNotSet() 264 void RenderTextTrackCue::repositionCueSnapToLinesNotSet()
268 { 265 {
269 // FIXME: Implement overlapping detection when snap-to-lines is not set. htt p://wkb.ug/84296 266 // FIXME: Implement overlapping detection when snap-to-lines is not set. htt p://wkb.ug/84296
270 } 267 }
271 268
272 } // namespace WebCore 269 } // namespace WebCore
273 270
OLDNEW
« no previous file with comments | « Source/core/page/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698