webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 8 insertions, 11 deletions

diff --git a/Source/WebCore/rendering/RenderMediaControlElements.h b/Source/WebCore/rendering/RenderMediaControlElements.h
index 86d2778f9..f7545407e 100644
--- a/Source/WebCore/rendering/RenderMediaControlElements.h
+++ b/Source/WebCore/rendering/RenderMediaControlElements.h
@@ -25,8 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RenderMediaControlElements_h
-#define RenderMediaControlElements_h
+#pragma once
 
 #if ENABLE(VIDEO)
 
@@ -38,20 +37,21 @@ namespace WebCore {
 
 class RenderMediaVolumeSliderContainer final : public RenderBlockFlow {
 public:
-    RenderMediaVolumeSliderContainer(Element&, PassRef<RenderStyle>);
+    RenderMediaVolumeSliderContainer(Element&, RenderStyle&&);
 
 private:
-    virtual void layout();
+    void layout() override;
 };
 
 // ----------------------------
 
 class RenderMediaControlTimelineContainer final : public RenderFlexibleBox {
 public:
-    RenderMediaControlTimelineContainer(Element&, PassRef<RenderStyle>);
+    RenderMediaControlTimelineContainer(Element&, RenderStyle&&);
 
 private:
-    virtual void layout();
+    void layout() override;
+    bool isFlexibleBoxImpl() const override { return true; }
 };
 
 // ----------------------------
@@ -60,10 +60,10 @@ private:
 
 class RenderTextTrackContainerElement final : public RenderBlockFlow {
 public:
-    RenderTextTrackContainerElement(Element&, PassRef<RenderStyle>);
+    RenderTextTrackContainerElement(Element&, RenderStyle&&);
 
 private:
-    virtual void layout();
+    void layout() override;
 };
 
 #endif // ENABLE(VIDEO_TRACK)
@@ -71,6 +71,3 @@ private:
 } // namespace WebCore
 
 #endif // ENABLE(VIDEO)
-
-#endif // RenderMediaControlElements_h
-