Refactoring: Move StyledMarkupAccumulator::createInlineStyle to the serializer

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 222 matching lines @@
         }
 
         if (!n->layoutObject() && !enclosingElementWithTag(firstPositionInOrBeforeNode(n), selectTag)) {
             next = Strategy::nextSkippingChildren(*n);
             // Don't skip over pastEnd.
             if (pastEnd && Strategy::isDescendantOf(*pastEnd, *n))
                 next = pastEnd;
         } else {
             // Add the node to the markup if we're not skipping the descendants
             if (markupAccumulator)
-                markupAccumulator->appendStartTag(*n);
+                appendStartMarkup(*markupAccumulator, *n);
 
             // If node has no children, close the tag now.
             if (Strategy::hasChildren(*n)) {
                 ancestorsToClose.append(toContainerNode(n));
                 continue;
             }
             if (markupAccumulator && n->isElementNode())
                 markupAccumulator->appendEndTag(toElement(*n));
             lastClosed = n;
         }
@@ skipping 69 matching lines @@
         accumulator.appendElement(markup, element);
     accumulator.pushMarkup(markup.toString());
     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));
+    RefPtrWillBeRawPtr<EditingStyle> inlineStyle = createInlineStyle(accumulator, toElement(node));
     if (convertBlocksToInlines() && isBlock(&node))
         inlineStyle->forceInline();
     return inlineStyle;
 }
 
+template<typename Strategy>
+void StyledMarkupSerializer<Strategy>::appendStartMarkup(StyledMarkupAccumulator& accumulator, Node& node)
+{
+    switch (node.nodeType()) {
+    case Node::TEXT_NODE:
+        accumulator.appendText(toText(node));
+        break;
+    case Node::ELEMENT_NODE: {
+        Element& element = toElement(node);
+        RefPtrWillBeRawPtr<EditingStyle> style = createInlineStyle(accumulator, element);

[yosin_UTC9, 2015/06/17 01:07:31]

nit: better to use |inlineStyle| rather than |style|.

[hajimehoshi, 2015/06/17 04:33:51]

Done.

+        accumulator.appendElement(element, style);
+        break;
+    }
+    default:
+        accumulator.appendStartMarkup(node);
+        break;
+    }
+}
+
+template<typename Strategy>
+RefPtrWillBeRawPtr<EditingStyle> StyledMarkupSerializer<Strategy>::createInlineStyle(StyledMarkupAccumulator& accumulator, Element& element)
+{
+    RefPtrWillBeRawPtr<EditingStyle> inlineStyle = nullptr;
+
+    if (accumulator.shouldApplyWrappingStyle(element)) {
+        inlineStyle = accumulator.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;
+}
+
 template class StyledMarkupSerializer<EditingStrategy>;
 
 } // namespace blink