Refactoring: Remove StyledMarkupAccumulator::appendString and add appendNewLine

Source/core/editing/StyledMarkupSerializer.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Igalia S.L.
  * Copyright (C) 2011 Motorola Mobility. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 99 matching lines @@
     RefPtrWillBeRawPtr<EditingStyle> style = EditingStyle::create(element->inlineStyle());
     // FIXME: Having to const_cast here is ugly, but it is quite a bit of work to untangle
     // the non-const-ness of styleFromMatchedRulesForElement.
     style->mergeStyleFromRules(const_cast<HTMLElement*>(element));
     return style.release();
 }
 
 template<typename Strategy>
 String StyledMarkupSerializer<Strategy>::createMarkup()
 {
-    DEFINE_STATIC_LOCAL(const String, interchangeNewlineString, ("<br class=\"" AppleInterchangeNewline "\">"));
-
     StyledMarkupAccumulator markupAccumulator(m_shouldResolveURLs, toTextOffset(m_start.parentAnchoredEquivalent()), toTextOffset(m_end.parentAnchoredEquivalent()), m_start.document(), m_shouldAnnotate, m_highestNodeToBeSerialized.get());
 
     Node* pastEnd = m_end.nodeAsRangePastLastNode();
 
     Node* firstNode = m_start.nodeAsRangeFirstNode();
     VisiblePosition visibleStart(toPositionInDOMTree(m_start), VP_DEFAULT_AFFINITY);
     VisiblePosition visibleEnd(toPositionInDOMTree(m_end), VP_DEFAULT_AFFINITY);
     if (m_shouldAnnotate == AnnotateForInterchange && needInterchangeNewlineAfter(visibleStart)) {
+        markupAccumulator.appendInterchangeNewline();
         if (visibleStart == visibleEnd.previous())
-            return interchangeNewlineString;
+            return markupAccumulator.takeResults();
 
-        markupAccumulator.appendString(interchangeNewlineString);
         firstNode = visibleStart.next().deepEquivalent().deprecatedNode();
 
         if (pastEnd && Strategy::PositionType::beforeNode(firstNode).compareTo(Strategy::PositionType::beforeNode(pastEnd)) >= 0) {
             // This condition hits in editing/pasteboard/copy-display-none.html.
-            return interchangeNewlineString;
+            return markupAccumulator.takeResults();
         }
     }
 
     Node* lastClosed = serializeNodes(firstNode, pastEnd, &markupAccumulator);
 
     if (m_highestNodeToBeSerialized && lastClosed) {
         // TODO(hajimehoshi): This is calculated at createMarkupInternal too.
         Node* commonAncestor = Strategy::commonAncestor(*m_start.containerNode(), *m_end.containerNode());
         ASSERT(commonAncestor);
         HTMLBodyElement* body = toHTMLBodyElement(enclosingElementWithTag(firstPositionInNode(commonAncestor), bodyTag));
@@ skipping 30 matching lines @@
                 wrapWithNode(markupAccumulator, *ancestor, StyledMarkupAccumulator::DoesNotFullySelectNode);
             }
 
             if (ancestor == m_highestNodeToBeSerialized)
                 break;
         }
     }
 
     // FIXME: The interchange newline should be placed in the block that it's in, not after all of the content, unconditionally.
     if (m_shouldAnnotate == AnnotateForInterchange && needInterchangeNewlineAt(visibleEnd))
-        markupAccumulator.appendString(interchangeNewlineString);
+        markupAccumulator.appendInterchangeNewline();
 
     return markupAccumulator.takeResults();
 }
 
 template<typename Strategy>
 Node* StyledMarkupSerializer<Strategy>::serializeNodes(Node* startNode, Node* pastEnd, StyledMarkupAccumulator* markupAccumulator)
 {
     if (!markupAccumulator->highestNodeToBeSerialized()) {
         Node* lastClosed = traverseNodesForSerialization(startNode, pastEnd, nullptr);
         markupAccumulator->setHighestNodeToBeSerialized(lastClosed);
@@ skipping 101 matching lines @@
         accumulator.appendStartMarkup(markup, node);
     accumulator.pushMarkup(markup.toString());
     if (!node.isElementNode())
         return;
     accumulator.appendEndTag(toElement(node));
 }
 
 template class StyledMarkupSerializer<EditingStrategy>;
 
 } // namespace blink