| Index: third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
|
| index 83d4b788f503d1b1f2fc2db05e0fb8faa3f2b5f3..b541cc248fce077ab4af0d66d1a4df7d6021810f 100644
|
| --- a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
|
| @@ -50,7 +50,7 @@ size_t totalLength(const Vector<String>& strings)
|
|
|
| using namespace HTMLNames;
|
|
|
| -StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, ConvertBlocksToInlines convertBlocksToInlines)
|
| +StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const RawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, ConvertBlocksToInlines convertBlocksToInlines)
|
| : m_formatter(shouldResolveURLs)
|
| , m_start(start)
|
| , m_end(end)
|
| @@ -93,7 +93,7 @@ void StyledMarkupAccumulator::appendText(Text& text)
|
| MarkupFormatter::appendCharactersReplacingEntities(m_result, str, start, length, m_formatter.entityMaskForText(text));
|
| }
|
|
|
| -void StyledMarkupAccumulator::appendTextWithInlineStyle(Text& text, PassRefPtrWillBeRawPtr<EditingStyle> inlineStyle)
|
| +void StyledMarkupAccumulator::appendTextWithInlineStyle(Text& text, RawPtr<EditingStyle> inlineStyle)
|
| {
|
| if (inlineStyle) {
|
| // wrappingStyleForAnnotatedSerialization should have removed -webkit-text-decorations-in-effect
|
| @@ -117,12 +117,12 @@ void StyledMarkupAccumulator::appendTextWithInlineStyle(Text& text, PassRefPtrWi
|
| m_result.append("</span>");
|
| }
|
|
|
| -void StyledMarkupAccumulator::appendElementWithInlineStyle(const Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
|
| +void StyledMarkupAccumulator::appendElementWithInlineStyle(const Element& element, RawPtr<EditingStyle> style)
|
| {
|
| appendElementWithInlineStyle(m_result, element, style);
|
| }
|
|
|
| -void StyledMarkupAccumulator::appendElementWithInlineStyle(StringBuilder& out, const Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
|
| +void StyledMarkupAccumulator::appendElementWithInlineStyle(StringBuilder& out, const Element& element, RawPtr<EditingStyle> style)
|
| {
|
| const bool documentIsHTML = element.document().isHTMLDocument();
|
| m_formatter.appendOpenTag(out, element, nullptr);
|
|
|