In preparation for the elimination of QFont and QFontMetrics, rename methods on RenderStyle. htmlFont() becomes simply
font(). The old font() method turns into qfont(). Also added a helper for obtaining the fontDescription() directly from
the RenderStyle (without first obtaining the htmlFont()).
Reviewed by darin
* WebCore.xcodeproj/project.pbxproj:
* bindings/objc/DOM.mm:
(-[DOMElement _font]):
* bridge/mac/MacFrame.mm:
(WebCore::MacFrame::attributedString):
(WebCore::MacFrame::fontForSelection):
(WebCore::MacFrame::fontAttributesForSelectionStart):
* css/css_computedstyle.cpp:
(WebCore::CSSComputedStyleDeclarationImpl::getPropertyCSSValue):
* css/css_valueimpl.cpp:
(WebCore::CSSPrimitiveValueImpl::computeLengthFloat):
* css/cssstyleselector.cpp:
(WebCore::CSSStyleSelector::styleForElement):
(WebCore::CSSStyleSelector::pseudoStyleForElement):
(WebCore::CSSStyleSelector::applyProperty):
(WebCore::CSSStyleSelector::checkForTextSizeAdjust):
(WebCore::CSSStyleSelector::checkForGenericFamilyChange):
* dom/DocumentImpl.cpp:
(WebCore::DocumentImpl::recalcStyle):
* editing/visible_text.cpp:
(khtml::TextIterator::exitNode):
* ksvg2/svg/SVGLengthImpl.cpp:
(SVGLengthImpl::updateValue):
* kwq/KWQAccObject.mm:
(AXAttributeStringSetStyle):
* rendering/InlineTextBox.cpp:
(khtml::InlineTextBox::paint):
(khtml::InlineTextBox::offsetForPosition):
* rendering/RenderText.cpp:
(WebCore::RenderText::shouldUseMonospaceCache):
(WebCore::RenderText::font):
(WebCore::RenderText::width):
(WebCore::RenderText::htmlFont):
* rendering/bidi.cpp:
(khtml::RenderBlock::tabWidth):
(khtml::RenderBlock::checkLinesForTextOverflow):
* rendering/render_br.cpp:
(WebCore::RenderBR::lineHeight):
* rendering/render_flexbox.cpp:
(khtml::RenderFlexibleBox::layoutVerticalBox):
* rendering/render_flow.cpp:
(WebCore::RenderFlow::lineHeight):
* rendering/render_form.cpp:
(WebCore::RenderFormElement::setStyle):
(WebCore::RenderFormElement::addIntrinsicMarginsIfAllowed):
* rendering/render_image.cpp:
(WebCore::RenderImage::paint):
* rendering/render_line.cpp:
(WebCore::InlineFlowBox::paintDecorations):
(WebCore::EllipsisBox::paint):
* rendering/render_list.cpp:
(RenderListItem::getAbsoluteRepaintRect):
(RenderListMarker::paint):
* rendering/render_object.cpp:
(WebCore::RenderObject::lineHeight):
* rendering/render_object.h:
(WebCore::RenderObject::font):
* rendering/render_replaced.cpp:
(WebCore::RenderWidget::setStyle):
* rendering/render_style.h:
(khtml::RenderStyle::font):
(khtml::RenderStyle::fontDescription):
(khtml::RenderStyle::qfont):
* rendering/render_theme_mac.mm:
(WebCore::RenderThemeMac::setFontFromControlSize):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@12977 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 365d723..7bac76f 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -833,7 +833,7 @@
if (!m_tabWidth) {
QChar spaceChar(' ');
- const Font& font = style()->htmlFont();
+ const Font& font = style()->font();
int spaceWidth = font.width(&spaceChar, 1, 0, 0);
m_tabWidth = spaceWidth * 8;
assert(m_tabWidth != 0);
@@ -2522,8 +2522,8 @@
// Determine the width of the ellipsis using the current font.
QChar ellipsis = 0x2026; // FIXME: CSS3 says this is configurable, also need to use 0x002E (FULL STOP) if 0x2026 not renderable
static AtomicString ellipsisStr(ellipsis);
- const Font& firstLineFont = firstLineStyle()->htmlFont();
- const Font& font = style()->htmlFont();
+ const Font& firstLineFont = firstLineStyle()->font();
+ const Font& font = style()->font();
int firstLineEllipsisWidth = firstLineFont.width(&ellipsis, 1, 0, 0);
int ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : font.width(&ellipsis, 1, 0, 0);
