| 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. |
| (...skipping 11 matching lines...) Expand all Loading... |
| 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/rendering/RenderMediaControlElements.h" | 30 #include "core/rendering/RenderMediaControlElements.h" |
| 31 | 31 |
| 32 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h" |
| 32 #include "core/rendering/LayoutRectRecorder.h" | 33 #include "core/rendering/LayoutRectRecorder.h" |
| 33 #include "core/rendering/RenderView.h" | 34 #include "core/rendering/RenderView.h" |
| 34 | 35 |
| 35 namespace WebCore { | 36 namespace WebCore { |
| 36 | 37 |
| 37 RenderTextTrackContainerElement::RenderTextTrackContainerElement(Element* elemen
t) | 38 RenderTextTrackContainerElement::RenderTextTrackContainerElement(Element* elemen
t) |
| 38 : RenderBlockFlow(element) | 39 : RenderBlockFlow(element) |
| 39 { | 40 { |
| 40 } | 41 } |
| 41 | 42 |
| 42 void RenderTextTrackContainerElement::layout() | 43 void RenderTextTrackContainerElement::layout() |
| 43 { | 44 { |
| 44 LayoutRectRecorder recorder(*this); | 45 LayoutRectRecorder recorder(*this); |
| 45 RenderBlock::layout(); | 46 RenderBlock::layout(); |
| 46 if (style()->display() == NONE) | 47 if (style()->display() == NONE) |
| 47 return; | 48 return; |
| 48 | 49 |
| 49 ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer); | 50 ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer); |
| 50 | 51 |
| 52 DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycl
e()); |
| 53 |
| 51 LayoutStateDisabler layoutStateDisabler(view()); | 54 LayoutStateDisabler layoutStateDisabler(view()); |
| 52 static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes(); | 55 static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes(); |
| 53 } | 56 } |
| 54 | 57 |
| 55 | 58 |
| 56 } // namespace WebCore | 59 } // namespace WebCore |
| 57 | 60 |
| OLD | NEW |