Restore a collapsed trailing space of text used for line break

third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

Index: third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
index 5cc04a2bce4a99d935bfcbbc1b3fa9d29d1b0319..86828707c59df377c9b4470f93e1cc84c7863d9b 100644
--- a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
+++ b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
@@ -611,11 +611,10 @@ void TextIteratorAlgorithm<Strategy>::handleTextBox()
                     size_t subrunEnd = str.find('\n', runStart);
                     if (subrunEnd == kNotFound || subrunEnd > runEnd) {
                         subrunEnd = runEnd;
-                        // Restore the collapsed space at the end of text for copy & paste.
+                        // Restore the collapsed trailing space for copy & paste.
                         // See http://crbug.com/318925
-                        if (str.endsWith(' ') && subrunEnd == str.length() - 1 && str[subrunEnd - 1] != ' ') {
-                            Node* nextNode = Strategy::nextSibling(*m_node);
-                            if (nextNode && isInline(nextNode))
+                        if (!nextTextBox && m_textBox->root().nextRootBox() && m_textBox->root().lastChild() == m_textBox) {
+                            if (str.endsWith(' ') && subrunEnd == str.length() - 1 && str[subrunEnd - 1] != ' ')
                                 ++subrunEnd;
                         }
                     }