Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.h b/src/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.h
index 9fd3c97..a7c8c49 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.h
@@ -31,7 +31,7 @@
 #include "core/rendering/style/StyleImage.h"
 #include "platform/geometry/LayoutSize.h"
 
-namespace WebCore {
+namespace blink {
 
 class ImageResource;
 class CSSImageSetValue;
@@ -56,7 +56,7 @@ public:
 
     void clearImageSetValue() { m_imageSetValue = 0; }
 
-    virtual bool canRender(const RenderObject*, float multiplier) const OVERRIDE;
+    virtual bool canRender(const RenderObject&, float multiplier) const OVERRIDE;
     virtual bool isLoaded() const OVERRIDE;
     virtual bool errorOccurred() const OVERRIDE;
     virtual LayoutSize imageSize(const RenderObject*, float multiplier) const OVERRIDE;
@@ -87,6 +87,6 @@ private:
 
 DEFINE_STYLE_IMAGE_TYPE_CASTS(StyleFetchedImageSet, isImageResourceSet());
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // StyleFetchedImageSet_h