Refactoring: Separate StyledMarkupAccumulator::appendText into this and appendTextWithInlineStyle

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 78 matching lines @@
     }
 }
 
 void StyledMarkupAccumulator::appendEndMarkup(StringBuilder& result, const Element& element)
 {
     m_formatter.appendEndMarkup(result, element);
 }
 
 void StyledMarkupAccumulator::appendText(Text& text)
 {
-    appendText(m_result, text);
+    if (text.parentElement() && text.parentElement()->tagQName() == textareaTag) {
+        appendText(m_result, text);
+        return;
+    }
+    appendTextWithInlineStyle(m_result, text);
 }
 
 void StyledMarkupAccumulator::appendText(StringBuilder& out, Text& text)
 {
-    const bool parentIsTextarea = text.parentElement() && text.parentElement()->tagQName() == textareaTag;
-    const bool wrappingSpan = shouldApplyWrappingStyle(text) && !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));
+}
+
+void StyledMarkupAccumulator::appendTextWithInlineStyle(StringBuilder& out, Text& text)
+{
+    const bool wrappingSpan = shouldApplyWrappingStyle(text);
     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);
 
         // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
         ASSERT(propertyMissingOrEqualToNone(wrappingStyle->style(), CSSPropertyWebkitTextDecorationsInEffect));
         ASSERT(m_document);
 
         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));
+    if (!shouldAnnotate()) {
+        appendText(out, 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("</span>");
@@ skipping 127 matching lines @@
     m_reversedPrecedingMarkup.append(str);
 }
 
 void StyledMarkupAccumulator::appendInterchangeNewline()
 {
     DEFINE_STATIC_LOCAL(const String, interchangeNewlineString, ("<br class=\"" AppleInterchangeNewline "\">"));
     m_result.append(interchangeNewlineString);
 }
 
 } // namespace blink