diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 18:46:52 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:50 +0100 |
| commit | 1ed8c4d16ac986307f1c0589a3a720a37e60f313 (patch) | |
| tree | fc36f1aa9c4389b3d03a6fc2e2623e2a1a267150 /Source/WebCore/rendering | |
| parent | 09b60ab8488b362c96df8f268613aafaeebfcfa1 (diff) | |
| download | external_webkit-1ed8c4d16ac986307f1c0589a3a720a37e60f313.zip external_webkit-1ed8c4d16ac986307f1c0589a3a720a37e60f313.tar.gz external_webkit-1ed8c4d16ac986307f1c0589a3a720a37e60f313.tar.bz2 | |
Merge WebKit at r78450: IntRect::bottom()/right() renamed
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/InlineTextBox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp index 37f7eff..4802f02 100644 --- a/Source/WebCore/rendering/InlineTextBox.cpp +++ b/Source/WebCore/rendering/InlineTextBox.cpp @@ -1259,7 +1259,7 @@ int InlineTextBox::positionForOffset(int offset) const TextRun textRun = TextRun(text->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride); if (m_disableRoundingHacks) textRun.disableRoundingHacks(); - return enclosingIntRect(f.selectionRectForText(textRun, IntPoint(logicalLeft(), 0), 0, from, to)).right(); + return enclosingIntRect(f.selectionRectForText(textRun, IntPoint(logicalLeft(), 0), 0, from, to)).maxX(); #else return enclosingIntRect(f.selectionRectForText(TextRun(text->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride), IntPoint(logicalLeft(), 0), 0, from, to)).maxX(); |