Refactoring: Have StyledMarkupAccumulator use MarkupFormatter

Source/core/editing/MarkupAccumulator.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2009, 2010 Google Inc. 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 59 matching lines @@
 {
     appendEndMarkup(m_markup, element);
 }
 
 void MarkupAccumulator::appendStartMarkup(StringBuilder& result, Node& node, Namespaces* namespaces)
 {
     switch (node.nodeType()) {
     case Node::TEXT_NODE:
         appendText(result, toText(node));
         break;
-    case Node::COMMENT_NODE:
-        MarkupFormatter::appendComment(result, toComment(node).data());
-        break;
-    case Node::DOCUMENT_NODE:
-        MarkupFormatter::appendXMLDeclaration(result, toDocument(node));
-        break;
-    case Node::DOCUMENT_FRAGMENT_NODE:
-        break;
-    case Node::DOCUMENT_TYPE_NODE:
-        MarkupFormatter::appendDocumentType(result, toDocumentType(node));
-        break;
-    case Node::PROCESSING_INSTRUCTION_NODE:
-        MarkupFormatter::appendProcessingInstruction(result, toProcessingInstruction(node).target(), toProcessingInstruction(node).data());
-        break;
     case Node::ELEMENT_NODE:
         appendElement(result, toElement(node), namespaces);
         break;
-    case Node::CDATA_SECTION_NODE:
-        MarkupFormatter::appendCDATASection(result, toCDATASection(node).data());
-        break;
-    case Node::ATTRIBUTE_NODE:
-        ASSERT_NOT_REACHED();
+    default:
+        m_formatter.appendStartMarkup(result, node, namespaces);
         break;
     }
 }
 
 static bool elementCannotHaveEndTag(const Node& node)
 {
     if (!node.isHTMLElement())
         return false;
 
     // FIXME: ieForbidsInsertHTML may not be the right function to call here
     // ieForbidsInsertHTML is used to disallow setting innerHTML/outerHTML
     // or createContextualFragment.  It does not necessarily align with
     // which elements should be serialized w/o end tags.
     return toHTMLElement(node).ieForbidsInsertHTML();
 }
 
 void MarkupAccumulator::appendEndMarkup(StringBuilder& result, const Element& element)
 {
     m_formatter.appendEndMarkup(result, element);
 }
 
-void MarkupAccumulator::concatenateMarkup(StringBuilder& result) const
-{
-    result.append(m_markup);
-}
-
 void MarkupAccumulator::appendCustomAttributes(StringBuilder&, const Element&, Namespaces*)
 {
 }
 
 void MarkupAccumulator::appendText(StringBuilder& result, Text& text)
 {
     m_formatter.appendText(result, text);
 }
 
 bool MarkupAccumulator::shouldIgnoreAttribute(const Attribute& attribute)
@@ skipping 73 matching lines @@
         namespaces = &namespaceHash;
     }
 
     serializeNodesWithNamespaces<Strategy>(accumulator, targetNode, childrenOnly, namespaces);
     return accumulator.toString();
 }
 
 template String serializeNodes<EditingStrategy>(MarkupAccumulator&, Node&, EChildrenOnly);
 
 }