| Index: Source/core/editing/StyledMarkupAccumulator.h
|
| diff --git a/Source/core/editing/StyledMarkupAccumulator.h b/Source/core/editing/StyledMarkupAccumulator.h
|
| index 27ca19c264320abe2628fbafce623a7c238e7b47..1648521a170697800bc958b9a151d05d66ca756e 100644
|
| --- a/Source/core/editing/StyledMarkupAccumulator.h
|
| +++ b/Source/core/editing/StyledMarkupAccumulator.h
|
| @@ -44,14 +44,14 @@ class StyledMarkupAccumulator final {
|
| WTF_MAKE_NONCOPYABLE(StyledMarkupAccumulator);
|
| STACK_ALLOCATED();
|
| public:
|
| - enum RangeFullySelectsNode { DoesFullySelectNode, DoesNotFullySelectNode };
|
| -
|
| 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&);
|
| +
|
| // TODO(hajimehoshi): These functions are called from the serializer, but
|
| // should not.
|
| Node* highestNodeToBeSerialized() { return m_highestNodeToBeSerialized.get(); }
|
| @@ -62,7 +62,9 @@ public:
|
| String takeResults();
|
|
|
| void pushMarkup(const String&);
|
| - void appendElement(StringBuilder&, Element&, bool addDisplayInline, RangeFullySelectsNode);
|
| + RefPtrWillBeMember<EditingStyle> createInlineStyle(Element&, bool addDisplayInline);
|
| +
|
| + void appendElement(StringBuilder&, Element&, bool addDisplayInline, PassRefPtrWillBeRawPtr<EditingStyle>);
|
| void appendStartMarkup(StringBuilder&, Node&);
|
|
|
| private:
|
| @@ -70,16 +72,12 @@ private:
|
|
|
| String renderedText(Text&);
|
| String stringValueForRange(const Text&);
|
| -
|
| bool shouldApplyWrappingStyle(const Node&) const;
|
| -
|
| bool shouldAnnotate() const;
|
|
|
| - void appendElement(StringBuilder&, Element&);
|
| + void appendElement(Element&, PassRefPtrWillBeRawPtr<EditingStyle>);
|
| void appendEndMarkup(StringBuilder&, const Element&);
|
|
|
| - RefPtrWillBeRawPtr<EditingStyle> createInlineStyle(Element&, bool addDisplayInline, RangeFullySelectsNode);
|
| -
|
| MarkupFormatter m_formatter;
|
| const TextOffset m_start;
|
| const TextOffset m_end;
|
|
|