Refactoring: Remove StyledMarkupAccumulator::RangeFullySelectsNodes

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 21 matching lines @@
 #include "core/css/StylePropertySet.h"
 #include "core/dom/Text.h"
 #include "core/editing/htmlediting.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
-StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, Node* highestNodeToBeSerialized, ConvertBlocksToInlines convertBlocksToInlines)
+StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, Node* highestNodeToBeSerialized)
     : m_formatter(shouldResolveURLs)
     , m_start(start)
     , m_end(end)
     , m_document(document)
     , m_shouldAnnotate(shouldAnnotate)
-    , m_convertBlocksToInlines(convertBlocksToInlines)
     , m_highestNodeToBeSerialized(highestNodeToBeSerialized)
 {
 }
 
 void StyledMarkupAccumulator::appendString(const String& str)
 {
     m_result.append(str);
 }
 
 void StyledMarkupAccumulator::appendStartTag(Node& node)
 {
     appendStartMarkup(m_result, node);
 }
 
 void StyledMarkupAccumulator::appendEndTag(const Element& element)
 {
     appendEndMarkup(m_result, element);
 }
 
 void StyledMarkupAccumulator::appendStartMarkup(StringBuilder& result, Node& node)
 {
-    switch (node.nodeType()) {
-    case Node::TEXT_NODE:
-        appendText(result, toText(node));
-        break;
-    case Node::ELEMENT_NODE:
-        appendElement(result, toElement(node));
-        break;
-    default:
-        m_formatter.appendStartMarkup(result, node, nullptr);
-        break;
-    }
+    m_formatter.appendStartMarkup(result, node, nullptr);
 }
 
 void StyledMarkupAccumulator::appendEndMarkup(StringBuilder& result, const Element& element)
 {
     m_formatter.appendEndMarkup(result, element);
 }
 
+void StyledMarkupAccumulator::appendText(Text& text)
+{
+    appendText(m_result, text);
+}
+
 void StyledMarkupAccumulator::appendText(StringBuilder& out, Text& text)
 {
     const bool parentIsTextarea = text.parentElement() && text.parentElement()->tagQName() == textareaTag;
     const bool wrappingSpan = shouldApplyWrappingStyle(text) && !parentIsTextarea;
     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?
@@ skipping 28 matching lines @@
         String content = useRenderedText ? renderedText(text) : stringValueForRange(text);
         StringBuilder buffer;
         MarkupFormatter::appendCharactersReplacingEntities(buffer, content, 0, content.length(), EntityMaskInPCDATA);
         out.append(convertHTMLTextToInterchangeFormat(buffer.toString(), text));
     }
 
     if (wrappingSpan)
         out.append("</span>");
 }
 
-void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element)
+RefPtrWillBeMember<EditingStyle> StyledMarkupAccumulator::createInlineStyle(Element& element, bool addDisplayInline)
 {
-    appendElement(out, element, false, DoesFullySelectNode);
+    const bool shouldAnnotateOrForceInline = element.isHTMLElement() && (shouldAnnotate() || addDisplayInline);
+    const bool shouldOverrideStyleAttr = shouldAnnotateOrForceInline || shouldApplyWrappingStyle(element);
+
+    if (!shouldOverrideStyleAttr)
+        return nullptr;
+
+    RefPtrWillBeRawPtr<EditingStyle> inlineStyle = nullptr;
+
+    if (shouldApplyWrappingStyle(element)) {
+        inlineStyle = m_wrappingStyle->copy();
+        inlineStyle->removePropertiesInElementDefaultStyle(&element);
+        inlineStyle->removeStyleConflictingWithStyleOfElement(&element);
+    } else {
+        inlineStyle = EditingStyle::create();
+    }
+
+    if (element.isStyledElement() && element.inlineStyle())
+        inlineStyle->overrideWithStyle(element.inlineStyle());
+
+    if (shouldAnnotateOrForceInline) {
+        if (shouldAnnotate())
+            inlineStyle->mergeStyleFromRulesForSerialization(&toHTMLElement(element));
+
+        if (addDisplayInline)
+            inlineStyle->forceInline();
+    }
+
+    return inlineStyle;
 }
 
