Changeset 158163 in webkit for trunk/Source/WebCore/rendering/RenderImage.cpp

Timestamp:

Oct 28, 2013, 7:58:43 PM (12 years ago)

Author:

[email protected]

Message:

RenderElement::style() should return a reference.
<​https://webkit.org/b/123414>

Now that renderers always have style, go ahead and make style()
return a RenderStyle&.

There are countless opportunities for further cleanup enabled by
this change. I'm simply passing &style() in many cases where we
can really do something nicer instead.

Reviewed by Anders Carlsson.

File:

• trunk/Source/WebCore/rendering/RenderImage.cpp (modified) (14 diffs)

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -122 +122 @@
     // imageSize() returns 0 for the error image. We need the true size of the
     // error image, so we have to get it by grabbing image() directly.
-    return IntSize(paddingWidth + imageSize.width() * style()->effectiveZoom(), paddingHeight + imageSize.height() * style()->effectiveZoom());
+    return IntSize(paddingWidth + imageSize.width() * style().effectiveZoom(), paddingHeight + imageSize.height() * style().effectiveZoom());
 }
 
@@ -141 +141 @@
         FontCachePurgePreventer fontCachePurgePreventer;
 
-        const Font& font = style()->font();
-        IntSize paddedTextSize(paddingWidth + min(ceilf(font.width(RenderBlock::constructTextRun(this, font, m_altText, *style()))), maxAltTextWidth), paddingHeight + min(font.fontMetrics().height(), maxAltTextHeight));
+        const Font& font = style().font();
+        IntSize paddedTextSize(paddingWidth + min(ceilf(font.width(RenderBlock::constructTextRun(this, font, m_altText, style()))), maxAltTextWidth), paddingHeight + min(font.fontMetrics().height(), maxAltTextHeight));
         imageSize = imageSize.expandedTo(paddedTextSize);
     }
@@ -162 +162 @@
     }
 #if ENABLE(CSS_IMAGE_ORIENTATION)
-    if (diff == StyleDifferenceLayout && oldStyle->imageOrientation() != style()->imageOrientation())
+    if (diff == StyleDifferenceLayout && oldStyle->imageOrientation() != style().imageOrientation())
         return imageDimensionsChanged(true /* imageSizeChanged */);
 #endif
@@ -168 +168 @@
 #if ENABLE(CSS_IMAGE_RESOLUTION)
     if (diff == StyleDifferenceLayout
-        && (oldStyle->imageResolution() != style()->imageResolution()
-            || oldStyle->imageResolutionSnap() != style()->imageResolutionSnap()
-            || oldStyle->imageResolutionSource() != style()->imageResolutionSource()))
+        && (oldStyle->imageResolution() != style().imageResolution()
+            || oldStyle->imageResolutionSnap() != style().imageResolutionSnap()
+            || oldStyle->imageResolutionSource() != style().imageResolutionSource()))
         imageDimensionsChanged(true /* imageSizeChanged */);
 #endif
