diff options
Diffstat (limited to 'Source/WebCore/rendering/InlineFlowBox.cpp')
| -rw-r--r-- | Source/WebCore/rendering/InlineFlowBox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/InlineFlowBox.cpp b/Source/WebCore/rendering/InlineFlowBox.cpp index 9ad0fcfa1..8e6714068 100644 --- a/Source/WebCore/rendering/InlineFlowBox.cpp +++ b/Source/WebCore/rendering/InlineFlowBox.cpp @@ -382,9 +382,9 @@ float InlineFlowBox::placeBoxesInInlineDirection(float logicalLeft, bool& needsW InlineTextBox* text = toInlineTextBox(curr); RenderText* rt = toRenderText(text->renderer()); if (rt->textLength()) { - if (needsWordSpacing && isSpaceOrNewline(rt->characters()[text->start()])) + if (needsWordSpacing && isSpaceOrNewline(rt->characterAt(text->start()))) logicalLeft += rt->style(isFirstLineStyle())->font().wordSpacing(); - needsWordSpacing = !isSpaceOrNewline(rt->characters()[text->end()]); + needsWordSpacing = !isSpaceOrNewline(rt->characterAt(text->end())); } text->setLogicalLeft(logicalLeft); if (knownToHaveNoOverflow()) @@ -460,7 +460,7 @@ bool InlineFlowBox::requiresIdeographicBaseline(const GlyphOverflowAndFallbackFo const Vector<const SimpleFontData*>* usedFonts = 0; if (curr->isInlineTextBox()) { GlyphOverflowAndFallbackFontsMap::const_iterator it = textBoxDataMap.find(toInlineTextBox(curr)); - usedFonts = it == textBoxDataMap.end() ? 0 : &it->second.first; + usedFonts = it == textBoxDataMap.end() ? 0 : &it->value.first; } if (usedFonts) { @@ -824,7 +824,7 @@ inline void InlineFlowBox::addTextBoxVisualOverflow(InlineTextBox* textBox, Glyp RenderStyle* style = textBox->renderer()->style(isFirstLineStyle()); GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.find(textBox); - GlyphOverflow* glyphOverflow = it == textBoxDataMap.end() ? 0 : &it->second.second; + GlyphOverflow* glyphOverflow = it == textBoxDataMap.end() ? 0 : &it->value.second; bool isFlippedLine = style->isFlippedLinesWritingMode(); int topGlyphEdge = glyphOverflow ? (isFlippedLine ? glyphOverflow->bottom : glyphOverflow->top) : 0; |