Refactoring: Move StyledMarkupSerializer::m_reversedPrecedingMarkup to StyledMarkupAccumulator

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 32 matching lines @@
 {
     DEFINE_STATIC_LOCAL(const String, divClose, ("</div>"));
     DEFINE_STATIC_LOCAL(const String, styleSpanClose, ("</span>"));
     return isBlock ? divClose : styleSpanClose;
 }
 
 } // namespace
 
 using namespace HTMLNames;
 
-StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, Node* highestNodeToBeSerialized)
+StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, Node* highestNodeToBeSerialized, ConvertBlocksToInlines convertBlocksToInlines)
     : m_accumulator(shouldResolveURLs)
     , m_start(start)
     , m_end(end)
     , m_document(document)
     , m_shouldAnnotate(shouldAnnotate)
+    , m_convertBlocksToInlines(convertBlocksToInlines)
     , m_highestNodeToBeSerialized(highestNodeToBeSerialized)
 {
 }
 
 void StyledMarkupAccumulator::appendString(const String& str)
 {
     m_accumulator.appendString(str);
 }
 
 void StyledMarkupAccumulator::appendStartTag(Node& node)
@@ skipping 136 matching lines @@
     ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));
     if (isBlock)
         out.appendLiteral("<div style=\"");
     else
         out.appendLiteral("<span style=\"");
     ASSERT(m_document);
     m_accumulator.appendAttributeValue(out, style->asText(), m_document->isHTMLDocument());
     out.appendLiteral("\">");
 }
 
-void StyledMarkupAccumulator::concatenateMarkup(StringBuilder& result) const
+void StyledMarkupAccumulator::wrapWithNode(ContainerNode& node, RangeFullySelectsNode rangeFullySelectsNode)
 {
+    StringBuilder markup;
+    if (node.isElementNode())
+        appendElement(markup, toElement(node), convertBlocksToInlines() && isBlock(&node), rangeFullySelectsNode);
+    else
+        appendStartMarkup(markup, node);
+    m_reversedPrecedingMarkup.append(markup.toString());
+    if (node.isElementNode())
+        appendEndTag(toElement(node));
+}
+
+void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style, bool isBlock)
+{
+    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());
+
+    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, "");
 }
 
 String StyledMarkupAccumulator::renderedText(Text& textNode)
 {
     int startOffset = 0;
     int endOffset = textNode.length();
     if (m_start.text() == textNode)
         startOffset = m_start.offset();
     if (m_end.text() == textNode)
         endOffset = m_end.offset();
@@ skipping 19 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