| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 126 |
| 127 void prepareToApplyAt(const Position&, ShouldPreserveWritingDirection = DoNo
tPreserveWritingDirection); | 127 void prepareToApplyAt(const Position&, ShouldPreserveWritingDirection = DoNo
tPreserveWritingDirection); |
| 128 void mergeTypingStyle(Document*); | 128 void mergeTypingStyle(Document*); |
| 129 enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues }; | 129 enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues }; |
| 130 void mergeInlineStyleOfElement(Element*, CSSPropertyOverrideMode, Properties
ToInclude = AllProperties); | 130 void mergeInlineStyleOfElement(Element*, CSSPropertyOverrideMode, Properties
ToInclude = AllProperties); |
| 131 static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerialization(No
de* context, bool shouldAnnotate); | 131 static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerialization(No
de* context, bool shouldAnnotate); |
| 132 void mergeStyleFromRules(Element*); | 132 void mergeStyleFromRules(Element*); |
| 133 void mergeStyleFromRulesForSerialization(Element*); | 133 void mergeStyleFromRulesForSerialization(Element*); |
| 134 void removeStyleFromRulesAndContext(Element*, Node* context); | 134 void removeStyleFromRulesAndContext(Element*, Node* context); |
| 135 void removePropertiesInElementDefaultStyle(Element*); | 135 void removePropertiesInElementDefaultStyle(Element*); |
| 136 void addAbsolutePositioningFromElement(const Element&); |
| 136 void forceInline(); | 137 void forceInline(); |
| 137 int legacyFontSize(Document*) const; | 138 int legacyFontSize(Document*) const; |
| 138 | 139 |
| 139 float fontSizeDelta() const { return m_fontSizeDelta; } | 140 float fontSizeDelta() const { return m_fontSizeDelta; } |
| 140 bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; } | 141 bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; } |
| 141 | 142 |
| 142 static PassRefPtrWillBeRawPtr<EditingStyle> styleAtSelectionStart(const Visi
bleSelection&, bool shouldUseBackgroundColorInEffect = false); | 143 static PassRefPtrWillBeRawPtr<EditingStyle> styleAtSelectionStart(const Visi
bleSelection&, bool shouldUseBackgroundColorInEffect = false); |
| 143 static WritingDirection textDirectionForSelection(const VisibleSelection&, E
ditingStyle* typingStyle, bool& hasNestedOrMultipleEmbeddings); | 144 static WritingDirection textDirectionForSelection(const VisibleSelection&, E
ditingStyle* typingStyle, bool& hasNestedOrMultipleEmbeddings); |
| 144 | 145 |
| 145 void trace(Visitor*); | 146 void trace(Visitor*); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 String m_applyFontSize; | 229 String m_applyFontSize; |
| 229 }; | 230 }; |
| 230 | 231 |
| 231 // FIXME: Remove these functions or make them non-global to discourage using CSS
StyleDeclaration directly. | 232 // FIXME: Remove these functions or make them non-global to discourage using CSS
StyleDeclaration directly. |
| 232 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID); | 233 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID); |
| 233 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID); | 234 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID); |
| 234 | 235 |
| 235 } // namespace WebCore | 236 } // namespace WebCore |
| 236 | 237 |
| 237 #endif // EditingStyle_h | 238 #endif // EditingStyle_h |
| OLD | NEW |