Rename repaint to paintInvalidation for remaining methods.

Source/core/rendering/RenderImage.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
  *
@@ skipping 160 matching lines @@
         view()->frameView()->incrementVisuallyNonEmptyPixelCount(flooredIntSize(m_imageResource->imageSize(1.0f)));
         m_didIncrementVisuallyNonEmptyPixelCount = true;
     }
 
     bool imageSizeChanged = false;
 
     // Set image dimensions, taking into account the size of the alt text.
     if (m_imageResource->errorOccurred() || !newImage)
         imageSizeChanged = setImageSizeForAltText(m_imageResource->cachedImage());
 
-    repaintOrMarkForLayout(imageSizeChanged, rect);
+    paintInvalidationOrMarkForLayout(imageSizeChanged, rect);
 }
 
 void RenderImage::updateIntrinsicSizeIfNeeded(const LayoutSize& newSize)
 {
     if (m_imageResource->errorOccurred() || !m_imageResource->hasImage())
         return;
     setIntrinsicSize(newSize);
 }
 
 void RenderImage::updateInnerContentRect()
 {
     // Propagate container size to the image resource.
     LayoutRect containerRect = replacedContentRect();
     IntSize containerSize(containerRect.width(), containerRect.height());
     if (!containerSize.isEmpty())
         m_imageResource->setContainerSizeForRenderer(containerSize);
 }
 
-void RenderImage::repaintOrMarkForLayout(bool imageSizeChangedToAccomodateAltText, const IntRect* rect)
+void RenderImage::paintInvalidationOrMarkForLayout(bool imageSizeChangedToAccomodateAltText, const IntRect* rect)
 {
     LayoutSize oldIntrinsicSize = intrinsicSize();
     LayoutSize newIntrinsicSize = m_imageResource->intrinsicSize(style()->effectiveZoom());
     updateIntrinsicSizeIfNeeded(newIntrinsicSize);
 
     // In the case of generated image content using :before/:after/content, we might not be
     // in the render tree yet. In that case, we just need to update our intrinsic size.
     // layout() will be called after we are inserted in the tree which will take care of
     // what we are doing here.
     if (!containingBlock())
         return;
 
     bool imageSourceHasChangedSize = oldIntrinsicSize != newIntrinsicSize || imageSizeChangedToAccomodateAltText;
     if (imageSourceHasChangedSize)
         setPreferredLogicalWidthsDirty();
 
     // If the actual area occupied by the image has changed and it is not constrained by style then a layout is required.
     bool imageSizeIsConstrained = style()->logicalWidth().isSpecified() && style()->logicalHeight().isSpecified();
 
     // FIXME: We only need to recompute the containing block's preferred size if the containing block's size
     // depends on the image's size (i.e., the container uses shrink-to-fit sizing).
     // There's no easy way to detect that shrink-to-fit is needed, always force a layout.
     bool containingBlockNeedsToRecomputePreferredSize = style()->logicalWidth().isPercent() || style()->logicalMaxWidth().isPercent()  || style()->logicalMinWidth().isPercent();
 
     if (imageSourceHasChangedSize && (!imageSizeIsConstrained || containingBlockNeedsToRecomputePreferredSize)) {
         setNeedsLayoutAndFullPaintInvalidation();
         return;
     }
 
-    // The image hasn't changed in size or its style constrains its size, so a repaint will suffice.
+    // The image hasn't changed in size or its style constrains its size, so a paint invalidation will suffice.
     if (everHadLayout() && !selfNeedsLayout()) {
         // The inner content rectangle is calculated during layout, but may need an update now
         // (unless the box has already been scheduled for layout). In order to calculate it, we
         // may need values from the containing block, though, so make sure that we're not too
         // early. It may be that layout hasn't even taken place once yet.
         updateInnerContentRect();
     }
 
-    LayoutRect repaintRect;
+    LayoutRect paintInvalidationRect;
     if (rect) {
         // The image changed rect is in source image coordinates (without zoom),
         // so map from the bounds of the image to the contentsBox.
         const LayoutSize imageSizeWithoutZoom = m_imageResource->imageSize(1 / style()->effectiveZoom());
-        repaintRect = enclosingIntRect(mapRect(*rect, FloatRect(FloatPoint(), imageSizeWithoutZoom), contentBoxRect()));
+        paintInvalidationRect = enclosingIntRect(mapRect(*rect, FloatRect(FloatPoint(), imageSizeWithoutZoom), contentBoxRect()));
         // Guard against too-large changed rects.
-        repaintRect.intersect(contentBoxRect());
+        paintInvalidationRect.intersect(contentBoxRect());
     } else {
-        repaintRect = contentBoxRect();
+        paintInvalidationRect = contentBoxRect();
     }
 
     {
-        // FIXME: We should not be allowing repaint during layout. crbug.com/339584
+        // FIXME: We should not be allowing paint invalidations during layout. crbug.com/339584
         AllowPaintInvalidationScope scoper(frameView());
-        invalidatePaintRectangle(repaintRect);
+        invalidatePaintRectangle(paintInvalidationRect);
     }
 
     // Tell any potential compositing layers that the image needs updating.
     contentChanged(ImageChanged);
 }
 
 void RenderImage::notifyFinished(Resource* newImage)
 {
     if (!m_imageResource)
         return;
@@ skipping 159 matching lines @@
 {
     ASSERT(areaElement->imageElement() == node());
 
     Path path = areaElement->computePath(this);
     if (path.isEmpty())
         return;
 
     RenderStyle* areaElementStyle = areaElement->computedStyle();
     unsigned short outlineWidth = areaElementStyle->outlineWidth();
 
-    IntRect repaintRect = enclosingIntRect(path.boundingRect());
-    repaintRect.moveBy(-absoluteContentBox().location());
-    repaintRect.inflate(outlineWidth);
+    IntRect paintInvalidationRect = enclosingIntRect(path.boundingRect());
+    paintInvalidationRect.moveBy(-absoluteContentBox().location());
+    paintInvalidationRect.inflate(outlineWidth);
 
-    invalidatePaintRectangle(repaintRect);
+    invalidatePaintRectangle(paintInvalidationRect);
 }
 
 void RenderImage::paintIntoRect(GraphicsContext* context, const LayoutRect& rect)
 {
     IntRect alignedRect = pixelSnappedIntRect(rect);
     if (!m_imageResource->hasImage() || m_imageResource->errorOccurred() || alignedRect.width() <= 0 || alignedRect.height() <= 0)
         return;
 
     RefPtr<Image> img = m_imageResource->image(alignedRect.width(), alignedRect.height());
     if (!img || img->isNull())
@@ skipping 179 matching lines @@
         return 0;
 
     ImageResource* cachedImage = m_imageResource->cachedImage();
     if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage())
         return toSVGImage(cachedImage->image())->embeddedContentBox();
 
     return 0;
 }
 
 } // namespace blink