Remove zoom() and effectiveZoom().

sky/engine/core/html/HTMLImageElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google 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 223 matching lines @@
 {
     if (!renderer()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int width = getAttribute(HTMLNames::widthAttr).toInt(&ok);
         if (ok)
             return width;
 
         // if the image is available, use its width
         if (imageLoader().image())
-            return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f).width();
+            return imageLoader().image()->imageSizeForRenderer(renderer()).width();
     }
 
     if (ignorePendingStylesheets)
         document().updateLayoutIgnorePendingStylesheets();
     else
         document().updateLayout();
 
     RenderBox* box = renderBox();
     return box ? box->contentBoxRect().pixelSnappedWidth() : 0;
 }
 
 int HTMLImageElement::height(bool ignorePendingStylesheets)
 {
     if (!renderer()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int height = getAttribute(HTMLNames::heightAttr).toInt(&ok);
         if (ok)
             return height;
 
         // if the image is available, use its height
         if (imageLoader().image())
-            return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f).height();
+            return imageLoader().image()->imageSizeForRenderer(renderer()).height();
     }
 
     if (ignorePendingStylesheets)
         document().updateLayoutIgnorePendingStylesheets();
     else
         document().updateLayout();
 
     RenderBox* box = renderBox();
     return box ? box->contentBoxRect().pixelSnappedHeight() : 0;
 }
 
 int HTMLImageElement::naturalWidth() const
 {
     if (!imageLoader().image())
         return 0;
 
-    return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f, ImageResource::IntrinsicSize).width();
+    return imageLoader().image()->imageSizeForRenderer(renderer(), ImageResource::IntrinsicSize).width();
 }
 
 int HTMLImageElement::naturalHeight() const
 {
     if (!imageLoader().image())
         return 0;
 
-    return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f, ImageResource::IntrinsicSize).height();
+    return imageLoader().image()->imageSizeForRenderer(renderer(), ImageResource::IntrinsicSize).height();
 }
 
 const String& HTMLImageElement::currentSrc() const
 {
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/edits.html#dom-img-currentsrc
     // The currentSrc IDL attribute must return the img element's current request's current URL.
     // Initially, the pending request turns into current request when it is either available or broken.
     // We use the image's dimensions as a proxy to it being in any of these states.
     if (!imageLoader().image() || !imageLoader().image()->image() || !imageLoader().image()->image()->width())
         return emptyAtom;
@@ skipping 90 matching lines @@
 
     *status = NormalSourceImageStatus;
     return sourceImage->imageForDefaultFrame();
 }
 
 FloatSize HTMLImageElement::sourceSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
-    LayoutSize size;
-    size = image->imageSizeForRenderer(renderer(), 1.0f); // FIXME: Not sure about this.
-
-    return size;
+    return image->imageSizeForRenderer(renderer()); // FIXME: Not sure about this.
 }
 
 FloatSize HTMLImageElement::defaultDestinationSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
     LayoutSize size;
-    size = image->imageSizeForRenderer(renderer(), 1.0f); // FIXME: Not sure about this.
+    size = image->imageSizeForRenderer(renderer()); // FIXME: Not sure about this.
     if (renderer() && renderer()->isRenderImage() && image->image() && !image->image()->hasRelativeWidth())
         size.scale(toRenderImage(renderer())->imageDevicePixelRatio());
     return size;
 }
 
 void HTMLImageElement::selectSourceURL(ImageLoader::UpdateFromElementBehavior behavior)
 {
     unsigned effectiveSize = 0;
     if (RuntimeEnabledFeatures::pictureSizesEnabled()) {
         String sizes = getAttribute(HTMLNames::sizesAttr);
@@ skipping 13 matching lines @@
     }
     imageLoader().updateFromElement(behavior);
 }
 
 const KURL& HTMLImageElement::sourceURL() const
 {
     return cachedImage()->response().url();
 }
 
 }