Refactoring: Move a part of creteMarkupInternal to StyledMarkupSerializer

Source/core/editing/StyledMarkupSerializer.h

 /*
  * 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 43 matching lines @@
     virtual void appendElement(StringBuilder&, Element&, Namespaces*) override;
     void appendElement(StringBuilder&, Element&, bool, RangeFullySelectsNode);
     void appendStyleNodeOpenTag(StringBuilder&, StylePropertySet*, bool isBlock = false);
 
     // TODO(hajimehoshi): These functions are called from the serializer, but
     // should not.
     Node* highestNodeToBeSerialized() { return m_highestNodeToBeSerialized.get(); }
     void setHighestNodeToBeSerialized(Node* node) { m_highestNodeToBeSerialized = node; }
     bool shouldAnnotate() const { return m_shouldAnnotate == AnnotateForInterchange || m_shouldAnnotate == AnnotateForNavigationTransition; }
     bool shouldAnnotateForNavigationTransition() const { return m_shouldAnnotate == AnnotateForNavigationTransition; }
+    bool shouldAnnotateForInterchange() const { return m_shouldAnnotate == AnnotateForInterchange; }
 
 private:
     String renderedText(Text&);
     String stringValueForRange(const Node&);
 
     bool shouldApplyWrappingStyle(const Node&) const;
 
     // StyledMarkupAccumulator is owned by StyledMarkupSerializer and
     // |m_serializer| must be living while this is living.
     //
     // TODO(hajimehoshi): m_serializer is used only to access |m_wrappingStyle|.
     // Remove this.
     StyledMarkupSerializer* m_serializer;
 
     const Position m_start;
     const Position m_end;
     const EAnnotateForInterchange m_shouldAnnotate;
     RawPtrWillBeMember<Node> m_highestNodeToBeSerialized;
 };
 
 class StyledMarkupSerializer final {
     STACK_ALLOCATED();
 public:
     StyledMarkupSerializer(EAbsoluteURLs, EAnnotateForInterchange, const Position& start, const Position& end, Node* highestNodeToBeSerialized = nullptr);
 
+    String createMarkup(bool convertBlocksToInlines, Node* specialCommonAncestor);
+
     template<typename Strategy>
     Node* serializeNodes(Node* startNode, Node* pastEnd);
 
-    // TODO(hajimehoshi): These functions should be at the accumulator, but are
-    // used at markup.cpp. Move those usages to here.
-    void appendString(const String& s) { return m_markupAccumulator.appendString(s); }
-    void wrapWithNode(ContainerNode&, bool convertBlocksToInlines = false, StyledMarkupAccumulator::RangeFullySelectsNode = StyledMarkupAccumulator::DoesFullySelectNode);
-    void wrapWithStyleNode(StylePropertySet*, bool isBlock = false);
-
     String takeResults();
 
     // TODO(hajimehoshi): This is called by StyledMarkupAccumulator but should
     // not. Move |m_wrappingStyle| to the accumulator.
     EditingStyle* wrappingStyle() { return m_wrappingStyle.get(); }
 
 private:
     enum NodeTraversalMode { EmitString, DoNotEmitString };
 
     template<typename Strategy>
     Node* traverseNodesForSerialization(Node* startNode, Node* pastEnd, NodeTraversalMode);
 
+    // TODO(hajimehoshi): These functions should be at the accumulator.
+    void wrapWithNode(ContainerNode&, bool convertBlocksToInlines = false, StyledMarkupAccumulator::RangeFullySelectsNode = StyledMarkupAccumulator::DoesFullySelectNode);
+    void wrapWithStyleNode(StylePropertySet*, bool isBlock = false);
+
     StyledMarkupAccumulator m_markupAccumulator;
+    const Position m_start;
+    const Position m_end;
     Vector<String> m_reversedPrecedingMarkup;
     RefPtrWillBeMember<EditingStyle> m_wrappingStyle;
 };
 
 extern template Node* StyledMarkupSerializer::serializeNodes<EditingStrategy>(Node* startNode, Node* endNode);
 
 } // namespace blink
 
 #endif // StyledMarkupSerializer_h