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

Timestamp:

Sep 28, 2013, 9:34:37 PM (12 years ago)

Author:

Antti Koivisto

Message:

Switch inline boxes to use const RenderStyle&
​https://bugs.webkit.org/show_bug.cgi?id=122068

Reviewed by Sam Weinig.

File:

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

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -128 +128 @@
 
         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));
+        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);
     }
@@ -393 +393 @@
                 // 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) {