diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/editing/SplitTextNodeCommand.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/editing/SplitTextNodeCommand.cpp')
| -rw-r--r-- | Source/WebCore/editing/SplitTextNodeCommand.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/WebCore/editing/SplitTextNodeCommand.cpp b/Source/WebCore/editing/SplitTextNodeCommand.cpp index 0eeca6adf..b51cf2c8b 100644 --- a/Source/WebCore/editing/SplitTextNodeCommand.cpp +++ b/Source/WebCore/editing/SplitTextNodeCommand.cpp @@ -54,8 +54,7 @@ void SplitTextNodeCommand::doApply() if (!parent || !parent->rendererIsEditable()) return; - ExceptionCode ec = 0; - String prefixText = m_text2->substringData(0, m_offset, ec); + String prefixText = m_text2->substringData(0, m_offset, IGNORE_EXCEPTION); if (prefixText.isEmpty()) return; @@ -75,12 +74,10 @@ void SplitTextNodeCommand::doUnapply() String prefixText = m_text1->data(); - ExceptionCode ec = 0; - m_text2->insertData(0, prefixText, ec); - ASSERT(!ec); + m_text2->insertData(0, prefixText, ASSERT_NO_EXCEPTION); document()->markers()->copyMarkers(m_text1.get(), 0, prefixText.length(), m_text2.get(), 0); - m_text1->remove(ec); + m_text1->remove(ASSERT_NO_EXCEPTION); } void SplitTextNodeCommand::doReapply() |