Refactoring: Separate MarkupAccumulator into MarkupFormatter and MarkupAccumulator

Source/core/editing/StyledMarkupAccumulator.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 111 matching lines @@
         if (m_end.isNotNull()) {
             if (text == m_end.text())
                 length = m_end.offset();
         }
         if (m_start.isNotNull()) {
             if (text == m_start.text()) {
                 start = m_start.offset();
                 length -= start;
             }
         }
-        m_accumulator.appendCharactersReplacingEntities(out, str, start, length, m_accumulator.entityMaskForText(text));
+        MarkupFormatter::appendCharactersReplacingEntities(out, str, start, length, m_accumulator.entityMaskForText(text));
     } else {
         const bool useRenderedText = !enclosingElementWithTag(firstPositionInNode(&text), selectTag);
         String content = useRenderedText ? renderedText(text) : stringValueForRange(text);
         StringBuilder buffer;
-        MarkupAccumulator::appendCharactersReplacingEntities(buffer, content, 0, content.length(), EntityMaskInPCDATA);
+        MarkupFormatter::appendCharactersReplacingEntities(buffer, content, 0, content.length(), EntityMaskInPCDATA);
         out.append(convertHTMLTextToInterchangeFormat(buffer.toString(), text));
     }
 
     if (wrappingSpan)
         out.append(styleNodeCloseTag(false));
 }
 
 void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element)
 {
     appendElement(out, element, false, DoesFullySelectNode);
@@ skipping 81 matching lines @@
 {
     StringBuilder openTag;
     appendStyleNodeOpenTag(openTag, style, isBlock);
     m_reversedPrecedingMarkup.append(openTag.toString());
     appendString(styleNodeCloseTag(isBlock));
 }
 
 String StyledMarkupAccumulator::takeResults()
 {
     StringBuilder result;
-    result.reserveCapacity(MarkupAccumulator::totalLength(m_reversedPrecedingMarkup) + m_accumulator.length());
+    result.reserveCapacity(MarkupFormatter::totalLength(m_reversedPrecedingMarkup) + m_accumulator.length());
 
     for (size_t i = m_reversedPrecedingMarkup.size(); i > 0; --i)
         result.append(m_reversedPrecedingMarkup[i - 1]);
 
     m_accumulator.concatenateMarkup(result);
 
     // We remove '\0' characters because they are not visibly rendered to the user.
     return result.toString().replace(0, "");
 }
 
@@ skipping 27 matching lines @@
     return m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode() == node.parentNode()
         && m_wrappingStyle && m_wrappingStyle->style();
 }
 
 bool StyledMarkupAccumulator::shouldAnnotate() const
 {
     return m_shouldAnnotate == AnnotateForInterchange;
 }
 
 } // namespace blink