diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderListMarker.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderListMarker.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/Source/WebCore/rendering/RenderListMarker.cpp b/Source/WebCore/rendering/RenderListMarker.cpp index cd41c75..c1c7245 100644 --- a/Source/WebCore/rendering/RenderListMarker.cpp +++ b/Source/WebCore/rendering/RenderListMarker.cpp @@ -26,13 +26,13 @@ #include "RenderListMarker.h" #include "CachedImage.h" -#include "CharacterNames.h" #include "Document.h" #include "GraphicsContext.h" #include "RenderLayer.h" #include "RenderListItem.h" #include "RenderView.h" #include "TextRun.h" +#include <wtf/unicode/CharacterNames.h> using namespace std; using namespace WTF; @@ -1130,7 +1130,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int tx, int ty) if (style()->highlight() != nullAtom && !paintInfo.context->paintingDisabled()) paintCustomHighlight(tx, ty, style()->highlight(), true); #endif - context->drawImage(m_image->image(this, marker.size()), style()->colorSpace(), marker); + context->drawImage(m_image->image(this, marker.size()).get(), style()->colorSpace(), marker); if (selectionState() != SelectionNone) { IntRect selRect = localSelectionRect(); selRect.move(boxOrigin.x(), boxOrigin.y()); @@ -1260,12 +1260,12 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int tx, int ty) marker = marker.transposedRect(); marker.move(box.x(), box.y() - logicalHeight()); context->save(); - context->translate(marker.x(), marker.bottom()); + context->translate(marker.x(), marker.maxY()); context->rotate(static_cast<float>(deg2rad(90.))); - context->translate(-marker.x(), -marker.bottom()); + context->translate(-marker.x(), -marker.maxY()); } - IntPoint textOrigin = IntPoint(marker.x(), marker.y() + style()->font().ascent()); + IntPoint textOrigin = IntPoint(marker.x(), marker.y() + style()->fontMetrics().ascent()); if (type == Asterisks || type == Footnotes) context->drawText(style()->font(), textRun, textOrigin); @@ -1311,7 +1311,7 @@ void RenderListMarker::layout() setHeight(m_image->imageSize(this, style()->effectiveZoom()).height()); } else { setLogicalWidth(minPreferredLogicalWidth()); - setLogicalHeight(style()->font().height()); + setLogicalHeight(style()->fontMetrics().height()); } setMarginStart(0); @@ -1346,11 +1346,12 @@ void RenderListMarker::computePreferredLogicalWidths() m_text = ""; const Font& font = style()->font(); + const FontMetrics& fontMetrics = font.fontMetrics(); if (isImage()) { // FIXME: This is a somewhat arbitrary width. Generated images for markers really won't become particularly useful // until we support the CSS3 marker pseudoclass to allow control over the width and height of the marker box. - int bulletWidth = font.ascent() / 2; + int bulletWidth = fontMetrics.ascent() / 2; m_image->setImageContainerSize(IntSize(bulletWidth, bulletWidth)); IntSize imageSize = m_image->imageSize(this, style()->effectiveZoom()); m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = style()->isHorizontalWritingMode() ? imageSize.width() : imageSize.height(); @@ -1373,7 +1374,7 @@ void RenderListMarker::computePreferredLogicalWidths() case Disc: case Square: m_text = listMarkerText(type, 0); // value is ignored for these types - logicalWidth = (font.ascent() * 2 / 3 + 1) / 2 + 2; + logicalWidth = (fontMetrics.ascent() * 2 / 3 + 1) / 2 + 2; break; case Afar: case Amharic: @@ -1472,7 +1473,7 @@ void RenderListMarker::computePreferredLogicalWidths() void RenderListMarker::updateMargins() { - const Font& font = style()->font(); + const FontMetrics& fontMetrics = style()->fontMetrics(); int marginStart = 0; int marginEnd = 0; @@ -1485,7 +1486,7 @@ void RenderListMarker::updateMargins() case Circle: case Square: marginStart = -1; - marginEnd = font.ascent() - minPreferredLogicalWidth() + 1; + marginEnd = fontMetrics.ascent() - minPreferredLogicalWidth() + 1; break; default: break; @@ -1495,7 +1496,7 @@ void RenderListMarker::updateMargins() if (isImage()) marginStart = -minPreferredLogicalWidth() - cMarkerPadding; else { - int offset = font.ascent() * 2 / 3; + int offset = fontMetrics.ascent() * 2 / 3; switch (style()->listStyleType()) { case Disc: case Circle: @@ -1513,7 +1514,7 @@ void RenderListMarker::updateMargins() if (isImage()) marginEnd = cMarkerPadding; else { - int offset = font.ascent() * 2 / 3; + int offset = fontMetrics.ascent() * 2 / 3; switch (style()->listStyleType()) { case Disc: case Circle: @@ -1584,15 +1585,15 @@ IntRect RenderListMarker::getRelativeMarkerRect() case Asterisks: case Footnotes: { const Font& font = style()->font(); - relativeRect = IntRect(0, 0, font.width(m_text), font.height()); + relativeRect = IntRect(0, 0, font.width(m_text), font.fontMetrics().height()); break; } case Disc: case Circle: case Square: { // FIXME: Are these particular rounding rules necessary? - const Font& font = style()->font(); - int ascent = font.ascent(); + const FontMetrics& fontMetrics = style()->fontMetrics(); + int ascent = fontMetrics.ascent(); int bulletWidth = (ascent * 2 / 3 + 1) / 2; relativeRect = IntRect(1, 3 * (ascent - ascent * 2 / 3) / 2, bulletWidth, bulletWidth); break; @@ -1680,7 +1681,7 @@ IntRect RenderListMarker::getRelativeMarkerRect() int itemWidth = font.width(m_text); UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem->value()), ' ' }; int suffixSpaceWidth = font.width(TextRun(suffixSpace, 2)); - relativeRect = IntRect(0, 0, itemWidth + suffixSpaceWidth, font.height()); + relativeRect = IntRect(0, 0, itemWidth + suffixSpaceWidth, font.fontMetrics().height()); } if (!style()->isHorizontalWritingMode()) { |