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 112 matching lines @@
 
     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)) {
         if (visibleStart == visibleEnd.previous())
             return interchangeNewlineString;
 
-        markupAccumulator.appendString(interchangeNewlineString);
+        markupAccumulator.appendNewLine();

[yosin_UTC9, 2015/06/10 07:17:32]

If we move this before L130 and change |return interchangeNewline| in L131 and
L138 to |return markupAccumlator.takeResults()|, we don't need to have static
variable interchangeNewlineString in L120.

I expect above change in next patch. ;-)

BTW, it seems if you have above patch, another patch can be submit in parallel.

[hajimehoshi, 2015/06/10 07:28:31]

Good catch. Done.

         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;
         }
     }
 
     Node* lastClosed = serializeNodes(firstNode, pastEnd, &markupAccumulator);
 
@@ skipping 35 matching lines @@
                 markupAccumulator.wrapWithNode(*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.appendNewLine();
 
     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 87 matching lines @@
             lastClosed = parent;
         }
     }
 
     return lastClosed;
 }
 
 template class StyledMarkupSerializer<EditingStrategy>;
 
 } // namespace blink