Merge 146227 "Separate SVG image size and container size"

Source/WebCore/svg/graphics/SVGImageCache.cpp

 /*
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 56 matching lines @@
 IntSize SVGImageCache::imageSizeForRenderer(const RenderObject* renderer) const
 {
     IntSize imageSize = m_svgImage->size();
     if (!renderer)
         return imageSize;
 
     ImageForContainerMap::const_iterator it = m_imageForContainerMap.find(renderer);
     if (it == m_imageForContainerMap.end())
         return imageSize;
 
-    RefPtr<SVGImageForContainer> image = it->value;
-    ASSERT(!image->size().isEmpty());
-    return image->size();
+    RefPtr<SVGImageForContainer> imageForContainer = it->value;
+    ASSERT(!imageForContainer->size().isEmpty());
+    return imageForContainer->size();
 }
 
 // FIXME: This doesn't take into account the animation timeline so animations will not
 // restart on page load, nor will two animations in different pages have different timelines.
 Image* SVGImageCache::imageForRenderer(const RenderObject* renderer)
 {
     if (!renderer)
         return Image::nullImage();
 
     ImageForContainerMap::iterator it = m_imageForContainerMap.find(renderer);
     if (it == m_imageForContainerMap.end())
         return Image::nullImage();
 
-    RefPtr<SVGImageForContainer> image = it->value;
-    ASSERT(!image->size().isEmpty());
-    return image.get();
+    RefPtr<SVGImageForContainer> imageForContainer = it->value;
+    ASSERT(!imageForContainer->size().isEmpty());
+    return imageForContainer.get();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(SVG)