Index: Source/core/editing/EditingStyle.cpp |
diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp |
index 50e98347c5d2b4934a1b350f3c88a31c9586f998..bb449d4c709e6a1eee51ad484916d825a67cff5b 100644 |
--- a/Source/core/editing/EditingStyle.cpp |
+++ b/Source/core/editing/EditingStyle.cpp |
@@ -157,7 +157,7 @@ class HTMLElementEquivalent : public NoBaseWillBeGarbageCollected<HTMLElementEqu |
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(HTMLElementEquivalent); |
public: |
- static PassOwnPtrWillBeRawPtr<HTMLElementEquivalent> create(CSSPropertyID propertyID, CSSValueID primitiveValue, const QualifiedName& tagName) |
+ static PassOwnPtrWillBeRawPtr<HTMLElementEquivalent> create(CSSPropertyID propertyID, CSSValueID primitiveValue, const HTMLQualifiedName& tagName) |
{ |
return adoptPtrWillBeNoop(new HTMLElementEquivalent(propertyID, primitiveValue, tagName)); |
} |
@@ -172,11 +172,11 @@ public: |
protected: |
HTMLElementEquivalent(CSSPropertyID); |
- HTMLElementEquivalent(CSSPropertyID, const QualifiedName& tagName); |
- HTMLElementEquivalent(CSSPropertyID, CSSValueID primitiveValue, const QualifiedName& tagName); |
+ HTMLElementEquivalent(CSSPropertyID, const HTMLQualifiedName& tagName); |
+ HTMLElementEquivalent(CSSPropertyID, CSSValueID primitiveValue, const HTMLQualifiedName& tagName); |
const CSSPropertyID m_propertyID; |
const RefPtrWillBeMember<CSSPrimitiveValue> m_primitiveValue; |
- const QualifiedName* m_tagName; // We can store a pointer because HTML tag names are const global. |
+ const HTMLQualifiedName* m_tagName; // We can store a pointer because HTML tag names are const global. |
}; |
DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(HTMLElementEquivalent); |
@@ -187,13 +187,13 @@ HTMLElementEquivalent::HTMLElementEquivalent(CSSPropertyID id) |
{ |
} |
-HTMLElementEquivalent::HTMLElementEquivalent(CSSPropertyID id, const QualifiedName& tagName) |
+HTMLElementEquivalent::HTMLElementEquivalent(CSSPropertyID id, const HTMLQualifiedName& tagName) |
: m_propertyID(id) |
, m_tagName(&tagName) |
{ |
} |
-HTMLElementEquivalent::HTMLElementEquivalent(CSSPropertyID id, CSSValueID primitiveValue, const QualifiedName& tagName) |
+HTMLElementEquivalent::HTMLElementEquivalent(CSSPropertyID id, CSSValueID primitiveValue, const HTMLQualifiedName& tagName) |
: m_propertyID(id) |
, m_primitiveValue(CSSPrimitiveValue::createIdentifier(primitiveValue)) |
, m_tagName(&tagName) |
@@ -214,7 +214,7 @@ void HTMLElementEquivalent::addToStyle(Element*, EditingStyle* style) const |
class HTMLTextDecorationEquivalent FINAL : public HTMLElementEquivalent { |
public: |
- static PassOwnPtrWillBeRawPtr<HTMLElementEquivalent> create(CSSValueID primitiveValue, const QualifiedName& tagName) |
+ static PassOwnPtrWillBeRawPtr<HTMLElementEquivalent> create(CSSValueID primitiveValue, const HTMLQualifiedName& tagName) |
{ |
return adoptPtrWillBeNoop(new HTMLTextDecorationEquivalent(primitiveValue, tagName)); |
} |
@@ -224,10 +224,10 @@ public: |
virtual void trace(Visitor* visitor) OVERRIDE { HTMLElementEquivalent::trace(visitor); } |
private: |
- HTMLTextDecorationEquivalent(CSSValueID primitiveValue, const QualifiedName& tagName); |
+ HTMLTextDecorationEquivalent(CSSValueID primitiveValue, const HTMLQualifiedName& tagName); |
}; |
-HTMLTextDecorationEquivalent::HTMLTextDecorationEquivalent(CSSValueID primitiveValue, const QualifiedName& tagName) |
+HTMLTextDecorationEquivalent::HTMLTextDecorationEquivalent(CSSValueID primitiveValue, const HTMLQualifiedName& tagName) |
: HTMLElementEquivalent(textDecorationPropertyForEditing(), primitiveValue, tagName) |
// m_propertyID is used in HTMLElementEquivalent::addToStyle |
{ |
@@ -249,7 +249,7 @@ bool HTMLTextDecorationEquivalent::valueIsPresentInStyle(Element* element, Style |
class HTMLAttributeEquivalent : public HTMLElementEquivalent { |
public: |
- static PassOwnPtrWillBeRawPtr<HTMLAttributeEquivalent> create(CSSPropertyID propertyID, const QualifiedName& tagName, const QualifiedName& attrName) |
+ static PassOwnPtrWillBeRawPtr<HTMLAttributeEquivalent> create(CSSPropertyID propertyID, const HTMLQualifiedName& tagName, const QualifiedName& attrName) |
{ |
return adoptPtrWillBeNoop(new HTMLAttributeEquivalent(propertyID, tagName, attrName)); |
} |
@@ -268,12 +268,12 @@ public: |
virtual void trace(Visitor* visitor) OVERRIDE { HTMLElementEquivalent::trace(visitor); } |
protected: |
- HTMLAttributeEquivalent(CSSPropertyID, const QualifiedName& tagName, const QualifiedName& attrName); |
+ HTMLAttributeEquivalent(CSSPropertyID, const HTMLQualifiedName& tagName, const QualifiedName& attrName); |
HTMLAttributeEquivalent(CSSPropertyID, const QualifiedName& attrName); |
const QualifiedName& m_attrName; // We can store a reference because HTML attribute names are const global. |
}; |
-HTMLAttributeEquivalent::HTMLAttributeEquivalent(CSSPropertyID id, const QualifiedName& tagName, const QualifiedName& attrName) |
+HTMLAttributeEquivalent::HTMLAttributeEquivalent(CSSPropertyID id, const HTMLQualifiedName& tagName, const QualifiedName& attrName) |
: HTMLElementEquivalent(id, tagName) |
, m_attrName(attrName) |
{ |