Revert of Avoid style clobbering in setCompositionFromExistingText.

Source/core/editing/markers/DocumentMarker.h

Index: Source/core/editing/markers/DocumentMarker.h
diff --git a/Source/core/editing/markers/DocumentMarker.h b/Source/core/editing/markers/DocumentMarker.h
index 7dde907d1d0eda6a537bc2149e85949858be2356..a7b5dccd3dbbeadf53a495d50a6e916e86b707f5 100644
--- a/Source/core/editing/markers/DocumentMarker.h
+++ b/Source/core/editing/markers/DocumentMarker.h
@@ -24,7 +24,6 @@
 #define DocumentMarker_h
 
 #include "core/CoreExport.h"
-#include "platform/graphics/Color.h"
 #include "platform/heap/Handle.h"
 #include "wtf/VectorTraits.h"
 #include "wtf/text/WTFString.h"
@@ -44,7 +43,6 @@
         GramarMarkerIndex,
         TextMatchMarkerIndex,
         InvisibleSpellcheckMarkerIndex,
-        CompositionMarkerIndex,
         MarkerTypeIndexesCount
     };
 
@@ -52,8 +50,7 @@
         Spelling = 1 << SpellingMarkerIndex,
         Grammar = 1 << GramarMarkerIndex,
         TextMatch = 1 << TextMatchMarkerIndex,
-        InvisibleSpellcheck = 1 << InvisibleSpellcheckMarkerIndex,
-        Composition = 1 << CompositionMarkerIndex,
+        InvisibleSpellcheck = 1 << InvisibleSpellcheckMarkerIndex
     };
 
     class MarkerTypes {
@@ -75,7 +72,7 @@
     class AllMarkers : public MarkerTypes {
     public:
         AllMarkers()
-            : MarkerTypes(Spelling | Grammar | TextMatch | InvisibleSpellcheck | Composition)
+            : MarkerTypes(Spelling | Grammar | TextMatch | InvisibleSpellcheck)
         {
         }
     };
@@ -98,8 +95,6 @@
 
     DocumentMarker(MarkerType, unsigned startOffset, unsigned endOffset, const String& description, uint32_t hash);
     DocumentMarker(unsigned startOffset, unsigned endOffset, bool activeMatch);
-    DocumentMarker(unsigned startOffset, unsigned endOffset, Color underlineColor, bool thick, Color backgroundColor);
-
     DocumentMarker(const DocumentMarker&);
 
     MarkerType type() const { return m_type; }
@@ -109,9 +104,6 @@
 
     const String& description() const;
     bool activeMatch() const;
-    Color underlineColor() const;
-    bool thick() const;
-    Color backgroundColor() const;
     DocumentMarkerDetails* details() const;
 
     void setActiveMatch(bool);
@@ -156,7 +148,6 @@
     virtual ~DocumentMarkerDetails();
     virtual bool isDescription() const { return false; }
     virtual bool isTextMatch() const { return false; }
-    virtual bool isComposition() const { return false; }
 
     DEFINE_INLINE_VIRTUAL_TRACE() { }
 };