-void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element, bool addDisplayInline, StyledMarkupAccumulator::RangeFullySelectsNode rangeFullySelectsNode)
+void StyledMarkupAccumulator::appendElement(Element& element, bool addDisplayInline, PassRefPtrWillBeRawPtr<EditingStyle> style)
+{
+    appendElement(m_result, element, addDisplayInline, style);
+}
+
+void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element, bool addDisplayInline, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
     const bool documentIsHTML = element.document().isHTMLDocument();
-    m_formatter.appendOpenTag(out, element, 0);
+    m_formatter.appendOpenTag(out, element, nullptr);
 
     const bool shouldAnnotateOrForceInline = element.isHTMLElement() && (shouldAnnotate() || addDisplayInline);
     const bool shouldOverrideStyleAttr = shouldAnnotateOrForceInline || shouldApplyWrappingStyle(element);
 
     AttributeCollection attributes = element.attributes();
     for (const auto& attribute : attributes) {
         // We'll handle the style attribute separately, below.
         if (attribute.name() == styleAttr && shouldOverrideStyleAttr)
             continue;
         m_formatter.appendAttribute(out, element, attribute, nullptr);
     }
 
     if (shouldOverrideStyleAttr) {
-        RefPtrWillBeRawPtr<EditingStyle> newInlineStyle = nullptr;
-
-        if (shouldApplyWrappingStyle(element)) {
-            newInlineStyle = m_wrappingStyle->copy();
-            newInlineStyle->removePropertiesInElementDefaultStyle(&element);
-            newInlineStyle->removeStyleConflictingWithStyleOfElement(&element);
-        } else {
-            newInlineStyle = EditingStyle::create();
-        }
-
-        if (element.isStyledElement() && element.inlineStyle())
-            newInlineStyle->overrideWithStyle(element.inlineStyle());
-
-        if (shouldAnnotateOrForceInline) {
-            if (shouldAnnotate())
-                newInlineStyle->mergeStyleFromRulesForSerialization(&toHTMLElement(element));
-
-            if (addDisplayInline)
-                newInlineStyle->forceInline();
-
-            // If the node is not fully selected by the range, then we don't want to keep styles that affect its relationship to the nodes around it
-            // only the ones that affect it and the nodes within it.
-            if (rangeFullySelectsNode == DoesNotFullySelectNode && newInlineStyle->style())
-                newInlineStyle->style()->removeProperty(CSSPropertyFloat);
-        }
-
-        if (!newInlineStyle->isEmpty()) {
+        if (style && !style->isEmpty()) {
             out.appendLiteral(" style=\"");
-            MarkupFormatter::appendAttributeValue(out, newInlineStyle->style()->asText(), documentIsHTML);
+            MarkupFormatter::appendAttributeValue(out, style->style()->asText(), documentIsHTML);
             out.append('\"');
         }
     }
 
     m_formatter.appendCloseTag(out, element);
 }
 
-void StyledMarkupAccumulator::wrapWithNode(ContainerNode& node, RangeFullySelectsNode rangeFullySelectsNode)
+void StyledMarkupAccumulator::pushMarkup(const String& str)
 {
-    StringBuilder markup;
-    if (node.isElementNode())
-        appendElement(markup, toElement(node), convertBlocksToInlines() && isBlock(&node), rangeFullySelectsNode);
-    else
-        appendStartMarkup(markup, node);
-    m_reversedPrecedingMarkup.append(markup.toString());
-    if (node.isElementNode())
-        appendEndTag(toElement(node));
+    m_reversedPrecedingMarkup.append(str);
 }
 
 void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style)
 {
     // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
     ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));
     ASSERT(m_document);
 
     StringBuilder openTag;
     openTag.appendLiteral("<div style=\"");
@@ skipping 48 matching lines @@
     return m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode() == node.parentNode()
         && m_wrappingStyle && m_wrappingStyle->style();
 }
 
 bool StyledMarkupAccumulator::shouldAnnotate() const
 {
     return m_shouldAnnotate == AnnotateForInterchange;
 }
 
 } // namespace blink