Move property setting/removing/addParsedProperty/addParsedProperties functions to MutableStylePrope…

Source/core/editing/EditingStyle.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple 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.
@@ skipping 32 matching lines @@
 
 namespace WebCore {
 
 class CSSStyleDeclaration;
 class CSSComputedStyleDeclaration;
 class CSSPrimitiveValue;
 class CSSValue;
 class Document;
 class Element;
 class HTMLElement;
+class MutableStylePropertySet;
 class Node;
 class Position;
 class QualifiedName;
 class RenderStyle;
 class StylePropertySet;
 class StyledElement;
 class VisibleSelection;
 
 class EditingStyle : public RefCounted<EditingStyle> {
 public:
@@ skipping 28 matching lines @@
         return adoptRef(new EditingStyle(style));
     }
 
     static PassRefPtr<EditingStyle> create(CSSPropertyID propertyID, const String& value)
     {
         return adoptRef(new EditingStyle(propertyID, value));
     }
 
     ~EditingStyle();
 
-    StylePropertySet* style() { return m_mutableStyle.get(); }
+    MutableStylePropertySet* style() { return m_mutableStyle.get(); }
     bool textDirection(WritingDirection&) const;
     bool isEmpty() const;
-    void setStyle(PassRefPtr<StylePropertySet>);
+    void setStyle(PassRefPtr<MutableStylePropertySet>);
     void overrideWithStyle(const StylePropertySet*);
     void clear();
     PassRefPtr<EditingStyle> copy() const;
     PassRefPtr<EditingStyle> extractAndRemoveBlockProperties();
     PassRefPtr<EditingStyle> extractAndRemoveTextDirection();
     void removeBlockProperties();
     void removeStyleAddedByNode(Node*);
     void removeStyleConflictingWithStyleOfNode(Node*);
     void removeNonEditingProperties();
     void collapseTextDecorationProperties();
@@ skipping 41 matching lines @@
     void init(Node*, PropertiesToInclude);
     void removeTextFillAndStrokeColorsIfNeeded(RenderStyle*);
     void setProperty(CSSPropertyID, const String& value, bool important = false);
     void replaceFontSizeByKeywordIfPossible(RenderStyle*, CSSComputedStyleDeclaration*);
     void extractFontSizeDelta();
     TriState triStateOfStyle(CSSStyleDeclaration* styleToCompare, ShouldIgnoreTextOnlyProperties) const;
     bool conflictsWithInlineStyleOfElement(StyledElement*, EditingStyle* extractedStyle, Vector<CSSPropertyID>* conflictingProperties) const;
     void mergeInlineAndImplicitStyleOfElement(StyledElement*, CSSPropertyOverrideMode, PropertiesToInclude);
     void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
 
-    RefPtr<StylePropertySet> m_mutableStyle;
+    RefPtr<MutableStylePropertySet> m_mutableStyle;
     bool m_shouldUseFixedDefaultFontSize;
     float m_fontSizeDelta;
 
     friend class HTMLElementEquivalent;
     friend class HTMLAttributeEquivalent;
 };
 
 class StyleChange {
 public:
     StyleChange()
@@ skipping 33 matching lines @@
             && m_applySuperscript == other.m_applySuperscript
             && m_applyFontColor == other.m_applyFontColor
             && m_applyFontFace == other.m_applyFontFace
             && m_applyFontSize == other.m_applyFontSize;
     }
     bool operator!=(const StyleChange& other)
     {
         return !(*this == other);
     }
 private:
-    void extractTextStyles(Document*, StylePropertySet*, bool shouldUseFixedFontDefaultSize);
+    void extractTextStyles(Document*, MutableStylePropertySet*, bool shouldUseFixedFontDefaultSize);
 
     String m_cssStyle;
     bool m_applyBold;
     bool m_applyItalic;
     bool m_applyUnderline;
     bool m_applyLineThrough;
     bool m_applySubscript;
     bool m_applySuperscript;
     String m_applyFontColor;
     String m_applyFontFace;
     String m_applyFontSize;
 };
 
 // FIXME: Remove these functions or make them non-global to discourage using CSSStyleDeclaration directly.
 int getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID);
 int getIdentifierValue(StylePropertySet*, CSSPropertyID);
 
 } // namespace WebCore
 
 #endif // EditingStyle_h