Refactoring: Remove addDisplayInline parameter of StyledMarkupAccumulator::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 @@
         MarkupFormatter::appendCharactersReplacingEntities(buffer, content, 0, content.length(), EntityMaskInPCDATA);
         out.append(convertHTMLTextToInterchangeFormat(buffer.toString(), text));
     }
 
     if (wrappingSpan)
         out.append("</span>");
 }
 
 void StyledMarkupAccumulator::appendElement(Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
-    appendElement(m_result, element, false, style);
+    if ((element.isHTMLElement() && shouldAnnotate()) || shouldApplyWrappingStyle(element)) {
+        appendElementWithInlineStyle(m_result, element, style);
+        return;
+    }
+    appendElement(m_result, element);
 }
 
 RefPtrWillBeRawPtr<EditingStyle> StyledMarkupAccumulator::createInlineStyle(Element& element)
 {
     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 (element.isHTMLElement() && shouldAnnotate())
         inlineStyle->mergeStyleFromRulesForSerialization(&toHTMLElement(element));
 
     return inlineStyle;
 }
 
-void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element, bool addDisplayInline, PassRefPtrWillBeRawPtr<EditingStyle> style)
+void StyledMarkupAccumulator::appendElementWithInlineStyle(StringBuilder& out, Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
     const bool documentIsHTML = element.document().isHTMLDocument();
     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)
+        if (attribute.name() == styleAttr)
             continue;
         m_formatter.appendAttribute(out, element, attribute, nullptr);
     }
-
-    if (shouldOverrideStyleAttr) {
-        if (style && !style->isEmpty()) {
-            out.appendLiteral(" style=\"");
-            MarkupFormatter::appendAttributeValue(out, style->style()->asText(), documentIsHTML);
-            out.append('\"');
-        }
+    if (style && !style->isEmpty()) {
+        out.appendLiteral(" style=\"");
+        MarkupFormatter::appendAttributeValue(out, style->style()->asText(), documentIsHTML);
+        out.append('\"');
     }
-
     m_formatter.appendCloseTag(out, element);
 }
 
+void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element)

[tkent, 2015/06/11 08:46:08]

optional: Can we make |element| argument |const Element&|?

[hajimehoshi, 2015/06/11 08:56:14]

Done.

+{
+    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)
 {
     // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
     ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));
     ASSERT(m_document);
 
     StringBuilder openTag;
     openTag.appendLiteral("<div style=\"");
     MarkupFormatter::appendAttributeValue(openTag, style->asText(), m_document->isHTMLDocument());
     openTag.appendLiteral("\">");
@@ skipping 57 matching lines @@
     m_reversedPrecedingMarkup.append(str);
 }
 
 void StyledMarkupAccumulator::appendInterchangeNewline()
 {
     DEFINE_STATIC_LOCAL(const String, interchangeNewlineString, ("<br class=\"" AppleInterchangeNewline "\">"));
     m_result.append(interchangeNewlineString);
 }
 
 } // namespace blink