Index: third_party/WebKit/Source/core/editing/EditingStyle.cpp |
diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.cpp b/third_party/WebKit/Source/core/editing/EditingStyle.cpp |
index 3a9cc01984370ff9b2e10be5888b8678a3c31040..38549a26385ffcb6649e99f7b4fc912bd1c63a54 100644 |
--- a/third_party/WebKit/Source/core/editing/EditingStyle.cpp |
+++ b/third_party/WebKit/Source/core/editing/EditingStyle.cpp |
@@ -557,7 +557,7 @@ bool EditingStyle::textDirection(WritingDirection& writingDirection) const |
return false; |
CSSValueID unicodeBidiValue = toCSSPrimitiveValue(unicodeBidi.get())->getValueID(); |
- if (unicodeBidiValue == CSSValueEmbed) { |
+ if (isEmbedOrIsolate(unicodeBidiValue)) { |
RefPtrWillBeRawPtr<CSSValue> direction = m_mutableStyle->getPropertyCSSValue(CSSPropertyDirection); |
if (!direction || !direction->isPrimitiveValue()) |
return false; |
@@ -649,7 +649,7 @@ PassRefPtrWillBeRawPtr<EditingStyle> EditingStyle::extractAndRemoveTextDirection |
{ |
RefPtrWillBeRawPtr<EditingStyle> textDirection = EditingStyle::create(); |
textDirection->m_mutableStyle = MutableStylePropertySet::create(HTMLQuirksMode); |
- textDirection->m_mutableStyle->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed, m_mutableStyle->propertyIsImportant(CSSPropertyUnicodeBidi)); |
+ textDirection->m_mutableStyle->setProperty(CSSPropertyUnicodeBidi, CSSValueIsolate, m_mutableStyle->propertyIsImportant(CSSPropertyUnicodeBidi)); |
textDirection->m_mutableStyle->setProperty(CSSPropertyDirection, m_mutableStyle->getPropertyValue(CSSPropertyDirection), |
m_mutableStyle->propertyIsImportant(CSSPropertyDirection)); |
@@ -1375,8 +1375,10 @@ WritingDirection EditingStyle::textDirectionForSelection(const VisibleSelection& |
continue; |
CSSValueID unicodeBidiValue = toCSSPrimitiveValue(unicodeBidi.get())->getValueID(); |
- if (unicodeBidiValue == CSSValueEmbed || unicodeBidiValue == CSSValueBidiOverride) |
+ if (unicodeBidiValue != CSSValueNormal && unicodeBidiValue != CSSValueInitial |
leviw_travelin_and_unemployed
2015/12/02 18:25:38
Nit: I can understand why you did it like this, bu
|
+ && unicodeBidiValue != CSSValueInherit && unicodeBidiValue != CSSValueUnset) { |
return NaturalWritingDirection; |
+ } |
} |
} |
@@ -1411,7 +1413,7 @@ WritingDirection EditingStyle::textDirectionForSelection(const VisibleSelection& |
if (unicodeBidiValue == CSSValueBidiOverride) |
return NaturalWritingDirection; |
- ASSERT(unicodeBidiValue == CSSValueEmbed); |
+ ASSERT(isEmbedOrIsolate(unicodeBidiValue)); |
RefPtrWillBeRawPtr<CSSValue> direction = style->getPropertyCSSValue(CSSPropertyDirection); |
if (!direction || !direction->isPrimitiveValue()) |
continue; |