diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/rendering/InlineFlowBox.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
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; |