Rename HTMLInputElement::imageLoader() to ensureImageLoader()

Make clear that imageLoader is potentially constructing the
ImageLoader by renaming to ensureImageLoader. Also rename
hasImageLoader to imageLoader and make it return a pointer,
so it can be used both to check if the ImageLoader is created
as well as use it if not null.

http://trac.webkit.org/changeset/175764

Review URL: https://codereview.chromium.org/715633005

git-svn-id: svn://svn.chromium.org/blink/trunk@185143 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/html/HTMLInputElement.cpp

@@ -149,11 +149,11 @@ void HTMLInputElement::trace(Visitor* visitor)
     HTMLTextFormControlElement::trace(visitor);
 }
 
-HTMLImageLoader* HTMLInputElement::imageLoader()
+HTMLImageLoader& HTMLInputElement::ensureImageLoader()
 {
     if (!m_imageLoader)
         m_imageLoader = HTMLImageLoader::create(this);
-    return m_imageLoader.get();
+    return *m_imageLoader;
 }
 
 void HTMLInputElement::didAddUserAgentShadowRoot(ShadowRoot&)
@@ -1482,7 +1482,7 @@ void HTMLInputElement::removedFrom(ContainerNode* insertionPoint)
 
 void HTMLInputElement::didMoveToNewDocument(Document& oldDocument)
 {
-    if (hasImageLoader())
+    if (imageLoader())
         imageLoader()->elementDidMoveToNewDocument();
 
     // FIXME: Remove type check.

third_party/WebKit/Source/core/html/HTMLInputElement.h

@@ -240,8 +240,8 @@ public:
     virtual void setRangeText(const String& replacement, ExceptionState&) override final;
     virtual void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionState&) override final;
 
-    bool hasImageLoader() const { return m_imageLoader; }
-    HTMLImageLoader* imageLoader();
+    HTMLImageLoader* imageLoader() const { return m_imageLoader.get(); }
+    HTMLImageLoader& ensureImageLoader();
 
     bool setupDateTimeChooserParameters(DateTimeChooserParameters&);
 

third_party/WebKit/Source/core/html/forms/ImageInputType.cpp

@@ -136,26 +136,26 @@ void ImageInputType::srcAttributeChanged()
 {
     if (!element().renderer())
         return;
-    element().imageLoader()->updateFromElement(ImageLoader::UpdateIgnorePreviousError);
+    element().ensureImageLoader().updateFromElement(ImageLoader::UpdateIgnorePreviousError);
 }
 
 void ImageInputType::startResourceLoading()
 {
     BaseButtonInputType::startResourceLoading();
 
-    HTMLImageLoader* imageLoader = element().imageLoader();
-    imageLoader->updateFromElement();
+    HTMLImageLoader& imageLoader = element().ensureImageLoader();
+    imageLoader.updateFromElement();
 
     RenderImage* renderer = toRenderImage(element().renderer());
     if (!renderer)
         return;
 
     RenderImageResource* imageResource = renderer->imageResource();
-    imageResource->setImageResource(imageLoader->image());
+    imageResource->setImageResource(imageLoader.image());
 
     // If we have no image at all because we have no src attribute, set
     // image height and width for the alt text instead.
-    if (!imageLoader->image() && !imageResource->cachedImage())
+    if (!imageLoader.image() && !imageResource->cachedImage())
         renderer->setImageSizeForAltText();
 }
 
@@ -190,11 +190,9 @@ unsigned ImageInputType::height() const
             return height;
 
         // If the image is available, use its height.
-        if (element->hasImageLoader()) {
-            HTMLImageLoader* imageLoader = element->imageLoader();
-            if (imageLoader->image())
-                return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).height();
-        }
+        HTMLImageLoader* imageLoader = element->imageLoader();
+        if (imageLoader && imageLoader->image())
+            return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).height();
     }
 
     element->document().updateLayout();
@@ -214,11 +212,9 @@ unsigned ImageInputType::width() const
             return width;
 
         // If the image is available, use its width.
-        if (element->hasImageLoader()) {
-            HTMLImageLoader* imageLoader = element->imageLoader();
-            if (imageLoader->image())
-                return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).width();
-        }
+        HTMLImageLoader* imageLoader = element->imageLoader();
+        if (imageLoader && imageLoader->image())
+            return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).width();
     }
 
     element->document().updateLayout();

third_party/WebKit/Source/core/page/PageSerializer.cpp

@@ -230,7 +230,7 @@ void PageSerializer::serializeFrame(LocalFrame* frame)
             addImageToResources(cachedImage, imageElement.renderer(), url);
         } else if (isHTMLInputElement(element)) {
             HTMLInputElement& inputElement = toHTMLInputElement(element);
-            if (inputElement.type() == InputTypeNames::image && inputElement.hasImageLoader()) {
+            if (inputElement.type() == InputTypeNames::image && inputElement.imageLoader()) {
                 KURL url = inputElement.src();
                 ImageResource* cachedImage = inputElement.imageLoader()->image();
                 addImageToResources(cachedImage, inputElement.renderer(), url);