Use unsigned longs in HTMLImageElement idl

third_party/WebKit/Source/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
@@ skipping 123 matching lines @@
   selectSourceURL(ImageLoader::UpdateSizeChanged);
 }
 
 HTMLImageElement* HTMLImageElement::createForJSConstructor(Document& document) {
   HTMLImageElement* image = new HTMLImageElement(document);
   image->m_elementCreatedByParser = false;
   return image;
 }
 
 HTMLImageElement* HTMLImageElement::createForJSConstructor(Document& document,
-                                                           int width) {
+                                                           unsigned width) {
   HTMLImageElement* image = new HTMLImageElement(document);
   image->setWidth(width);
   image->m_elementCreatedByParser = false;
   return image;
 }
 
 HTMLImageElement* HTMLImageElement::createForJSConstructor(Document& document,
-                                                           int width,
-                                                           int height) {
+                                                           unsigned width,
+                                                           unsigned height) {
   HTMLImageElement* image = new HTMLImageElement(document);
   image->setWidth(width);
   image->setHeight(height);
   image->m_elementCreatedByParser = false;
   return image;
 }
 
 bool HTMLImageElement::isPresentationAttribute(
     const QualifiedName& name) const {
   if (name == widthAttr || name == heightAttr || name == borderAttr ||
@@ skipping 255 matching lines @@
     resetFormOwner();
   if (m_listener) {
     document().mediaQueryMatcher().removeViewportListener(m_listener);
     Node* parent = parentNode();
     if (parent && isHTMLPictureElement(*parent))
       toHTMLPictureElement(parent)->removeListenerFromSourceChildren();
   }
   HTMLElement::removedFrom(insertionPoint);
 }
 
-int HTMLImageElement::width() {
+unsigned HTMLImageElement::width() {
   if (inActiveDocument())
     document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   if (!layoutObject()) {
     // check the attribute first for an explicit pixel value
-    bool ok;
-    int width = getAttribute(widthAttr).toInt(&ok);
-    if (ok)
+    unsigned width = 0;
+    if (parseHTMLNonNegativeInteger(getAttribute(widthAttr), width))
       return width;
 
     // if the image is available, use its width
-    if (imageLoader().image())
+    if (imageLoader().image()) {
       return imageLoader()
           .image()
           ->imageSize(LayoutObject::shouldRespectImageOrientation(nullptr),
                       1.0f)
           .width()
-          .toInt();
+          .toUnsigned();
+    }
   }
 
   LayoutBox* box = layoutBox();
   return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedWidth(),
                                      box)
              : 0;
 }
 
-int HTMLImageElement::height() {
+unsigned HTMLImageElement::height() {
   if (inActiveDocument())
     document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   if (!layoutObject()) {
     // check the attribute first for an explicit pixel value
-    bool ok;
-    int height = getAttribute(heightAttr).toInt(&ok);
-    if (ok)
+    unsigned height = 0;
+    if (parseHTMLNonNegativeInteger(getAttribute(heightAttr), height))
       return height;
 
     // if the image is available, use its height
-    if (imageLoader().image())
+    if (imageLoader().image()) {
       return imageLoader()
           .image()
           ->imageSize(LayoutObject::shouldRespectImageOrientation(nullptr),
                       1.0f)
           .height()
-          .toInt();
+          .toUnsigned();
+    }
   }
 
   LayoutBox* box = layoutBox();
   return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedHeight(),
                                      box)
              : 0;
 }
 
-int HTMLImageElement::naturalWidth() const {
+unsigned HTMLImageElement::naturalWidth() const {
   if (!imageLoader().image())
     return 0;
 
   return imageLoader()
       .image()
       ->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()),
                   m_imageDevicePixelRatio,
                   ImageResource::IntrinsicCorrectedToDPR)
       .width()
-      .toInt();
+      .toUnsigned();
 }
 
-int HTMLImageElement::naturalHeight() const {
+unsigned HTMLImageElement::naturalHeight() const {
   if (!imageLoader().image())
     return 0;
 
   return imageLoader()
       .image()
       ->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()),
                   m_imageDevicePixelRatio,
                   ImageResource::IntrinsicCorrectedToDPR)
       .height()
-      .toInt();
+      .toUnsigned();
 }
 
 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.
 
   // Return the picked URL string in case of load error.
   if (imageLoader().hadError())
     return m_bestFitImageURL;
@@ skipping 20 matching lines @@
 
 const QualifiedName& HTMLImageElement::subResourceAttributeName() const {
   return srcAttr;
 }
 
 bool HTMLImageElement::draggable() const {
   // Image elements are draggable by default.
   return !equalIgnoringCase(getAttribute(draggableAttr), "false");
 }
 
-void HTMLImageElement::setHeight(int value) {
-  setIntegralAttribute(heightAttr, value);
+void HTMLImageElement::setHeight(unsigned value) {
+  setUnsignedIntegralAttribute(heightAttr, value);
 }
 
 KURL HTMLImageElement::src() const {
   return document().completeURL(getAttribute(srcAttr));
 }
 
 void HTMLImageElement::setSrc(const String& value) {
   setAttribute(srcAttr, AtomicString(value));
 }
 
-void HTMLImageElement::setWidth(int value) {
-  setIntegralAttribute(widthAttr, value);
+void HTMLImageElement::setWidth(unsigned value) {
+  setUnsignedIntegralAttribute(widthAttr, value);
 }
 
 int HTMLImageElement::x() const {
   document().updateStyleAndLayoutIgnorePendingStylesheets();
   LayoutObject* r = layoutObject();
   if (!r)
     return 0;
 
   // FIXME: This doesn't work correctly with transforms.
   FloatPoint absPos = r->localToAbsolute();
@@ skipping 314 matching lines @@
   ImageResource* image = cachedImage();
   if (!image)
     return IntSize();
   LayoutSize lSize = image->imageSize(
       LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
   DCHECK(lSize.fraction().isZero());
   return IntSize(lSize.width().toInt(), lSize.height().toInt());
 }
 
 }  // namespace blink