| Index: Source/core/editing/StyledMarkupAccumulator.h
|
| diff --git a/Source/core/editing/StyledMarkupAccumulator.h b/Source/core/editing/StyledMarkupAccumulator.h
|
| index d885cc6bc98614f3e0c579f0df7af10a0f7c232a..c19186a5f0a1af28155921cdab7edc0b29f0e821 100644
|
| --- a/Source/core/editing/StyledMarkupAccumulator.h
|
| +++ b/Source/core/editing/StyledMarkupAccumulator.h
|
| @@ -46,16 +46,17 @@ class StyledMarkupAccumulator final {
|
| public:
|
| StyledMarkupAccumulator(EAbsoluteURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document>, EAnnotateForInterchange, Node*);
|
|
|
| - void appendStartTag(Node&);
|
| void appendEndTag(const Element&);
|
| void appendInterchangeNewline();
|
|
|
| void appendText(Text&);
|
| + void appendTextWithInlineStyle(Text&, PassRefPtrWillBeRawPtr<EditingStyle>);
|
|
|
| - // TODO(hajimehoshi): These functions are called from the serializer, but
|
| - // should not.
|
| + // TODO(hajimehoshi): These functions are no longer needed because
|
| + // shouldApplyWrapingStyled is now in StyledMarkupSerializer. Remove them.
|
| Node* highestNodeToBeSerialized() { return m_highestNodeToBeSerialized.get(); }
|
| void setHighestNodeToBeSerialized(Node* highestNodeToBeSerialized) { m_highestNodeToBeSerialized = highestNodeToBeSerialized; }
|
| + RefPtrWillBeRawPtr<EditingStyle> wrappingStyle() { return m_wrappingStyle.get(); }
|
| void setWrappingStyle(PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyle) { m_wrappingStyle = wrappingStyle; }
|
|
|
| void wrapWithStyleNode(StylePropertySet*);
|
| @@ -64,20 +65,19 @@ public:
|
| void pushMarkup(const String&);
|
| RefPtrWillBeRawPtr<EditingStyle> createInlineStyle(Element&);
|
|
|
| + void appendElement(const Element&);
|
| void appendElement(StringBuilder&, const Element&);
|
| + void appendElementWithInlineStyle(const Element&, PassRefPtrWillBeRawPtr<EditingStyle>);
|
| void appendElementWithInlineStyle(StringBuilder&, const Element&, PassRefPtrWillBeRawPtr<EditingStyle>);
|
| void appendStartMarkup(Node&);
|
|
|
| bool shouldApplyWrappingStyle(const Node&) const;
|
|
|
| private:
|
| - void appendText(StringBuilder&, Text&);
|
| -
|
| String renderedText(Text&);
|
| String stringValueForRange(const Text&);
|
| bool shouldAnnotate() const;
|
|
|
| - void appendElement(const Element&, PassRefPtrWillBeRawPtr<EditingStyle>);
|
| void appendEndMarkup(StringBuilder&, const Element&);
|
|
|
| MarkupFormatter m_formatter;
|
|
|