Move StyledMarkupAccumulator::shouldApplyWrappingStyle to its serializer

Source/core/editing/StyledMarkupSerializer.cpp

 /*
  * 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 106 matching lines @@
 template<typename Strategy>
 String StyledMarkupSerializer<Strategy>::createMarkup()
 {
     StyledMarkupAccumulator markupAccumulator(m_shouldResolveURLs, toTextOffset(m_start.parentAnchoredEquivalent()), toTextOffset(m_end.parentAnchoredEquivalent()), m_start.document(), m_shouldAnnotate, m_highestNodeToBeSerialized.get());
 
     Node* pastEnd = m_end.nodeAsRangePastLastNode();
 
     Node* firstNode = m_start.nodeAsRangeFirstNode();
     VisiblePosition visibleStart(toPositionInDOMTree(m_start), VP_DEFAULT_AFFINITY);
     VisiblePosition visibleEnd(toPositionInDOMTree(m_end), VP_DEFAULT_AFFINITY);
-    if (m_shouldAnnotate == AnnotateForInterchange && needInterchangeNewlineAfter(visibleStart)) {
+    if (shouldAnnotate() && needInterchangeNewlineAfter(visibleStart)) {
         markupAccumulator.appendInterchangeNewline();
         if (visibleStart == visibleEnd.previous())
             return markupAccumulator.takeResults();
 
         firstNode = visibleStart.next().deepEquivalent().deprecatedNode();
 
         if (pastEnd && Strategy::PositionType::beforeNode(firstNode).compareTo(Strategy::PositionType::beforeNode(pastEnd)) >= 0) {
             // This condition hits in editing/pasteboard/copy-display-none.html.
             return markupAccumulator.takeResults();
         }
@@ skipping 43 matching lines @@
                     style->style()->removeProperty(CSSPropertyFloat);
                 wrapWithNode(markupAccumulator, *ancestor, style);
             }
 
             if (ancestor == m_highestNodeToBeSerialized)
                 break;
         }
     }
 
     // FIXME: The interchange newline should be placed in the block that it's in, not after all of the content, unconditionally.
-    if (m_shouldAnnotate == AnnotateForInterchange && needInterchangeNewlineAt(visibleEnd))
+    if (shouldAnnotate() && needInterchangeNewlineAt(visibleEnd))
         markupAccumulator.appendInterchangeNewline();
 
     return markupAccumulator.takeResults();
 }
 
 template<typename Strategy>
 Node* StyledMarkupSerializer<Strategy>::serializeNodes(Node* startNode, Node* pastEnd, StyledMarkupAccumulator* markupAccumulator)
 {
     if (!markupAccumulator->highestNodeToBeSerialized()) {
         Node* lastClosed = traverseNodesForSerialization(startNode, pastEnd, nullptr);
         markupAccumulator->setHighestNodeToBeSerialized(lastClosed);
     }
 
     Node* highestNodeToBeSerialized = markupAccumulator->highestNodeToBeSerialized();
     if (highestNodeToBeSerialized && Strategy::parent(*highestNodeToBeSerialized)) {
-        bool shouldAnnotate = m_shouldAnnotate == AnnotateForInterchange;
-        RefPtrWillBeRawPtr<EditingStyle> wrappingStyle = EditingStyle::wrappingStyleForSerialization(Strategy::parent(*highestNodeToBeSerialized), shouldAnnotate);
+        RefPtrWillBeRawPtr<EditingStyle> wrappingStyle = EditingStyle::wrappingStyleForSerialization(Strategy::parent(*highestNodeToBeSerialized), shouldAnnotate());
         markupAccumulator->setWrappingStyle(wrappingStyle.release());
     }
     return traverseNodesForSerialization(startNode, pastEnd, markupAccumulator);
 }
 
 template<typename Strategy>
 Node* StyledMarkupSerializer<Strategy>::traverseNodesForSerialization(Node* startNode, Node* pastEnd, StyledMarkupAccumulator* markupAccumulator)
 {
     WillBeHeapVector<RawPtrWillBeMember<ContainerNode>> ancestorsToClose;
     Node* next;
@@ skipping 15 matching lines @@
         }
 
         if (!n->layoutObject() && !enclosingElementWithTag(firstPositionInOrBeforeNode(n), selectTag)) {
             next = Strategy::nextSkippingChildren(*n);
             // Don't skip over pastEnd.
             if (pastEnd && Strategy::isDescendantOf(*pastEnd, *n))
                 next = pastEnd;
         } else {
             // Add the node to the markup if we're not skipping the descendants
             if (markupAccumulator)
-                markupAccumulator->appendStartTag(*n);
+                appendStartMarkup(*markupAccumulator, *n);
 
             // If node has no children, close the tag now.
             if (Strategy::hasChildren(*n)) {
                 ancestorsToClose.append(toContainerNode(n));
                 continue;
             }
             if (markupAccumulator && n->isElementNode())
                 markupAccumulator->appendEndTag(toElement(*n));
             lastClosed = n;
         }
@@ skipping 39 matching lines @@
     }
 
     return lastClosed;
 }
 
 template<typename Strategy>
 bool StyledMarkupSerializer<Strategy>::needsInlineStyle(const Element& element)
 {
     if (!element.isHTMLElement())
         return false;
-    if (m_shouldAnnotate == AnnotateForInterchange)
+    if (shouldAnnotate())
         return true;
     return convertBlocksToInlines() && isBlock(&element);
 }
 
 template<typename Strategy>
 void StyledMarkupSerializer<Strategy>::wrapWithNode(StyledMarkupAccumulator& accumulator, ContainerNode& node, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
     StringBuilder markup;
     if (node.isDocumentNode()) {
         MarkupFormatter::appendXMLDeclaration(markup, toDocument(node));
         accumulator.pushMarkup(markup.toString());
         return;
     }
     if (!node.isElementNode())
         return;
     Element& element = toElement(node);
-    if (accumulator.shouldApplyWrappingStyle(element) || needsInlineStyle(element))
+    if (shouldApplyWrappingStyle(accumulator, element) || needsInlineStyle(element))
         accumulator.appendElementWithInlineStyle(markup, element, style);
     else
         accumulator.appendElement(markup, element);
     accumulator.pushMarkup(markup.toString());
     accumulator.appendEndTag(toElement(node));
 }
 
 template<typename Strategy>
 RefPtrWillBeRawPtr<EditingStyle> StyledMarkupSerializer<Strategy>::createInlineStyleIfNeeded(StyledMarkupAccumulator& accumulator, Node& node)
 {
     if (!node.isElementNode())
         return nullptr;
     RefPtrWillBeRawPtr<EditingStyle> inlineStyle = accumulator.createInlineStyle(toElement(node));
     if (convertBlocksToInlines() && isBlock(&node))
         inlineStyle->forceInline();
     return inlineStyle;
 }
 
+template<typename Strategy>
+void StyledMarkupSerializer<Strategy>::appendStartMarkup(StyledMarkupAccumulator& accumulator, Node& node)
+{
+    switch (node.nodeType()) {
+    case Node::TEXT_NODE: {
+        Text& text = toText(node);
+        if (text.parentElement() && text.parentElement()->tagQName() == textareaTag) {
+            accumulator.appendText(text);
+            return;
+        }
+        RefPtrWillBeRawPtr<EditingStyle> style = nullptr;

[yosin_UTC9, 2015/06/16 08:23:56]

s/style/inlineStyle/

[hajimehoshi, 2015/06/16 08:58:17]

Done.

+        if (shouldApplyWrappingStyle(accumulator, text)) {
+            style = accumulator.wrappingStyle()->copy();
+            // FIXME: <rdar://problem/5371536> Style rules that match pasted content can change it's appearance
+            // Make sure spans are inline style in paste side e.g. span { display: block }.
+            style->forceInline();
+            // FIXME: Should this be included in forceInline?
+            style->style()->setProperty(CSSPropertyFloat, CSSValueNone);
+        }
+        accumulator.appendTextWithInlineStyle(text, style);
+        break;
+    } case Node::ELEMENT_NODE: {
+        Element& element = toElement(node);
+        RefPtrWillBeRawPtr<EditingStyle> style = accumulator.createInlineStyle(element);
+        if ((element.isHTMLElement() && shouldAnnotate()) || shouldApplyWrappingStyle(accumulator, element)) {
+            accumulator.appendElementWithInlineStyle(element, style);
+            return;
+        }
+        accumulator.appendElement(element);
+        break;
+    }
+    default:
+        accumulator.appendStartMarkup(node);
+        break;
+    }
+}
+
+template<typename Strategy>
+bool StyledMarkupSerializer<Strategy>::shouldApplyWrappingStyle(StyledMarkupAccumulator& accumulator, const Node& node) const

[yosin_UTC9, 2015/06/16 08:23:56]

|const StyledMarkupAccumulator&|

[hajimehoshi, 2015/06/16 08:58:17]

Done.

+{
+    return accumulator.highestNodeToBeSerialized() && Strategy::parent(*accumulator.highestNodeToBeSerialized()) == Strategy::parent(node)
+        && accumulator.wrappingStyle() && accumulator.wrappingStyle()->style();
+}
+
 template class StyledMarkupSerializer<EditingStrategy>;
 
 } // namespace blink