Remove zoom() and effectiveZoom().

sky/engine/core/rendering/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 24 matching lines @@
     , m_fixedSize(m_imageGeneratorValue->isFixedSize())
 {
     m_isGeneratedImage = true;
 }
 
 PassRefPtr<CSSValue> StyleGeneratedImage::cssValue() const
 {
     return m_imageGeneratorValue.get();
 }
 
-LayoutSize StyleGeneratedImage::imageSize(const RenderObject* renderer, float multiplier) const
+LayoutSize StyleGeneratedImage::imageSize(const RenderObject* renderer) const
 {
-    if (m_fixedSize) {
-        IntSize fixedSize = m_imageGeneratorValue->fixedSize(renderer);
-        if (multiplier == 1.0f)
-            return fixedSize;
-
-        LayoutUnit width = fixedSize.width() * multiplier;
-        LayoutUnit height = fixedSize.height() * multiplier;
-
-        // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
-        if (fixedSize.width() > 0)
-            width = max<LayoutUnit>(1, width);
-
-        if (fixedSize.height() > 0)
-            height = max<LayoutUnit>(1, height);
-
-        return LayoutSize(width, height);
-    }
-
+    if (m_fixedSize)
+        return m_imageGeneratorValue->fixedSize(renderer);
     return m_containerSize;
 }
 
 void StyleGeneratedImage::computeIntrinsicDimensions(const RenderObject* renderer, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
     // At a zoom level of 1 the image is guaranteed to have an integer size.
-    IntSize size = flooredIntSize(imageSize(renderer, 1));
+    IntSize size = flooredIntSize(imageSize(renderer));
     intrinsicWidth = Length(size.width(), Fixed);
     intrinsicHeight = Length(size.height(), Fixed);
     intrinsicRatio = size;
 }
 
 void StyleGeneratedImage::addClient(RenderObject* renderer)
 {
     m_imageGeneratorValue->addClient(renderer, IntSize());
 }
 
 void StyleGeneratedImage::removeClient(RenderObject* renderer)
 {
     m_imageGeneratorValue->removeClient(renderer);
 }
 
 PassRefPtr<Image> StyleGeneratedImage::image(RenderObject* renderer, const IntSize& size) const
 {
     return m_imageGeneratorValue->image(renderer, size);
 }
 
 bool StyleGeneratedImage::knownToBeOpaque(const RenderObject* renderer) const
 {
     return m_imageGeneratorValue->knownToBeOpaque(renderer);
 }
 
 }