Refactoring: Remove boolean paramters from StyledMarkupAccumulator

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 19 matching lines @@
 #include "core/editing/StyledMarkupAccumulator.h"
 
 #include "core/css/StylePropertySet.h"
 #include "core/dom/Text.h"
 #include "core/editing/htmlediting.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 namespace {

[tkent, 2015/06/08 07:49:56]

Remove this namespace block.

[hajimehoshi, 2015/06/08 07:56:55]

Done.

 
-const String& styleNodeCloseTag(bool isBlock)
-{
-    DEFINE_STATIC_LOCAL(const String, divClose, ("</div>"));
-    DEFINE_STATIC_LOCAL(const String, styleSpanClose, ("</span>"));
-    return isBlock ? divClose : styleSpanClose;
-}
-
 } // namespace
 
 using namespace HTMLNames;
 
 StyledMarkupAccumulator::StyledMarkupAccumulator(EAbsoluteURLs shouldResolveURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document> document, EAnnotateForInterchange shouldAnnotate, Node* highestNodeToBeSerialized, ConvertBlocksToInlines convertBlocksToInlines)
     : m_formatter(shouldResolveURLs)
     , m_start(start)
     , m_end(end)
     , m_document(document)
     , m_shouldAnnotate(shouldAnnotate)
@@ skipping 42 matching lines @@
     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?
         wrappingStyle->style()->setProperty(CSSPropertyFloat, CSSValueNone);
 
-        appendStyleNodeOpenTag(out, wrappingStyle->style());
+        out.appendLiteral("<span style=\"");
+        MarkupFormatter::appendAttributeValue(out, wrappingStyle->style()->asText(), m_document->isHTMLDocument());
+        out.appendLiteral("\">");
     }
 
     if (!shouldAnnotate() || parentIsTextarea) {
         const String& str = text.data();
         unsigned length = str.length();
         unsigned start = 0;
         if (m_end.isNotNull()) {
             if (text == m_end.text())
                 length = m_end.offset();
         }
         if (m_start.isNotNull()) {
             if (text == m_start.text()) {
                 start = m_start.offset();
                 length -= start;
             }
         }
         MarkupFormatter::appendCharactersReplacingEntities(out, str, start, length, m_formatter.entityMaskForText(text));
     } else {
         const bool useRenderedText = !enclosingElementWithTag(firstPositionInNode(&text), selectTag);
         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(styleNodeCloseTag(false));
+        out.append("</span>");
 }
 
 void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element)
 {
     appendElement(out, element, false, DoesFullySelectNode);
 }
 
 void StyledMarkupAccumulator::appendElement(StringBuilder& out, Element& element, bool addDisplayInline, StyledMarkupAccumulator::RangeFullySelectsNode rangeFullySelectsNode)
 {
     const bool documentIsHTML = element.document().isHTMLDocument();
@@ skipping 40 matching lines @@
         if (!newInlineStyle->isEmpty()) {
             out.appendLiteral(" style=\"");
             MarkupFormatter::appendAttributeValue(out, newInlineStyle->style()->asText(), documentIsHTML);
             out.append('\"');
         }
     }
 
     m_formatter.appendCloseTag(out, element);
 }
 
-void StyledMarkupAccumulator::appendStyleNodeOpenTag(StringBuilder& out, StylePropertySet* style, bool isBlock)
-{
-    // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
-    ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));

[tkent, 2015/06/08 07:49:56]

The assertion is removed.  Is it intentional?

[hajimehoshi, 2015/06/08 07:56:55]

Oh, I forgot that. Copied.

-    if (isBlock)
-        out.appendLiteral("<div style=\"");
-    else
-        out.appendLiteral("<span style=\"");
-    ASSERT(m_document);

[tkent, 2015/06/08 07:49:56]

Ditto.

[hajimehoshi, 2015/06/08 07:56:55]

Done.

-    MarkupFormatter::appendAttributeValue(out, style->asText(), m_document->isHTMLDocument());
-    out.appendLiteral("\">");
-}
-
 void StyledMarkupAccumulator::wrapWithNode(ContainerNode& node, RangeFullySelectsNode rangeFullySelectsNode)
 {
     StringBuilder markup;
     if (node.isElementNode())
         appendElement(markup, toElement(node), convertBlocksToInlines() && isBlock(&node), rangeFullySelectsNode);
     else
         appendStartMarkup(markup, node);
     m_reversedPrecedingMarkup.append(markup.toString());
     if (node.isElementNode())
         appendEndTag(toElement(node));
 }
 
-void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style, bool isBlock)
+void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style)
 {
     StringBuilder openTag;
-    appendStyleNodeOpenTag(openTag, style, isBlock);
+    openTag.appendLiteral("<div style=\"");
+    MarkupFormatter::appendAttributeValue(openTag, style->asText(), m_document->isHTMLDocument());
+    openTag.appendLiteral("\">");
     m_reversedPrecedingMarkup.append(openTag.toString());
-    appendString(styleNodeCloseTag(isBlock));
+
+    appendString("</div>");
 }
 
 String StyledMarkupAccumulator::takeResults()
 {
     StringBuilder result;
     result.reserveCapacity(MarkupFormatter::totalLength(m_reversedPrecedingMarkup) + m_result.length());
 
     for (size_t i = m_reversedPrecedingMarkup.size(); i > 0; --i)
         result.append(m_reversedPrecedingMarkup[i - 1]);
 
@@ skipping 33 matching lines @@
     return m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode() == node.parentNode()
         && m_wrappingStyle && m_wrappingStyle->style();
 }
 
 bool StyledMarkupAccumulator::shouldAnnotate() const
 {
     return m_shouldAnnotate == AnnotateForInterchange;
 }
 
 } // namespace blink