Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderVideo.h

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderVideo.h b/src/third_party/WebKit/Source/core/rendering/RenderVideo.h
index db9e19b..5b4792f 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderVideo.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderVideo.h
@@ -32,7 +32,7 @@ namespace blink {
 
 class HTMLVideoElement;
 
-class RenderVideo FINAL : public RenderMedia {
+class RenderVideo final : public RenderMedia {
 public:
     RenderVideo(HTMLVideoElement*);
     virtual ~RenderVideo();
@@ -48,32 +48,32 @@ public:
     bool acceleratedRenderingInUse();
 
 private:
-    virtual void updateFromElement() OVERRIDE;
+    virtual void updateFromElement() override;
 
-    virtual void intrinsicSizeChanged() OVERRIDE;
+    virtual void intrinsicSizeChanged() override;
     LayoutSize calculateIntrinsicSize();
     void updateIntrinsicSize();
 
-    virtual void imageChanged(WrappedImagePtr, const IntRect*) OVERRIDE;
+    virtual void imageChanged(WrappedImagePtr, const IntRect*) override;
 
-    virtual const char* renderName() const OVERRIDE { return "RenderVideo"; }
+    virtual const char* renderName() const override { return "RenderVideo"; }
 
-    virtual bool isVideo() const OVERRIDE { return true; }
+    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectVideo || RenderMedia::isOfType(type); }
 
-    virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE;
+    virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override;
 
-    virtual void layout() OVERRIDE;
+    virtual void layout() override;
 
-    virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred  = ComputeActual) const OVERRIDE;
-    virtual LayoutUnit computeReplacedLogicalHeight() const OVERRIDE;
-    virtual LayoutUnit minimumReplacedHeight() const OVERRIDE;
+    virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred  = ComputeActual) const override;
+    virtual LayoutUnit computeReplacedLogicalHeight() const override;
+    virtual LayoutUnit minimumReplacedHeight() const override;
 
-    virtual LayoutUnit offsetLeft() const OVERRIDE;
-    virtual LayoutUnit offsetTop() const OVERRIDE;
-    virtual LayoutUnit offsetWidth() const OVERRIDE;
-    virtual LayoutUnit offsetHeight() const OVERRIDE;
+    virtual LayoutUnit offsetLeft() const override;
+    virtual LayoutUnit offsetTop() const override;
+    virtual LayoutUnit offsetWidth() const override;
+    virtual LayoutUnit offsetHeight() const override;
 
-    virtual CompositingReasons additionalCompositingReasons() const OVERRIDE;
+    virtual CompositingReasons additionalCompositingReasons() const override;
 
     void updatePlayer();