Simplify createShapeForImage handling of image pointers

Source/core/rendering/shapes/ShapeOutsideInfo.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 96 matching lines @@
 PassOwnPtr<Shape> ShapeOutsideInfo::createShapeForImage(StyleImage* styleImage, float shapeImageThreshold, WritingMode writingMode, float margin) const
 {
     const IntSize& imageSize = m_renderer.calculateImageIntrinsicDimensions(styleImage, roundedIntSize(m_referenceBoxLogicalSize), RenderImage::ScaleByEffectiveZoom);
     styleImage->setContainerSizeForRenderer(&m_renderer, imageSize, m_renderer.style()->effectiveZoom());
 
     const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_referenceBoxLogicalSize);
     const LayoutRect& imageRect = (m_renderer.isRenderImage())
         ? toRenderImage(&m_renderer)->replacedContentRect()
         : LayoutRect(LayoutPoint(), imageSize);
 
-    Image* image = 0;
-    RefPtr<Image> generatedImage;
+    ASSERT(!styleImage->isPendingImage());
+    RefPtr<Image> image = styleImage->image(const_cast<RenderBox*>(&m_renderer), imageSize);
 
-    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();
-    }
-
-    return Shape::createRasterShape(image, shapeImageThreshold, imageRect, marginRect, writingMode, margin);
+    return Shape::createRasterShape(image.get(), shapeImageThreshold, imageRect, marginRect, writingMode, margin);
 }
 
 const Shape& ShapeOutsideInfo::computedShape() const
 {
     if (Shape* shape = m_shape.get())
         return *shape;
 
     const RenderStyle& style = *m_renderer.style();
     ASSERT(m_renderer.containingBlock());
     const RenderStyle& containingBlockStyle = *m_renderer.containingBlock()->style();
@@ skipping 207 matching lines @@
 }
 
 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const
 {
     if (!m_renderer.style()->isHorizontalWritingMode())
         return size.transposedSize();
     return size;
 }
 
 }