Simplify createShapeForImage handling of image pointers

Source/core/rendering/shapes/ShapeOutsideInfo.cpp

Index: Source/core/rendering/shapes/ShapeOutsideInfo.cpp
diff --git a/Source/core/rendering/shapes/ShapeOutsideInfo.cpp b/Source/core/rendering/shapes/ShapeOutsideInfo.cpp
index db35731548a0ab993b20615569bb49a7d9c2de1a..216d3091acf641893ed3cf0fdf3d7f1bf93413de 100644
--- a/Source/core/rendering/shapes/ShapeOutsideInfo.cpp
+++ b/Source/core/rendering/shapes/ShapeOutsideInfo.cpp
@@ -114,17 +114,10 @@ PassOwnPtr<Shape> ShapeOutsideInfo::createShapeForImage(StyleImage* styleImage,
         ? toRenderImage(&m_renderer)->replacedContentRect()
         : LayoutRect(LayoutPoint(), imageSize);
 
-    Image* image = 0;
-    RefPtr<Image> generatedImage;
-
-    if (styleImage->isImageResource() || styleImage->isImageResourceSet()) {
-        image = styleImage->cachedImage()->imageForRenderer(&m_renderer);
-    } else if (styleImage->isGeneratedImage()) {
-        generatedImage = styleImage->image(const_cast<RenderBox*>(&m_renderer), imageSize);
-        image = generatedImage.get();
-    }
+    ASSERT(!styleImage->isPendingImage());
+    RefPtr<Image> image = styleImage->image(const_cast<RenderBox*>(&m_renderer), imageSize);
 
-    return Shape::createRasterShape(image, shapeImageThreshold, imageRect, marginRect, writingMode, margin);
+    return Shape::createRasterShape(image.get(), shapeImageThreshold, imageRect, marginRect, writingMode, margin);
 }
 
 const Shape& ShapeOutsideInfo::computedShape() const