Clean up Image::computeIntrinsicDimensions

third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 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.
@@ skipping 51 matching lines @@
 
         if (fixedSize.height() > 0)
             height = max(LayoutUnit(1), height);
 
         return LayoutSize(width, height);
     }
 
     return LayoutSize();
 }
 
-void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutObject, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutObject, FloatSize& intrinsicSize, FloatSize& intrinsicRatio)
 {
     // At a zoom level of 1 the image is guaranteed to have an integer size.
-    IntSize size = flooredIntSize(imageSize(layoutObject, 1));
-    intrinsicWidth = Length(size.width(), Fixed);
-    intrinsicHeight = Length(size.height(), Fixed);
-    intrinsicRatio = FloatSize(size);
+    LayoutSize size = imageSize(layoutObject, 1);
+    ASSERT(size.fraction().isZero());
+    intrinsicSize = intrinsicRatio = FloatSize(size);
 }
 
 void StyleGeneratedImage::addClient(LayoutObject* layoutObject)
 {
     m_imageGeneratorValue->addClient(layoutObject, IntSize());
 }
 
 void StyleGeneratedImage::removeClient(LayoutObject* layoutObject)
 {
     m_imageGeneratorValue->removeClient(layoutObject);
 }
 
 PassRefPtr<Image> StyleGeneratedImage::image(const LayoutObject* layoutObject, const IntSize& size, float) const
 {
     return m_imageGeneratorValue->image(layoutObject, size);
 }
 
 bool StyleGeneratedImage::knownToBeOpaque(const LayoutObject* layoutObject) const
 {
     return m_imageGeneratorValue->knownToBeOpaque(layoutObject);
 }
 
 DEFINE_TRACE(StyleGeneratedImage)
 {
     visitor->trace(m_imageGeneratorValue);
     StyleImage::trace(visitor);
 }
 
 } // namespace blink