Refactoring: Remove addDisplayInline parameter of StyledMarkupAccumulator::appendElement

Source/core/editing/StyledMarkupSerializer.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 279 matching lines @@
                 wrapWithNode(*markupAccumulator, *parent, style);
             }
             lastClosed = parent;
         }
     }
 
     return lastClosed;
 }
 
 template<typename Strategy>
+bool StyledMarkupSerializer<Strategy>::needsInlineStyle(const Element& element)
+{
+    if (!element.isHTMLElement())
+        return false;
+    if (m_shouldAnnotate == AnnotateForInterchange)
+        return true;
+    return convertBlocksToInlines() && isBlock(&element);
+}
+
+template<typename Strategy>
 void StyledMarkupSerializer<Strategy>::wrapWithNode(StyledMarkupAccumulator& accumulator, ContainerNode& node, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
     StringBuilder markup;
-    if (node.isElementNode())
-        accumulator.appendElement(markup, toElement(node), convertBlocksToInlines() && isBlock(&node), style);
+    if (!node.isElementNode()) {
+        accumulator.appendStartMarkup(markup, node);
+        accumulator.pushMarkup(markup.toString());
+        return;
+    }
+    Element& element = toElement(node);
+    if (accumulator.shouldApplyWrappingStyle(element) || needsInlineStyle(element))
+        accumulator.appendElementWithInlineStyle(markup, element, style);
     else
-        accumulator.appendStartMarkup(markup, node);
+        accumulator.appendElement(markup, element);
     accumulator.pushMarkup(markup.toString());
-    if (!node.isElementNode())
-        return;
     accumulator.appendEndTag(toElement(node));
 }
 
 template<typename Strategy>
 RefPtrWillBeRawPtr<EditingStyle> StyledMarkupSerializer<Strategy>::createInlineStyleIfNeeded(StyledMarkupAccumulator& accumulator, Node& node)
 {
     if (!node.isElementNode())
         return nullptr;
     RefPtrWillBeRawPtr<EditingStyle> inlineStyle = accumulator.createInlineStyle(toElement(node));
     if (convertBlocksToInlines() && isBlock(&node))
         inlineStyle->forceInline();
     return inlineStyle;
 }
 
 template class StyledMarkupSerializer<EditingStrategy>;
 
 } // namespace blink