| Index: Source/core/editing/EditingStyle.h
|
| diff --git a/Source/core/editing/EditingStyle.h b/Source/core/editing/EditingStyle.h
|
| index 8838f3aea0dfdb5f106713fe2ca9551d46d259f9..b4bf3f7c9d6f5cf4f358a9f9e25d8d59d2964377 100644
|
| --- a/Source/core/editing/EditingStyle.h
|
| +++ b/Source/core/editing/EditingStyle.h
|
| @@ -56,7 +56,7 @@ class MutableStylePropertySet;
|
| class Node;
|
| class Position;
|
| class QualifiedName;
|
| -class LayoutStyle;
|
| +class ComputedStyle;
|
| class StylePropertySet;
|
| class VisibleSelection;
|
|
|
| @@ -151,9 +151,9 @@ private:
|
| explicit EditingStyle(const StylePropertySet*);
|
| EditingStyle(CSSPropertyID, const String& value);
|
| void init(Node*, PropertiesToInclude);
|
| - void removeTextFillAndStrokeColorsIfNeeded(const LayoutStyle*);
|
| + void removeTextFillAndStrokeColorsIfNeeded(const ComputedStyle*);
|
| void setProperty(CSSPropertyID, const String& value, bool important = false);
|
| - void replaceFontSizeByKeywordIfPossible(const LayoutStyle*, CSSComputedStyleDeclaration*);
|
| + void replaceFontSizeByKeywordIfPossible(const ComputedStyle*, CSSComputedStyleDeclaration*);
|
| void extractFontSizeDelta();
|
| TriState triStateOfStyle(CSSStyleDeclaration* styleToCompare, ShouldIgnoreTextOnlyProperties) const;
|
| bool conflictsWithInlineStyleOfElement(HTMLElement*, EditingStyle* extractedStyle, Vector<CSSPropertyID>* conflictingProperties) const;
|
|
|