[NOT FOR COMMIT] Pass defaultObjectSize to get image size

third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 172 matching lines @@
 void BitmapImage::updateSize() const
 {
     if (!m_sizeAvailable || m_haveSize)
         return;
 
     m_size = m_source.size();
     m_sizeRespectingOrientation = m_source.size(RespectImageOrientation);
     m_haveSize = true;
 }
 
-IntSize BitmapImage::size() const
+IntSize BitmapImage::concreteObjectSize(const FloatSize&) const
 {
     updateSize();
     return m_size;
 }
 
 IntSize BitmapImage::sizeRespectingOrientation() const
 {
     updateSize();
     return m_sizeRespectingOrientation;
 }
@@ skipping 119 matching lines @@
     return (size.width() > 1 || size.height() > 1);
 }
 
 bool BitmapImage::isSizeAvailable()
 {
     if (m_sizeAvailable)
         return true;
 
     m_sizeAvailable = m_source.isSizeAvailable();
 
-    if (m_sizeAvailable && hasVisibleImageSize(size())) {
+    if (m_sizeAvailable && hasVisibleImageSize(defaultConcreteObjectSize())) {
         BitmapImageMetrics::countDecodedImageType(m_source.filenameExtension());
         if (m_source.filenameExtension() == "jpg")
             BitmapImageMetrics::countImageOrientation(m_source.orientationAtIndex(0).orientation());
     }
 
     return m_sizeAvailable;
 }
 
 bool BitmapImage::ensureFrameIsCached(size_t index)
 {
@@ skipping 290 matching lines @@
     destroyDecodedDataIfNecessary();
 
     // We need to draw this frame if we advanced to it while not skipping, or if
     // while trying to skip frames we hit the last frame and thus had to stop.
     if (skippingFrames != advancedAnimation)
         imageObserver()->animationAdvanced(this);
     return advancedAnimation;
 }
 
 } // namespace blink