Chromium Code Reviews| Index: Source/core/editing/EditingStyle.h |
| diff --git a/Source/core/editing/EditingStyle.h b/Source/core/editing/EditingStyle.h |
| index f259361b3715b531415134d7ea348aeeff777a8f..d983957e3fa54e3366f15584e3d8fca21e87e7c3 100644 |
| --- a/Source/core/editing/EditingStyle.h |
| +++ b/Source/core/editing/EditingStyle.h |
| @@ -126,7 +126,8 @@ public: |
| void mergeTypingStyle(Document*); |
| enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues }; |
| void mergeInlineStyleOfElement(HTMLElement*, CSSPropertyOverrideMode, PropertiesToInclude = AllProperties); |
| - static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerialization(ContainerNode* context, bool shouldAnnotate); |
| + static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerializationAnnotateForInterchange(ContainerNode* context); |
|
yosin_UTC9
2015/06/23 13:30:07
This name is confusing.
How about
- wrappingStyle
hajimehoshi
2015/06/24 05:16:42
Done.
|
| + static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerialization(ContainerNode* context); |
| void mergeStyleFromRules(Element*); |
| void mergeStyleFromRulesForSerialization(Element*); |
| void removeStyleFromRulesAndContext(Element*, ContainerNode* context); |