| Index: Source/core/editing/EditingStyle.h
|
| diff --git a/Source/core/editing/EditingStyle.h b/Source/core/editing/EditingStyle.h
|
| index f259361b3715b531415134d7ea348aeeff777a8f..79554ac585310a2f02a47a3e82c99b442a69a904 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> wrappingStyleForAnnotatedSerialization(ContainerNode* context);
|
| + static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerialization(ContainerNode* context);
|
| void mergeStyleFromRules(Element*);
|
| void mergeStyleFromRulesForSerialization(Element*);
|
| void removeStyleFromRulesAndContext(Element*, ContainerNode* context);
|
|
|