Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderMediaControlElements.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderMediaControlElements.cpp b/src/third_party/WebKit/Source/core/rendering/RenderMediaControlElements.cpp
index da2babc..e332416 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderMediaControlElements.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderMediaControlElements.cpp
@@ -29,6 +29,7 @@
 
 #include "core/rendering/RenderMediaControlElements.h"
 
+#include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h"
 #include "core/rendering/LayoutRectRecorder.h"
 #include "core/rendering/RenderView.h"
 
@@ -42,16 +43,16 @@ RenderTextTrackContainerElement::RenderTextTrackContainerElement(Element* elemen
 void RenderTextTrackContainerElement::layout()
 {
     LayoutRectRecorder recorder(*this);
-    RenderBlock::layout();
+    RenderBlockFlow::layout();
     if (style()->display() == NONE)
         return;
 
     ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer);
 
+    DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycle());
+
     LayoutStateDisabler layoutStateDisabler(view());
     static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes();
 }
 
-
 } // namespace WebCore
-