Move StyledMarkupAccumulator::shouldApplyWrappingStyle to its serializer

Source/core/editing/StyledMarkupAccumulator.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 33 matching lines @@
     size_t length = 0;
     for (const auto& string : strings)
         length += string.length();
     return length;
 }
 
 } // namespace
 
 using namespace HTMLNames;
 
-StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, Node* highestNodeToBeSerialized)
+StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate)
     : m_formatter(shouldResolveURLs)
     , m_start(start)
     , m_end(end)
     , m_document(document)
     , m_shouldAnnotate(shouldAnnotate)
-    , m_highestNodeToBeSerialized(highestNodeToBeSerialized)
 {
 }
 
 void StyledMarkupAccumulator::appendEndTag(const Element& element)
 {
     appendEndMarkup(m_result, element);
 }
 
 void StyledMarkupAccumulator::appendStartMarkup(Node& node)
 {
@@ skipping 16 matching lines @@
     }
     if (m_start.isNotNull()) {
         if (text == m_start.text()) {
             start = m_start.offset();
             length -= start;
         }
     }
     MarkupFormatter::appendCharactersReplacingEntities(m_result, str, start, length, m_formatter.entityMaskForText(text));
 }
 
-void StyledMarkupAccumulator::appendTextWithInlineStyle(Text& text)
+void StyledMarkupAccumulator::appendTextWithInlineStyle(Text& text, PassRefPtrWillBeRawPtr<EditingStyle> inlineStyle)
 {
-    const bool wrappingSpan = shouldApplyWrappingStyle(text);
-    if (wrappingSpan) {
-        RefPtrWillBeRawPtr<EditingStyle> wrappingStyle = m_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 }.
-        wrappingStyle->forceInline();
-        // FIXME: Should this be included in forceInline?
-        wrappingStyle->style()->setProperty(CSSPropertyFloat, CSSValueNone);
-
+    if (inlineStyle) {
         // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
-        ASSERT(propertyMissingOrEqualToNone(wrappingStyle->style(), CSSPropertyWebkitTextDecorationsInEffect));
+        ASSERT(propertyMissingOrEqualToNone(inlineStyle->style(), CSSPropertyWebkitTextDecorationsInEffect));
         ASSERT(m_document);
 
         m_result.appendLiteral("<span style=\"");
-        MarkupFormatter::appendAttributeValue(m_result, wrappingStyle->style()->asText(), m_document->isHTMLDocument());
+        MarkupFormatter::appendAttributeValue(m_result, inlineStyle->style()->asText(), m_document->isHTMLDocument());
         m_result.appendLiteral("\">");
     }
-
     if (!shouldAnnotate()) {
         appendText(text);
     } else {
         const bool useRenderedText = !enclosingElementWithTag(firstPositionInNode(&text), selectTag);
         String content = useRenderedText ? renderedText(text) : stringValueForRange(text);
         StringBuilder buffer;
         MarkupFormatter::appendCharactersReplacingEntities(buffer, content, 0, content.length(), EntityMaskInPCDATA);
         m_result.append(convertHTMLTextToInterchangeFormat(buffer.toString(), text));
     }
-
-    if (wrappingSpan)
+    if (inlineStyle)
         m_result.append("</span>");
 }
 
-void StyledMarkupAccumulator::appendElement(const Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
+void StyledMarkupAccumulator::appendElementWithInlineStyle(const Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
-    if ((element.isHTMLElement() && shouldAnnotate()) || shouldApplyWrappingStyle(element)) {
-        appendElementWithInlineStyle(m_result, element, style);
-        return;
-    }
-    appendElement(m_result, element);
+    appendElementWithInlineStyle(m_result, element, style);
 }
 
 void StyledMarkupAccumulator::appendElementWithInlineStyle(StringBuilder& out, const Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
     const bool documentIsHTML = element.document().isHTMLDocument();
     m_formatter.appendOpenTag(out, element, nullptr);
     AttributeCollection attributes = element.attributes();
     for (const auto& attribute : attributes) {
         // We'll handle the style attribute separately, below.
         if (attribute.name() == styleAttr)
             continue;
         m_formatter.appendAttribute(out, element, attribute, nullptr);
     }
     if (style && !style->isEmpty()) {
         out.appendLiteral(" style=\"");
         MarkupFormatter::appendAttributeValue(out, style->style()->asText(), documentIsHTML);
         out.append('\"');
     }
     m_formatter.appendCloseTag(out, element);
 }
 
+void StyledMarkupAccumulator::appendElement(const Element& element)
+{
+    appendElement(m_result, element);
+}
+
 void StyledMarkupAccumulator::appendElement(StringBuilder& out, const Element& element)
 {
     m_formatter.appendOpenTag(out, element, nullptr);
     AttributeCollection attributes = element.attributes();
     for (const auto& attribute : attributes)
         m_formatter.appendAttribute(out, element, attribute, nullptr);
     m_formatter.appendCloseTag(out, element);
 }
 
 void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style)
@@ skipping 42 matching lines @@
         return node.data();
 
     String str = node.data();
     if (m_start.text() == node)
         str.truncate(m_end.offset());
     if (m_end.text() == node)
         str.remove(0, m_start.offset());
     return str;
 }
 
-bool StyledMarkupAccumulator::shouldApplyWrappingStyle(const Node& node) const
-{
-    // TODO(hajimehoshi): Use Strategy
-    return m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode() == node.parentNode()
-        && m_wrappingStyle && m_wrappingStyle->style();
-}
-
 bool StyledMarkupAccumulator::shouldAnnotate() const
 {
     return m_shouldAnnotate == AnnotateForInterchange;
 }
 
 void StyledMarkupAccumulator::pushMarkup(const String& str)
 {
     m_reversedPrecedingMarkup.append(str);
 }
 
 void StyledMarkupAccumulator::appendInterchangeNewline()
 {
     DEFINE_STATIC_LOCAL(const String, interchangeNewlineString, ("<br class=\"" AppleInterchangeNewline "\">"));
     m_result.append(interchangeNewlineString);
 }
 
 } // namespace blink