Refactoring: Remove StyledMarkupAccumulator::m_convertBlocksToInlines

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 21 matching lines @@
 #include "core/css/StylePropertySet.h"
 #include "core/dom/Text.h"
 #include "core/editing/htmlediting.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
-StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, Node* highestNodeToBeSerialized, ConvertBlocksToInlines convertBlocksToInlines)
+StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, Node* highestNodeToBeSerialized)
     : m_formatter(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_result.append(str);
 }
 
 void StyledMarkupAccumulator::appendStartTag(Node& node)
@@ skipping 125 matching lines @@
         if (!newInlineStyle->isEmpty()) {
             out.appendLiteral(" style=\"");
             MarkupFormatter::appendAttributeValue(out, newInlineStyle->style()->asText(), documentIsHTML);
             out.append('\"');
         }
     }
 
     m_formatter.appendCloseTag(out, element);
 }
 
-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)
 {
     // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
     ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));
     ASSERT(m_document);
 
     StringBuilder openTag;
     openTag.appendLiteral("<div style=\"");
     MarkupFormatter::appendAttributeValue(openTag, style->asText(), m_document->isHTMLDocument());
     openTag.appendLiteral("\">");
@@ skipping 45 matching lines @@
     // TODO(hajimehoshi): Use Strategy
     return m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode() == node.parentNode()
         && m_wrappingStyle && m_wrappingStyle->style();
 }
 
 bool StyledMarkupAccumulator::shouldAnnotate() const
 {
     return m_shouldAnnotate == AnnotateForInterchange;
 }
 
+void StyledMarkupAccumulator::pushMarkup(const String& str)
+{
+    m_reversedPrecedingMarkup.append(str);
+}
+
 } // namespace blink