diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-03 10:45:00 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2014-11-03 11:27:48 +0100 |
| commit | 01c392c4582a37469195c054e5026e93e3e3551d (patch) | |
| tree | f0d7649c8da39cf97d709a53046b9f329f7446fc | |
| parent | 94711f7406fa8bd71728a1cc912870489f8c5447 (diff) | |
| download | qtwebkit-01c392c4582a37469195c054e5026e93e3e3551d.tar.gz | |
Fix merge error
The change 4a39158368f6184c8d56e1d65866ba99f83297e0 merged a part of
the diff for prepend to append. This patch moves the wrongly merged line.
Task-number: QTBUG-40284
Change-Id: I32d1b2f8e730aca38964d3675d3dec94512e0026
Reviewed-by: Julien Brianceau <jbriance@cisco.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | Source/WebCore/platform/text/SegmentedString.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/text/SegmentedString.cpp b/Source/WebCore/platform/text/SegmentedString.cpp index 95de06ae4..83a6e0cdd 100644 --- a/Source/WebCore/platform/text/SegmentedString.cpp +++ b/Source/WebCore/platform/text/SegmentedString.cpp @@ -181,7 +181,7 @@ void SegmentedString::append(const SegmentedString& s) for (; it != e; ++it) append(*it); } - m_currentChar = m_currentString.m_length ? m_currentString.getCurrentChar() : 0; + m_currentChar = m_pushedChar1 ? m_pushedChar1 : (m_currentString.m_length ? m_currentString.getCurrentChar() : 0); } void SegmentedString::prepend(const SegmentedString& s) @@ -195,7 +195,7 @@ void SegmentedString::prepend(const SegmentedString& s) prepend(*it); } prepend(s.m_currentString); - m_currentChar = m_pushedChar1 ? m_pushedChar1 : (m_currentString.m_length ? m_currentString.getCurrentChar() : 0); + m_currentChar = m_currentString.m_length ? m_currentString.getCurrentChar() : 0; } void SegmentedString::advanceSubstring() |