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. | 3 * Copyright (C) 2012 Google Inc. |
4 * All rights reserved. | 4 * All rights reserved. |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
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. |
11 * 2. Redistributions in binary form must reproduce the above copyright | 11 * 2. Redistributions in binary form must reproduce the above copyright |
12 * notice, this list of conditions and the following disclaimer in the | 12 * notice, this list of conditions and the following disclaimer in the |
13 * documentation and/or other materials provided with the distribution. | 13 * documentation and/or other materials provided with the distribution. |
14 * | 14 * |
15 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 15 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #include "config.h" | 28 #include "config.h" |
29 | 29 |
30 #include "core/layout/LayoutTextTrackContainerElement.h" | 30 #include "core/layout/LayoutTextTrackContainer.h" |
31 | 31 |
32 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h" | 32 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h" |
33 #include "core/html/shadow/MediaControlElementTypes.h" | |
philipj_slow
2015/02/26 09:51:52
OK, this is ugly. Should I replace this with a sim
fs
2015/02/26 12:30:52
I get the feeling that could just use the layout t
rune
2015/02/26 13:17:15
I don't understand this comment about an include f
philipj_slow
2015/02/27 07:13:52
Do you mean the CueDisplayContext idea? Yeah, what
| |
33 #include "core/layout/LayoutView.h" | 34 #include "core/layout/LayoutView.h" |
34 | 35 |
35 namespace blink { | 36 namespace blink { |
36 | 37 |
37 LayoutTextTrackContainerElement::LayoutTextTrackContainerElement(Element* elemen t) | 38 LayoutTextTrackContainer::LayoutTextTrackContainer(Element* element) |
38 : RenderBlockFlow(element) | 39 : RenderBlockFlow(element) |
39 { | 40 { |
40 } | 41 } |
41 | 42 |
42 void LayoutTextTrackContainerElement::layout() | 43 void LayoutTextTrackContainer::layout() |
43 { | 44 { |
44 RenderBlockFlow::layout(); | 45 RenderBlockFlow::layout(); |
45 if (style()->display() == NONE) | 46 if (style()->display() == NONE) |
philipj_slow
2015/02/26 09:51:52
Rune, is this even possible? I thought that Layout
rune
2015/02/26 13:17:15
This shouldn't happen as long as the renderer is c
| |
46 return; | 47 return; |
47 | 48 |
48 ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer); | 49 HTMLMediaElement* mediaElement = toParentMediaElement(node()); |
50 if (!mediaElement) | |
51 return; | |
49 | 52 |
50 DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycl e()); | 53 DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycl e()); |
51 | 54 |
52 static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes(); | 55 toTextTrackContainer(node())->updateSizes(*mediaElement); |
53 } | 56 } |
54 | 57 |
55 } // namespace blink | 58 } // namespace blink |
OLD | NEW |