[NOT FOR COMMIT] Pass defaultObjectSize to get image size

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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 275 matching lines @@
     paint.setColorFilter(context.colorFilter());
     context.drawRect(dstRect, paint);
 }
 
 PassRefPtr<SkImage> SVGImage::imageForCurrentFrameForContainer(const KURL& url)
 {
     if (!m_page)
         return nullptr;
 
     SkPictureRecorder recorder;
-    SkCanvas* canvas = recorder.beginRecording(width(), height());
-    drawForContainer(canvas, SkPaint(), FloatSize(size()), 1, rect(), rect(), url);
+    SkCanvas* canvas = recorder.beginRecording(defaultConcreteObjectSizeWidth(), defaultConcreteObjectSizeHeight());
+    drawForContainer(canvas, SkPaint(), FloatSize(defaultConcreteObjectSize()), 1, defaultConcreteObjectSizeRect(), defaultConcreteObjectSizeRect(), url);
     RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
 
     return adoptRef(
-        SkImage::NewFromPicture(picture.get(), SkISize::Make(width(), height()), nullptr, nullptr));
+        SkImage::NewFromPicture(picture.get(), SkISize::Make(defaultConcreteObjectSizeWidth(), defaultConcreteObjectSizeHeight()), nullptr, nullptr));
 }
 
 static bool drawNeedsLayer(const SkPaint& paint)
 {
     if (SkColorGetA(paint.getColor()) < 255)
         return true;
 
     SkXfermode::Mode xfermode;
     if (SkXfermode::AsMode(paint.getXfermode(), &xfermode)) {
         if (xfermode != SkXfermode::kSrcOver_Mode)
@@ skipping 222 matching lines @@
         loader.load(FrameLoadRequest(0, blankURL(), SubstituteData(data(), AtomicString("image/svg+xml", AtomicString::ConstructFromLiteral),
             AtomicString("UTF-8", AtomicString::ConstructFromLiteral), KURL(), ForceSynchronousLoad)));
 
         // Set the concrete object size before a container size is available.
         m_concreteObjectSize = roundedIntSize(calculateConcreteObjectSize(FloatSize(300, 150)));
     }
 
     return m_page;
 }
 
+IntSize SVGImage::concreteObjectSize(const FloatSize& defaultObjectSize) const
+{
+    return roundedIntSize(calculateConcreteObjectSize(defaultObjectSize));
+}
+
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 } // namespace blink