Refactoring: Add StyledMarkupAccumulator::createInlineStyle from appendElement

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 119 matching lines @@
 
     if (wrappingSpan)
         out.append("</span>");
 }
 
 void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element)
 {
     appendElement(out, element, false, DoesFullySelectNode);
 }
 
+RefPtrWillBeRawPtr<EditingStyle> StyledMarkupAccumulator::createInlineStyle(Element& element, bool addDisplayInline, StyledMarkupAccumulator::RangeFullySelectsNode rangeFullySelectsNode)
+{
+    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)
 {
     const bool documentIsHTML = element.document().isHTMLDocument();
     m_formatter.appendOpenTag(out, element, 0);
 
-    const bool shouldAnnotateOrForceInline = element.isHTMLElement() && (shouldAnnotate() || addDisplayInline);
-    const bool shouldOverrideStyleAttr = shouldAnnotateOrForceInline || shouldApplyWrappingStyle(element);
+    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> 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()) {
+        RefPtrWillBeRawPtr<EditingStyle> inlineStyle = createInlineStyle(element, addDisplayInline, rangeFullySelectsNode);
+        if (!inlineStyle->isEmpty()) {
             out.appendLiteral(" style=\"");
-            MarkupFormatter::appendAttributeValue(out, newInlineStyle->style()->asText(), documentIsHTML);
+            MarkupFormatter::appendAttributeValue(out, inlineStyle->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 58 matching lines @@
 {
     return m_shouldAnnotate == AnnotateForInterchange;
 }
 
 void StyledMarkupAccumulator::pushMarkup(const String& str)
 {
     m_reversedPrecedingMarkup.append(str);
 }
 
 } // namespace blink