Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: sky/engine/core/editing/EditingStyle.h

Issue 780443002: Remove dead code from EditingStyle. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: try again Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sky/engine/core/editing/EditingStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/EditingStyle.h
diff --git a/sky/engine/core/editing/EditingStyle.h b/sky/engine/core/editing/EditingStyle.h
index a6ee7afb5848eeb619be7c1e65fc586fc7a98645..9383d75270ae23da397efd5289b2a30acfe87625 100644
--- a/sky/engine/core/editing/EditingStyle.h
+++ b/sky/engine/core/editing/EditingStyle.h
@@ -66,8 +66,6 @@ class EditingStyle final : public RefCounted<EditingStyle> {
public:
enum PropertiesToInclude { AllProperties, OnlyEditingInheritableProperties, EditingPropertiesInEffect };
- enum ShouldPreserveWritingDirection { PreserveWritingDirection, DoNotPreserveWritingDirection };
- enum ShouldExtractMatchingStyle { ExtractMatchingStyle, DoNotExtractMatchingStyle };
static float NoFontDelta;
static PassRefPtr<EditingStyle> create()
@@ -98,50 +96,17 @@ public:
~EditingStyle();
MutableStylePropertySet* style() { return m_mutableStyle.get(); }
- bool textDirection(WritingDirection&) const;
+
bool isEmpty() const;
- void overrideWithStyle(const StylePropertySet*);
+
void clear();
PassRefPtr<EditingStyle> copy() const;
- PassRefPtr<EditingStyle> extractAndRemoveBlockProperties();
- PassRefPtr<EditingStyle> extractAndRemoveTextDirection();
+
void removeBlockProperties();
- void removeStyleAddedByElement(Element*);
- void removeStyleConflictingWithStyleOfElement(Element*);
- void collapseTextDecorationProperties();
- enum ShouldIgnoreTextOnlyProperties { IgnoreTextOnlyProperties, DoNotIgnoreTextOnlyProperties };
- TriState triStateOfStyle(EditingStyle*) const;
- TriState triStateOfStyle(const VisibleSelection&) const;
- bool conflictsWithInlineStyleOfElement(HTMLElement* element) const { return conflictsWithInlineStyleOfElement(element, 0, 0); }
- bool conflictsWithInlineStyleOfElement(HTMLElement* element, EditingStyle* extractedStyle, Vector<CSSPropertyID>& conflictingProperties) const
- {
- return conflictsWithInlineStyleOfElement(element, extractedStyle, &conflictingProperties);
- }
- bool conflictsWithImplicitStyleOfElement(HTMLElement*, EditingStyle* extractedStyle = 0, ShouldExtractMatchingStyle = DoNotExtractMatchingStyle) const;
- bool conflictsWithImplicitStyleOfAttributes(HTMLElement*) const;
- bool extractConflictingImplicitStyleOfAttributes(HTMLElement*, ShouldPreserveWritingDirection, EditingStyle* extractedStyle,
- Vector<QualifiedName>& conflictingAttributes, ShouldExtractMatchingStyle) const;
- bool styleIsPresentInComputedStyleOfNode(Node*) const;
static bool elementIsStyledSpanOrHTMLEquivalent(const HTMLElement*);
void mergeTypingStyle(Document*);
- enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues };
- void mergeInlineStyleOfElement(HTMLElement*, CSSPropertyOverrideMode, PropertiesToInclude = AllProperties);
- static PassRefPtr<EditingStyle> wrappingStyleForSerialization(ContainerNode* context, bool shouldAnnotate);
- void mergeStyleFromRules(Element*);
- void mergeStyleFromRulesForSerialization(Element*);
- void removeStyleFromRulesAndContext(Element*, ContainerNode* context);
- void removePropertiesInElementDefaultStyle(Element*);
- void addAbsolutePositioningFromElement(const Element&);
- void forceInline();
- int legacyFontSize(Document*) const;
-
- float fontSizeDelta() const { return m_fontSizeDelta; }
- bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; }
-
- static PassRefPtr<EditingStyle> styleAtSelectionStart(const VisibleSelection&, bool shouldUseBackgroundColorInEffect = false);
- static WritingDirection textDirectionForSelection(const VisibleSelection&, EditingStyle* typingStyle, bool& hasNestedOrMultipleEmbeddings);
private:
EditingStyle();
@@ -154,9 +119,8 @@ private:
void setProperty(CSSPropertyID, const String& value, bool important = false);
void replaceFontSizeByKeywordIfPossible(RenderStyle*, CSSComputedStyleDeclaration*);
void extractFontSizeDelta();
- TriState triStateOfStyle(CSSStyleDeclaration* styleToCompare, ShouldIgnoreTextOnlyProperties) const;
- bool conflictsWithInlineStyleOfElement(HTMLElement*, EditingStyle* extractedStyle, Vector<CSSPropertyID>* conflictingProperties) const;
- void mergeInlineAndImplicitStyleOfElement(Element*, CSSPropertyOverrideMode, PropertiesToInclude);
+
+ enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues };
void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
RefPtr<MutableStylePropertySet> m_mutableStyle;
@@ -167,70 +131,6 @@ private:
friend class HTMLAttributeEquivalent;
};
-class StyleChange {
-public:
- StyleChange()
- : m_applyBold(false)
- , m_applyItalic(false)
- , m_applyUnderline(false)
- , m_applyLineThrough(false)
- , m_applySubscript(false)
- , m_applySuperscript(false)
- { }
-
- StyleChange(EditingStyle*, const Position&);
-
- String cssStyle() const { return m_cssStyle; }
- bool applyBold() const { return m_applyBold; }
- bool applyItalic() const { return m_applyItalic; }
- bool applyUnderline() const { return m_applyUnderline; }
- bool applyLineThrough() const { return m_applyLineThrough; }
- bool applySubscript() const { return m_applySubscript; }
- bool applySuperscript() const { return m_applySuperscript; }
- bool applyFontColor() const { return m_applyFontColor.length() > 0; }
- bool applyFontFace() const { return m_applyFontFace.length() > 0; }
- bool applyFontSize() const { return m_applyFontSize.length() > 0; }
-
- String fontColor() { return m_applyFontColor; }
- String fontFace() { return m_applyFontFace; }
- String fontSize() { return m_applyFontSize; }
-
- bool operator==(const StyleChange& other)
- {
- return m_cssStyle == other.m_cssStyle
- && m_applyBold == other.m_applyBold
- && m_applyItalic == other.m_applyItalic
- && m_applyUnderline == other.m_applyUnderline
- && m_applyLineThrough == other.m_applyLineThrough
- && m_applySubscript == other.m_applySubscript
- && 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*, MutableStylePropertySet*, FixedPitchFontType);
-
- 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.
-CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID);
-CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID);
-
} // namespace blink
#endif // SKY_ENGINE_CORE_EDITING_EDITINGSTYLE_H_
« no previous file with comments | « no previous file | sky/engine/core/editing/EditingStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698