| 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 0b43cbfa08fc31bbd414ee982f1b45d32536d89e..42b35e02f07be1d09fa1331a306ad49e91df8252 100644
|
| --- a/third_party/WebKit/Source/core/editing/EditingStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/EditingStyle.cpp
|
| @@ -854,11 +854,11 @@ bool EditingStyle::conflictsWithInlineStyleOfElement(
|
| inlineStyle->getPropertyCSSValue(textDecorationPropertyForEditing())) {
|
| if (!conflictingProperties)
|
| return true;
|
| - conflictingProperties->append(CSSPropertyTextDecoration);
|
| + conflictingProperties->push_back(CSSPropertyTextDecoration);
|
| // Because text-decoration expands to text-decoration-line when CSS3
|
| // Text Decoration is enabled, we also state it as conflicting.
|
| if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
|
| - conflictingProperties->append(CSSPropertyTextDecorationLine);
|
| + conflictingProperties->push_back(CSSPropertyTextDecorationLine);
|
| if (extractedStyle)
|
| extractedStyle->setProperty(
|
| textDecorationPropertyForEditing(),
|
| @@ -875,7 +875,7 @@ bool EditingStyle::conflictsWithInlineStyleOfElement(
|
| inlineStyle->getPropertyCSSValue(CSSPropertyDirection)) {
|
| if (!conflictingProperties)
|
| return true;
|
| - conflictingProperties->append(CSSPropertyDirection);
|
| + conflictingProperties->push_back(CSSPropertyDirection);
|
| if (extractedStyle)
|
| extractedStyle->setProperty(
|
| propertyID, inlineStyle->getPropertyValue(propertyID),
|
| @@ -885,7 +885,7 @@ bool EditingStyle::conflictsWithInlineStyleOfElement(
|
| if (!conflictingProperties)
|
| return true;
|
|
|
| - conflictingProperties->append(propertyID);
|
| + conflictingProperties->push_back(propertyID);
|
|
|
| if (extractedStyle)
|
| extractedStyle->setProperty(propertyID,
|
| @@ -902,24 +902,24 @@ htmlElementEquivalents() {
|
| HTMLElementEquivalents,
|
| (new HeapVector<Member<HTMLElementEquivalent>>));
|
| if (!HTMLElementEquivalents.size()) {
|
| - HTMLElementEquivalents.append(HTMLElementEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLElementEquivalent::create(
|
| CSSPropertyFontWeight, CSSValueBold, HTMLNames::bTag));
|
| - HTMLElementEquivalents.append(HTMLElementEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLElementEquivalent::create(
|
| CSSPropertyFontWeight, CSSValueBold, HTMLNames::strongTag));
|
| - HTMLElementEquivalents.append(HTMLElementEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLElementEquivalent::create(
|
| CSSPropertyVerticalAlign, CSSValueSub, HTMLNames::subTag));
|
| - HTMLElementEquivalents.append(HTMLElementEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLElementEquivalent::create(
|
| CSSPropertyVerticalAlign, CSSValueSuper, HTMLNames::supTag));
|
| - HTMLElementEquivalents.append(HTMLElementEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLElementEquivalent::create(
|
| CSSPropertyFontStyle, CSSValueItalic, HTMLNames::iTag));
|
| - HTMLElementEquivalents.append(HTMLElementEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLElementEquivalent::create(
|
| CSSPropertyFontStyle, CSSValueItalic, HTMLNames::emTag));
|
|
|
| - HTMLElementEquivalents.append(HTMLTextDecorationEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLTextDecorationEquivalent::create(
|
| CSSValueUnderline, HTMLNames::uTag));
|
| - HTMLElementEquivalents.append(HTMLTextDecorationEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLTextDecorationEquivalent::create(
|
| CSSValueLineThrough, HTMLNames::sTag));
|
| - HTMLElementEquivalents.append(HTMLTextDecorationEquivalent::create(
|
| + HTMLElementEquivalents.push_back(HTMLTextDecorationEquivalent::create(
|
| CSSValueLineThrough, HTMLNames::strikeTag));
|
| }
|
|
|
| @@ -958,15 +958,15 @@ htmlAttributeEquivalents() {
|
| // elementIsStyledSpanOrHTMLEquivalent depends on the fact each
|
| // HTMLAttriuteEquivalent matches exactly one attribute of exactly one
|
| // element except dirAttr.
|
| - HTMLAttributeEquivalents.append(HTMLAttributeEquivalent::create(
|
| + HTMLAttributeEquivalents.push_back(HTMLAttributeEquivalent::create(
|
| CSSPropertyColor, HTMLNames::fontTag, HTMLNames::colorAttr));
|
| - HTMLAttributeEquivalents.append(HTMLAttributeEquivalent::create(
|
| + HTMLAttributeEquivalents.push_back(HTMLAttributeEquivalent::create(
|
| CSSPropertyFontFamily, HTMLNames::fontTag, HTMLNames::faceAttr));
|
| - HTMLAttributeEquivalents.append(HTMLFontSizeEquivalent::create());
|
| + HTMLAttributeEquivalents.push_back(HTMLFontSizeEquivalent::create());
|
|
|
| - HTMLAttributeEquivalents.append(HTMLAttributeEquivalent::create(
|
| + HTMLAttributeEquivalents.push_back(HTMLAttributeEquivalent::create(
|
| CSSPropertyDirection, HTMLNames::dirAttr));
|
| - HTMLAttributeEquivalents.append(HTMLAttributeEquivalent::create(
|
| + HTMLAttributeEquivalents.push_back(HTMLAttributeEquivalent::create(
|
| CSSPropertyUnicodeBidi, HTMLNames::dirAttr));
|
| }
|
|
|
| @@ -1025,7 +1025,7 @@ bool EditingStyle::extractConflictingImplicitStyleOfAttributes(
|
|
|
| if (extractedStyle)
|
| equivalent->addToStyle(element, extractedStyle);
|
| - conflictingAttributes.append(equivalent->attributeName());
|
| + conflictingAttributes.push_back(equivalent->attributeName());
|
| removed = true;
|
| }
|
|
|
|
|