Remove the x,y,width,height methods from HTMLImageElement.

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 160 matching lines @@
         imageLoader().updateFromElement(ImageLoader::UpdateNormal, m_elementCreatedByParser ? ImageLoader::ForceLoadImmediately : ImageLoader::LoadNormally);
 }
 
 void HTMLImageElement::removedFrom(ContainerNode* insertionPoint)
 {
     if (m_listener)
         document().mediaQueryMatcher().removeViewportListener(m_listener.get());
     HTMLElement::removedFrom(insertionPoint);
 }
 
-int HTMLImageElement::width()
-{
-    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()).width();
-    }
-
-    document().updateLayout();
-
-    RenderBox* box = renderBox();
-    return box ? box->contentBoxRect().pixelSnappedWidth() : 0;
-}
-
-int HTMLImageElement::height()
-{
-    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()).height();
-    }
-
-    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(), ImageResource::IntrinsicSize).width();
 }
 
 int HTMLImageElement::naturalHeight() const
 {
@@ skipping 14 matching lines @@
 
     return imageLoader().image()->url().string();
 }
 
 bool HTMLImageElement::isURLAttribute(const Attribute& attribute) const
 {
     return attribute.name() == HTMLNames::srcAttr
         || HTMLElement::isURLAttribute(attribute);
 }
 
-void HTMLImageElement::setHeight(int value)
-{
-    setIntegralAttribute(HTMLNames::heightAttr, value);
-}
-
 KURL HTMLImageElement::src() const
 {
     return document().completeURL(getAttribute(HTMLNames::srcAttr));
 }
 
 void HTMLImageElement::setSrc(const String& value)
 {
     setAttribute(HTMLNames::srcAttr, AtomicString(value));
 }
 
-void HTMLImageElement::setWidth(int value)
-{
-    setIntegralAttribute(HTMLNames::widthAttr, value);
-}
-
-int HTMLImageElement::x() const
-{
-    document().updateLayout();
-    RenderObject* r = renderer();
-    if (!r)
-        return 0;
-
-    // FIXME: This doesn't work correctly with transforms.
-    FloatPoint absPos = r->localToAbsolute();
-    return absPos.x();
-}
-
-int HTMLImageElement::y() const
-{
-    document().updateLayout();
-    RenderObject* r = renderer();
-    if (!r)
-        return 0;
-
-    // FIXME: This doesn't work correctly with transforms.
-    FloatPoint absPos = r->localToAbsolute();
-    return absPos.y();
-}
-
 bool HTMLImageElement::complete() const
 {
     return imageLoader().imageComplete();
 }
 
 void HTMLImageElement::didMoveToNewDocument(Document& oldDocument)
 {
     imageLoader().elementDidMoveToNewDocument();
     HTMLElement::didMoveToNewDocument(oldDocument);
 }
 
 void HTMLImageElement::selectSourceURL(ImageLoader::UpdateFromElementBehavior behavior)
 {
     unsigned effectiveSize = 0;
     ImageCandidate candidate = bestFitSourceForImageAttributes(
         document().devicePixelRatio(), effectiveSize,
         getAttribute(HTMLNames::srcAttr), AtomicString());
     setBestFitURLAndDPRFromImageCandidate(candidate);
     if (m_intrinsicSizingViewportDependant && m_effectiveSizeViewportDependant && !m_listener.get()) {
         m_listener = ViewportChangeListener::create(this);
         document().mediaQueryMatcher().addViewportListener(m_listener.get());
     }
     imageLoader().updateFromElement(behavior);
 }
 
 }