Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / graphics / Image.cpp

diff --git a/src/third_party/WebKit/Source/platform/graphics/Image.cpp b/src/third_party/WebKit/Source/platform/graphics/Image.cpp
index 55a8ac4..2ee59a0 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/Image.cpp
+++ b/src/third_party/WebKit/Source/platform/graphics/Image.cpp
@@ -44,7 +44,7 @@
 
 #include <math.h>
 
-namespace WebCore {
+namespace blink {
 
 Image::Image(ImageObserver* observer)
     : m_imageObserver(observer)
@@ -64,7 +64,7 @@ Image* Image::nullImage()
 
 PassRefPtr<Image> Image::loadPlatformResource(const char *name)
 {
-    const blink::WebData& resource = blink::Platform::current()->loadResource(name);
+    const WebData& resource = Platform::current()->loadResource(name);
     if (resource.isEmpty())
         return Image::nullImage();
 
@@ -116,12 +116,12 @@ FloatRect Image::adjustForNegativeSize(const FloatRect& rect)
     return norm;
 }
 
-void Image::draw(GraphicsContext* ctx, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator op, blink::WebBlendMode blendMode, RespectImageOrientationEnum)
+void Image::draw(GraphicsContext* ctx, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator op, WebBlendMode blendMode, RespectImageOrientationEnum)
 {
     draw(ctx, dstRect, srcRect, op, blendMode);
 }
 
-void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, CompositeOperator op, blink::WebBlendMode blendMode, const IntSize& repeatSpacing)
+void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, CompositeOperator op, WebBlendMode blendMode, const IntSize& repeatSpacing)
 {
     if (mayFillWithSolidColor()) {
         fillWithSolidColor(ctxt, destRect, solidColor(), op);
@@ -223,7 +223,7 @@ void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& dstRect, const Flo
 }
 
 void Image::drawPattern(GraphicsContext* context, const FloatRect& floatSrcRect, const FloatSize& scale,
-    const FloatPoint& phase, CompositeOperator compositeOp, const FloatRect& destRect, blink::WebBlendMode blendMode, const IntSize& repeatSpacing)
+    const FloatPoint& phase, CompositeOperator compositeOp, const FloatRect& destRect, WebBlendMode blendMode, const IntSize& repeatSpacing)
 {
     TRACE_EVENT0("skia", "Image::drawPattern");
     if (RefPtr<NativeImageSkia> bitmap = nativeImageForCurrentFrame())
@@ -237,4 +237,11 @@ void Image::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsic
     intrinsicHeight = Length(intrinsicRatio.height(), Fixed);
 }
 
+PassRefPtr<Image> Image::imageForDefaultFrame()
+{
+    RefPtr<Image> image(this);
+
+    return image.release();
 }
+
+} // namespace blink