| Index: Source/core/editing/StyledMarkupAccumulator.cpp
|
| diff --git a/Source/core/editing/StyledMarkupAccumulator.cpp b/Source/core/editing/StyledMarkupAccumulator.cpp
|
| index 5775f5c23354fd992678c9e8f27b204da0dd16cd..f71a0b714b9d72c82bceda1d5c31c0733d10e329 100644
|
| --- a/Source/core/editing/StyledMarkupAccumulator.cpp
|
| +++ b/Source/core/editing/StyledMarkupAccumulator.cpp
|
| @@ -39,13 +39,12 @@ 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)
|
| {
|
| }
|
| @@ -191,18 +190,6 @@ void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element
|
| 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
|
| @@ -268,4 +255,9 @@ bool StyledMarkupAccumulator::shouldAnnotate() const
|
| return m_shouldAnnotate == AnnotateForInterchange;
|
| }
|
|
|
| +void StyledMarkupAccumulator::pushMarkup(const String& str)
|
| +{
|
| + m_reversedPrecedingMarkup.append(str);
|
| +}
|
| +
|
| } // namespace blink
|
|
|