@@ -238 +238 @@
 {
 #if ENABLE(CSS_IMAGE_RESOLUTION)
-    double scale = style()->imageResolution();
-    if (style()->imageResolutionSnap() == ImageResolutionSnapPixels)
+    double scale = style().imageResolution();
+    if (style().imageResolutionSnap() == ImageResolutionSnapPixels)
         scale = roundForImpreciseConversion<int>(scale);
     if (scale <= 0)
         scale = 1;
-    bool intrinsicSizeChanged = updateIntrinsicSizeIfNeeded(m_imageResource->intrinsicSize(style()->effectiveZoom() / scale), imageSizeChanged);
+    bool intrinsicSizeChanged = updateIntrinsicSizeIfNeeded(m_imageResource->intrinsicSize(style().effectiveZoom() / scale), imageSizeChanged);
 #else
-    bool intrinsicSizeChanged = updateIntrinsicSizeIfNeeded(m_imageResource->intrinsicSize(style()->effectiveZoom()), imageSizeChanged);
+    bool intrinsicSizeChanged = updateIntrinsicSizeIfNeeded(m_imageResource->intrinsicSize(style().effectiveZoom()), imageSizeChanged);
 #endif
 
@@ -275 +275 @@
         // 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();
+            style().logicalWidth().isPercent()
+            || style().logicalMaxWidth().isPercent()
+            || style().logicalMinWidth().isPercent();
 
         if (imageSizeChanged || hasOverrideSize || containingBlockNeedsToRecomputePreferredSize) {
@@ -363 +363 @@
             // Draw an outline rect where the image should be.
             context->setStrokeStyle(SolidStroke);
-            context->setStrokeColor(Color::lightGray, style()->colorSpace());
-            context->setFillColor(Color::transparent, style()->colorSpace());
+            context->setStrokeColor(Color::lightGray, style().colorSpace());
+            context->setFillColor(Color::transparent, style().colorSpace());
             context->drawRect(pixelSnappedIntRect(LayoutRect(paintOffset.x() + leftBorder + leftPad, paintOffset.y() + topBorder + topPad, cWidth, cHeight)));
 
@@ -394 +394 @@
                 ImageOrientationDescription orientationDescription;
 #if ENABLE(CSS_IMAGE_ORIENTATION)
-                orientationDescription.setImageOrientationEnum(style()->imageOrientation());
+                orientationDescription.setImageOrientationEnum(style().imageOrientation());
                 orientationDescription.setRespectImageOrientation(shouldRespectImageOrientation());
 #endif
-                context->drawImage(image.get(), style()->colorSpace(), pixelSnappedIntRect(LayoutRect(paintOffset + imageOffset, imageSize)), CompositeSourceOver, orientationDescription);
+                context->drawImage(image.get(), style().colorSpace(), pixelSnappedIntRect(LayoutRect(paintOffset + imageOffset, imageSize)), CompositeSourceOver, orientationDescription);
                 errorPictureDrawn = true;
             }
@@ -403 +403 @@
             if (!m_altText.isEmpty()) {
                 String text = document().displayStringModifiedByEncoding(m_altText);
-                context->setFillColor(style()->visitedDependentColor(CSSPropertyColor), style()->colorSpace());
-                const Font& font = style()->font();
+                context->setFillColor(style().visitedDependentColor(CSSPropertyColor), style().colorSpace());
+                const Font& font = style().font();
                 const FontMetrics& fontMetrics = font.fontMetrics();
                 LayoutUnit ascent = fontMetrics.ascent();
@@ -412 +412 @@
                 // Only draw the alt text if it'll fit within the content box,
                 // and only if it fits above the error image.
-                TextRun textRun = RenderBlock::constructTextRun(this, font, text, *style());
+                TextRun textRun = RenderBlock::constructTextRun(this, font, text, style());
                 LayoutUnit textWidth = font.width(textRun);
                 if (errorPictureDrawn) {
@@ -430 +430 @@
 
 #if PLATFORM(MAC)
-        if (style()->highlight() != nullAtom && !paintInfo.context->paintingDisabled())
-            paintCustomHighlight(toPoint(paintOffset - location()), style()->highlight(), true);
+        if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
+            paintCustomHighlight(toPoint(paintOffset - location()), style().highlight(), true);
 #endif
 
@@ -526 +526 @@
     ImageOrientationDescription orientationDescription;
 #if ENABLE(CSS_IMAGE_ORIENTATION)
-    orientationDescription.setImageOrientationEnum(style()->imageOrientation());
+    orientationDescription.setImageOrientationEnum(style().imageOrientation());
     orientationDescription.setRespectImageOrientation(shouldRespectImageOrientation());
 #endif
-    context->drawImage(m_imageResource->image(alignedRect.width(), alignedRect.height()).get(), style()->colorSpace(), alignedRect, compositeOperator, orientationDescription, useLowQualityScaling);
+    context->drawImage(m_imageResource->image(alignedRect.width(), alignedRect.height()).get(), style().colorSpace(), alignedRect, compositeOperator, orientationDescription, useLowQualityScaling);
 }
 
@@ -549 +549 @@
     if (!contentBoxRect().contains(localRect))
         return false;
-    EFillBox backgroundClip = style()->backgroundClip();
+    EFillBox backgroundClip = style().backgroundClip();
     // Background paints under borders.
-    if (backgroundClip == BorderFillBox && style()->hasBorder() && !borderObscuresBackground())
+    if (backgroundClip == BorderFillBox && style().hasBorder() && !borderObscuresBackground())
         return false;
     // Background shows in padding area.
-    if ((backgroundClip == BorderFillBox || backgroundClip == PaddingFillBox) && style()->hasPadding())
+    if ((backgroundClip == BorderFillBox || backgroundClip == PaddingFillBox) && style().hasPadding())
         return false;
     // Object-fit may leave parts of the content box empty.
-    ObjectFit objectFit = style()->objectFit();
+    ObjectFit objectFit = style().objectFit();
     if (objectFit != ObjectFitFill && objectFit != ObjectFitCover)
         return false;
@@ -594 +594 @@
         if (HTMLMapElement* map = imageMap()) {
             LayoutRect contentBox = contentBoxRect();
-            float scaleFactor = 1 / style()->effectiveZoom();
+            float scaleFactor = 1 / style().effectiveZoom();
             LayoutPoint mapLocation = locationInContainer.point() - toLayoutSize(accumulatedOffset) - locationOffset() - toLayoutSize(contentBox.location());
             mapLocation.scale(scaleFactor, scaleFactor);