| Index: third_party/WebKit/Source/core/editing/EditingStyle.h
|
| diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.h b/third_party/WebKit/Source/core/editing/EditingStyle.h
|
| index 1b394a4aab4ae18fd6918377883145a539fa8b56..d2b8baf4ee01b54b3262659e717bc7a2c6dd90c4 100644
|
| --- a/third_party/WebKit/Source/core/editing/EditingStyle.h
|
| +++ b/third_party/WebKit/Source/core/editing/EditingStyle.h
|
| @@ -135,7 +135,7 @@ public:
|
| float fontSizeDelta() const { return m_fontSizeDelta; }
|
| bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; }
|
|
|
| - static EditingStyle* styleAtSelectionStart(const VisibleSelection&, bool shouldUseBackgroundColorInEffect = false);
|
| + static EditingStyle* styleAtSelectionStart(const VisibleSelection&, bool shouldUseBackgroundColorInEffect = false, MutableStylePropertySet* styleToCheck = nullptr);
|
| static WritingDirection textDirectionForSelection(const VisibleSelection&, EditingStyle* typingStyle, bool& hasNestedOrMultipleEmbeddings);
|
| static bool isEmbedOrIsolate(CSSValueID unicodeBidi)
|
| {
|
| @@ -163,6 +163,7 @@ private:
|
| Member<MutableStylePropertySet> m_mutableStyle;
|
| bool m_isMonospaceFont;
|
| float m_fontSizeDelta;
|
| + bool m_isVerticalAlign = false;
|
|
|
| friend class HTMLElementEquivalent;
|
| friend class HTMLAttributeEquivalent;
|
|
|