Chromium Code Reviews| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 | 125 |
| 126 void prepareToApplyAt(const Position&, ShouldPreserveWritingDirection = DoNo tPreserveWritingDirection); | 126 void prepareToApplyAt(const Position&, ShouldPreserveWritingDirection = DoNo tPreserveWritingDirection); |
| 127 void mergeTypingStyle(Document*); | 127 void mergeTypingStyle(Document*); |
| 128 enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues }; | 128 enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues }; |
| 129 void mergeInlineStyleOfElement(Element*, CSSPropertyOverrideMode, Properties ToInclude = AllProperties); | 129 void mergeInlineStyleOfElement(Element*, CSSPropertyOverrideMode, Properties ToInclude = AllProperties); |
| 130 static PassRefPtr<EditingStyle> wrappingStyleForSerialization(Node* context, bool shouldAnnotate); | 130 static PassRefPtr<EditingStyle> wrappingStyleForSerialization(Node* context, bool shouldAnnotate); |
| 131 void mergeStyleFromRules(Element*); | 131 void mergeStyleFromRules(Element*); |
| 132 void mergeStyleFromRulesForSerialization(Element*); | 132 void mergeStyleFromRulesForSerialization(Element*); |
| 133 void removeStyleFromRulesAndContext(Element*, Node* context); | 133 void removeStyleFromRulesAndContext(Element*, Node* context); |
| 134 void removePropertiesInElementDefaultStyle(Element*); | 134 void removePropertiesInElementDefaultStyle(Element*); |
| 135 void addAbsolutePositioningFromElement(Element*); | |
|
esprehn
2014/05/29 21:32:10
Should take a reference.
| |
| 135 void forceInline(); | 136 void forceInline(); |
| 136 int legacyFontSize(Document*) const; | 137 int legacyFontSize(Document*) const; |
| 137 | 138 |
| 138 float fontSizeDelta() const { return m_fontSizeDelta; } | 139 float fontSizeDelta() const { return m_fontSizeDelta; } |
| 139 bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; } | 140 bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; } |
| 140 | 141 |
| 141 static PassRefPtr<EditingStyle> styleAtSelectionStart(const VisibleSelection &, bool shouldUseBackgroundColorInEffect = false); | 142 static PassRefPtr<EditingStyle> styleAtSelectionStart(const VisibleSelection &, bool shouldUseBackgroundColorInEffect = false); |
| 142 static WritingDirection textDirectionForSelection(const VisibleSelection&, E ditingStyle* typingStyle, bool& hasNestedOrMultipleEmbeddings); | 143 static WritingDirection textDirectionForSelection(const VisibleSelection&, E ditingStyle* typingStyle, bool& hasNestedOrMultipleEmbeddings); |
| 143 private: | 144 private: |
| 144 EditingStyle(); | 145 EditingStyle(); |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 224 String m_applyFontSize; | 225 String m_applyFontSize; |
| 225 }; | 226 }; |
| 226 | 227 |
| 227 // FIXME: Remove these functions or make them non-global to discourage using CSS StyleDeclaration directly. | 228 // FIXME: Remove these functions or make them non-global to discourage using CSS StyleDeclaration directly. |
| 228 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID); | 229 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID); |
| 229 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID); | 230 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID); |
| 230 | 231 |
| 231 } // namespace WebCore | 232 } // namespace WebCore |
| 232 | 233 |
| 233 #endif // EditingStyle_h | 234 #endif // EditingStyle_h |
| OLD | NEW |