Rename renderer() to layoutObject().

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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 232 matching lines @@
     m_bestFitImageURL = candidate.url();
     float candidateDensity = candidate.density();
     if (candidateDensity >= 0)
         m_imageDevicePixelRatio = 1.0 / candidateDensity;
     if (candidate.resourceWidth() > 0) {
         m_intrinsicSizingViewportDependant = true;
         UseCounter::count(document(), UseCounter::SrcsetWDescriptor);
     } else if (!candidate.srcOrigin()) {
         UseCounter::count(document(), UseCounter::SrcsetXDescriptor);
     }
-    if (renderer() && renderer()->isImage())
-        toLayoutImage(renderer())->setImageDevicePixelRatio(m_imageDevicePixelRatio);
+    if (layoutObject() && layoutObject()->isImage())
+        toLayoutImage(layoutObject())->setImageDevicePixelRatio(m_imageDevicePixelRatio);
 }
 
 void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     if (name == altAttr || name == titleAttr) {
         if (closedShadowRoot()) {
             Element* text = closedShadowRoot()->getElementById("alttext");
             String value = altText();
             if (text && text->textContent() != value)
                 text->setTextContent(altText());
@@ skipping 79 matching lines @@
     LayoutImage* image = new LayoutImage(this);
     image->setImageResource(LayoutImageResource::create());
     image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
     return image;
 }
 
 void HTMLImageElement::attach(const AttachContext& context)
 {
     HTMLElement::attach(context);
 
-    if (renderer() && renderer()->isImage()) {
-        LayoutImage* layoutImage = toLayoutImage(renderer());
+    if (layoutObject() && layoutObject()->isImage()) {
+        LayoutImage* layoutImage = toLayoutImage(layoutObject());
         LayoutImageResource* layoutImageResource = layoutImage->imageResource();
         if (m_isFallbackImage) {
             float deviceScaleFactor = blink::deviceScaleFactor(layoutImage->frame());
             pair<Image*, float> brokenImageAndImageScaleFactor = ImageResource::brokenImage(deviceScaleFactor);
             ImageResource* newImageResource = new ImageResource(brokenImageAndImageScaleFactor.first);
             layoutImage->imageResource()->setImageResource(newImageResource);
         }
         if (layoutImageResource->hasImage())
             return;
 
@@ skipping 31 matching lines @@
 {
     if (!m_form || NodeTraversal::highestAncestorOrSelf(*m_form.get()) != NodeTraversal::highestAncestorOrSelf(*this))
         resetFormOwner();
     if (m_listener)
         document().mediaQueryMatcher().removeViewportListener(m_listener);
     HTMLElement::removedFrom(insertionPoint);
 }
 
 int HTMLImageElement::width(bool ignorePendingStylesheets)
 {
-    if (!renderer()) {
+    if (!layoutObject()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int width = getAttribute(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(layoutObject(), 1.0f).width();
     }
 
     if (ignorePendingStylesheets)
         document().updateLayoutIgnorePendingStylesheets();
     else
         document().updateLayout();
 
     LayoutBox* box = layoutBox();
     return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedWidth(), box) : 0;
 }
 
 int HTMLImageElement::height(bool ignorePendingStylesheets)
 {
-    if (!renderer()) {
+    if (!layoutObject()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int height = getAttribute(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(layoutObject(), 1.0f).height();
     }
 
     if (ignorePendingStylesheets)
         document().updateLayoutIgnorePendingStylesheets();
     else
         document().updateLayout();
 
     LayoutBox* box = layoutBox();
     return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedHeight(), box) : 0;
 }
 
 int HTMLImageElement::naturalWidth() const
 {
     if (!imageLoader().image())
         return 0;
 
-    return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f, ImageResource::IntrinsicSize).width();
+    return imageLoader().image()->imageSizeForRenderer(layoutObject(), 1.0f, 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(layoutObject(), 1.0f, 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 42 matching lines @@
 }
 
 void HTMLImageElement::setWidth(int value)
 {
     setIntegralAttribute(widthAttr, value);
 }
 
 int HTMLImageElement::x() const
 {
     document().updateLayoutIgnorePendingStylesheets();
-    LayoutObject* r = renderer();
+    LayoutObject* r = layoutObject();
     if (!r)
         return 0;
 
     // FIXME: This doesn't work correctly with transforms.
     FloatPoint absPos = r->localToAbsolute();
     return absPos.x();
 }
 
 int HTMLImageElement::y() const
 {
     document().updateLayoutIgnorePendingStylesheets();
-    LayoutObject* r = renderer();
+    LayoutObject* r = layoutObject();
     if (!r)
         return 0;
 
     // FIXME: This doesn't work correctly with transforms.
     FloatPoint absPos = r->localToAbsolute();
     return absPos.y();
 }
 
 bool HTMLImageElement::complete() const
 {
@@ skipping 39 matching lines @@
     if (!complete() || !cachedImage()) {
         *status = IncompleteSourceImageStatus;
         return nullptr;
     }
 
     if (cachedImage()->errorOccurred()) {
         *status = UndecodableSourceImageStatus;
         return nullptr;
     }
 
-    RefPtr<Image> sourceImage = cachedImage()->imageForRenderer(renderer());
+    RefPtr<Image> sourceImage = cachedImage()->imageForRenderer(layoutObject());
 
     // We need to synthesize a container size if a renderer is not available to provide one.
-    if (!renderer() && sourceImage->usesContainerSize())
+    if (!layoutObject() && sourceImage->usesContainerSize())
         sourceImage->setContainerSize(sourceImage->size());
 
     *status = NormalSourceImageStatus;
     return sourceImage->imageForDefaultFrame();
 }
 
 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigin) const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return false;
     return !image->isAccessAllowed(&document(), destinationSecurityOrigin);
 }
 
 FloatSize HTMLImageElement::sourceSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
 
-    return FloatSize(image->imageSizeForRenderer(renderer(), 1.0f));
+    return FloatSize(image->imageSizeForRenderer(layoutObject(), 1.0f));
 }
 
 FloatSize HTMLImageElement::defaultDestinationSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
     LayoutSize size;
-    size = image->imageSizeForRenderer(renderer(), 1.0f);
-    if (renderer() && renderer()->isLayoutImage() && image->image() && !image->image()->hasRelativeWidth())
-        size.scale(toLayoutImage(renderer())->imageDevicePixelRatio());
+    size = image->imageSizeForRenderer(layoutObject(), 1.0f);
+    if (layoutObject() && layoutObject()->isLayoutImage() && image->image() && !image->image()->hasRelativeWidth())
+        size.scale(toLayoutImage(layoutObject())->imageDevicePixelRatio());
     return FloatSize(size);
 }
 
 void HTMLImageElement::selectSourceURL(ImageLoader::UpdateFromElementBehavior behavior)
 {
     if (!document().isActive())
         return;
 
     bool foundURL = false;
     if (RuntimeEnabledFeatures::pictureEnabled()) {
@@ skipping 81 matching lines @@
     ensureClosedShadowRoot();
 }
 
 bool HTMLImageElement::isOpaque() const
 {
     Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
     return image && image->currentFrameKnownToBeOpaque();
 }
 
 }