Upstream version 9.38.198.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 405f99c..6b6e2b3 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderVideo.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderVideo.h
@@ -28,7 +28,7 @@
 
 #include "core/rendering/RenderMedia.h"
 
-namespace WebCore {
+namespace blink {
 
 class HTMLVideoElement;
 
@@ -72,7 +72,7 @@ private:
     virtual LayoutUnit offsetWidth() const OVERRIDE;
     virtual LayoutUnit offsetHeight() const OVERRIDE;
 
-    virtual CompositingReasons additionalCompositingReasons(CompositingTriggerFlags) const OVERRIDE;
+    virtual CompositingReasons additionalCompositingReasons() const OVERRIDE;
 
     void updatePlayer();
 
@@ -83,6 +83,6 @@ private:
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderVideo, isVideo());
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // RenderVideo_h