Refactoring: Remove addDisplayInline parameter of createInlineStyle

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 49 matching lines @@
 }
 
 void StyledMarkupAccumulator::appendStartMarkup(StringBuilder& result, Node& node)
 {
     switch (node.nodeType()) {
     case Node::TEXT_NODE:
         appendText(toText(node));
         break;
     case Node::ELEMENT_NODE: {
         Element& element = toElement(node);
-        RefPtrWillBeRawPtr<EditingStyle> style = createInlineStyle(element, false);
+        RefPtrWillBeRawPtr<EditingStyle> style = createInlineStyle(element);
         appendElement(element, style);
         break;
     }
     default:
         m_formatter.appendStartMarkup(result, node, nullptr);
         break;
     }
 }
 
 void StyledMarkupAccumulator::appendEndMarkup(StringBuilder& result, const Element& element)
@@ skipping 52 matching lines @@
 
     if (wrappingSpan)
         out.append("</span>");
 }
 
 void StyledMarkupAccumulator::appendElement(Element& element, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
     appendElement(m_result, element, false, style);
 }
 
-RefPtrWillBeRawPtr<EditingStyle> StyledMarkupAccumulator::createInlineStyle(Element& element, bool addDisplayInline)
+RefPtrWillBeRawPtr<EditingStyle> StyledMarkupAccumulator::createInlineStyle(Element& element)
 {
-    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())
+    if (element.isHTMLElement() && shouldAnnotate())
         inlineStyle->mergeStyleFromRulesForSerialization(&toHTMLElement(element));
 
-    if (addDisplayInline)
-        inlineStyle->forceInline();
-
     return inlineStyle;
 }
 
 void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element, bool addDisplayInline, PassRefPtrWillBeRawPtr<EditingStyle> style)
 {
     const bool documentIsHTML = element.document().isHTMLDocument();
     m_formatter.appendOpenTag(out, element, nullptr);
 
     const bool shouldOverrideStyleAttr = (element.isHTMLElement() && (shouldAnnotate() || addDisplayInline)) || shouldApplyWrappingStyle(element);
 
@@ skipping 86 matching lines @@
     m_reversedPrecedingMarkup.append(str);
 }
 
 void StyledMarkupAccumulator::appendInterchangeNewline()
 {
     DEFINE_STATIC_LOCAL(const String, interchangeNewlineString, ("<br class=\"" AppleInterchangeNewline "\">"));
     m_result.append(interchangeNewlineString);
 }
 
 } // namespace blink