Revert of Avoid style clobbering in setCompositionFromExistingText.

Source/core/editing/markers/DocumentMarker.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 50 matching lines @@
 inline DocumentMarkerDescription* toDocumentMarkerDescription(DocumentMarkerDetails* details)
 {
     if (details && details->isDescription())
         return static_cast<DocumentMarkerDescription*>(details);
     return 0;
 }
 
 
 class DocumentMarkerTextMatch final : public DocumentMarkerDetails {
 public:
-    static PassRefPtrWillBeRawPtr<DocumentMarkerTextMatch> create(bool);
+    static PassRefPtrWillBeRawPtr<DocumentMarkerTextMatch> instanceFor(bool);
 
     bool activeMatch() const { return m_match; }
     bool isTextMatch() const override { return true; }
 
 private:
     explicit DocumentMarkerTextMatch(bool match)
         : m_match(match)
     {
     }
 
     bool m_match;
 };
 
-PassRefPtrWillBeRawPtr<DocumentMarkerTextMatch> DocumentMarkerTextMatch::create(bool match)
+PassRefPtrWillBeRawPtr<DocumentMarkerTextMatch> DocumentMarkerTextMatch::instanceFor(bool match)
 {
     DEFINE_STATIC_REF_WILL_BE_PERSISTENT(DocumentMarkerTextMatch, trueInstance, (adoptRefWillBeNoop(new DocumentMarkerTextMatch(true))));
     DEFINE_STATIC_REF_WILL_BE_PERSISTENT(DocumentMarkerTextMatch, falseInstance, (adoptRefWillBeNoop(new DocumentMarkerTextMatch(false))));
     return match ? trueInstance : falseInstance;
 }
 
 inline DocumentMarkerTextMatch* toDocumentMarkerTextMatch(DocumentMarkerDetails* details)
 {
     if (details && details->isTextMatch())
         return static_cast<DocumentMarkerTextMatch*>(details);
     return 0;
 }
 
-class TextCompositionMarkerDetails final : public DocumentMarkerDetails {
-public:
-    static PassRefPtrWillBeRawPtr<TextCompositionMarkerDetails> create(Color underlineColor, bool thick, Color backgroundColor);
-
-    bool isComposition() const override { return true; }
-    Color underlineColor() const { return m_underlineColor; }
-    bool thick() const { return m_thick; }
-    Color backgroundColor() const { return m_backgroundColor; }
-
-private:
-    TextCompositionMarkerDetails(Color underlineColor, bool thick, Color backgroundColor)
-        : m_underlineColor(underlineColor)
-        , m_backgroundColor(backgroundColor)
-        , m_thick(thick)
-    {
-    }
-
-    Color m_underlineColor;
-    Color m_backgroundColor;
-    bool m_thick;
-};
-
-PassRefPtrWillBeRawPtr<TextCompositionMarkerDetails> TextCompositionMarkerDetails::create(Color underlineColor, bool thick, Color backgroundColor)
-{
-    return adoptRefWillBeNoop(new TextCompositionMarkerDetails(underlineColor, thick, backgroundColor));
-}
-
-inline TextCompositionMarkerDetails* toTextCompositionMarkerDetails(DocumentMarkerDetails* details)
-{
-    if (details && details->isComposition())
-        return static_cast<TextCompositionMarkerDetails*>(details);
-    return nullptr;
-}
-
-
 DocumentMarker::DocumentMarker(MarkerType type, unsigned startOffset, unsigned endOffset, const String& description, uint32_t hash)
     : m_type(type)
     , m_startOffset(startOffset)
     , m_endOffset(endOffset)
     , m_details(description.isEmpty() ? nullptr : DocumentMarkerDescription::create(description))
     , m_hash(hash)
 {
 }
 
 DocumentMarker::DocumentMarker(unsigned startOffset, unsigned endOffset, bool activeMatch)
     : m_type(DocumentMarker::TextMatch)
     , m_startOffset(startOffset)
     , m_endOffset(endOffset)
-    , m_details(DocumentMarkerTextMatch::create(activeMatch))
+    , m_details(DocumentMarkerTextMatch::instanceFor(activeMatch))
     , m_hash(0)
 {
 }
-
-DocumentMarker::DocumentMarker(unsigned startOffset, unsigned endOffset, Color underlineColor, bool thick, Color backgroundColor)
-    : m_type(DocumentMarker::Composition)
-    , m_startOffset(startOffset)
-    , m_endOffset(endOffset)
-    , m_details(TextCompositionMarkerDetails::create(underlineColor, thick, backgroundColor))
-    , m_hash(0)
-{
-}
 
 DocumentMarker::DocumentMarker(const DocumentMarker& marker)
     : m_type(marker.type())
     , m_startOffset(marker.startOffset())
     , m_endOffset(marker.endOffset())
     , m_details(marker.details())
     , m_hash(marker.hash())
 {
 }
 
 void DocumentMarker::shiftOffsets(int delta)
 {
     m_startOffset += delta;
     m_endOffset +=  delta;
 }
 
 void DocumentMarker::setActiveMatch(bool active)
 {
-    m_details = DocumentMarkerTextMatch::create(active);
+    m_details = DocumentMarkerTextMatch::instanceFor(active);
 }
 
 const String& DocumentMarker::description() const
 {
     if (DocumentMarkerDescription* details = toDocumentMarkerDescription(m_details.get()))
         return details->description();
     return emptyString();
 }
 
 bool DocumentMarker::activeMatch() const
 {
     if (DocumentMarkerTextMatch* details = toDocumentMarkerTextMatch(m_details.get()))
         return details->activeMatch();
     return false;
 }
 
-Color DocumentMarker::underlineColor() const
-{
-    if (TextCompositionMarkerDetails* details = toTextCompositionMarkerDetails(m_details.get()))
-        return details->underlineColor();
-    return Color::transparent;
-}
-
-bool DocumentMarker::thick() const
-{
-    if (TextCompositionMarkerDetails* details = toTextCompositionMarkerDetails(m_details.get()))
-        return details->thick();
-    return false;
-}
-
-Color DocumentMarker::backgroundColor() const
-{
-    if (TextCompositionMarkerDetails* details = toTextCompositionMarkerDetails(m_details.get()))
-        return details->backgroundColor();
-    return Color::transparent;
-}
-
 DEFINE_TRACE(DocumentMarker)
 {
     visitor->trace(m_details);
 }
 
 } // namespace blink