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 45 matching lines @@
 
 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));
+        appendText(toText(node));
         break;
-    case Node::ELEMENT_NODE:
-        appendElement(result, toElement(node));
+    case Node::ELEMENT_NODE: {
+        Element& element = toElement(node);
+        RefPtrWillBeRawPtr<EditingStyle> style = createInlineStyle(element, false);
+        appendElement(element, style);
         break;
+    }
     default:
         m_formatter.appendStartMarkup(result, node, nullptr);
         break;
     }
 }
 
 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)
+void StyledMarkupAccumulator::appendElement(Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
-    appendElement(out, element, false, DoesFullySelectNode);
+    appendElement(m_result, element, false, style);
 }
 
-RefPtrWillBeRawPtr<EditingStyle> StyledMarkupAccumulator::createInlineStyle(Element& element, bool addDisplayInline, StyledMarkupAccumulator::RangeFullySelectsNode rangeFullySelectsNode)
+RefPtrWillBeRawPtr<EditingStyle> StyledMarkupAccumulator::createInlineStyle(Element& element, bool addDisplayInline)
 {
     const bool shouldAnnotateOrForceInline = element.isHTMLElement() && (shouldAnnotate() || addDisplayInline);
 
     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)
         return inlineStyle;
 
     if (shouldAnnotate())
         inlineStyle->mergeStyleFromRulesForSerialization(&toHTMLElement(element));
 
     if (addDisplayInline)
         inlineStyle->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 && inlineStyle->style())
-        inlineStyle->style()->removeProperty(CSSPropertyFloat);
     return inlineStyle;
 }
 
-void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element, bool addDisplayInline, StyledMarkupAccumulator::RangeFullySelectsNode rangeFullySelectsNode)
+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 shouldOverrideStyleAttr = (element.isHTMLElement() && (shouldAnnotate() || addDisplayInline)) || 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> inlineStyle = createInlineStyle(element, addDisplayInline, rangeFullySelectsNode);
-        if (!inlineStyle->isEmpty()) {
+        if (style && !style->isEmpty()) {
             out.appendLiteral(" style=\"");
-            MarkupFormatter::appendAttributeValue(out, inlineStyle->style()->asText(), documentIsHTML);
+            MarkupFormatter::appendAttributeValue(out, style->style()->asText(), documentIsHTML);
             out.append('\"');
         }
     }
 
     m_formatter.appendCloseTag(out, element);
 }
 
 void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style)
 {
     // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
@@ skipping 64 matching lines @@
     m_reversedPrecedingMarkup.append(str);
 }
 
 void StyledMarkupAccumulator::appendInterchangeNewline()
 {
     DEFINE_STATIC_LOCAL(const String, interchangeNewlineString, ("<br class=\"" AppleInterchangeNewline "\">"));
     m_result.append(interchangeNewlineString);
 }
 
 } // namespace blink