| Index: third_party/WebKit/Source/core/css/StylePropertySet.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/StylePropertySet.cpp b/third_party/WebKit/Source/core/css/StylePropertySet.cpp
|
| index 5e990e3e9b26a7d02d0ccf193e3bf708eec90fa5..46d1ae5ad39aea0e593198408f964b0d63e3bb44 100644
|
| --- a/third_party/WebKit/Source/core/css/StylePropertySet.cpp
|
| +++ b/third_party/WebKit/Source/core/css/StylePropertySet.cpp
|
| @@ -136,9 +136,9 @@ int ImmutableStylePropertySet::findPropertyIndex(T property) const {
|
|
|
| return -1;
|
| }
|
| -template CORE_EXPORT int ImmutableStylePropertySet::findPropertyIndex(
|
| +template CORE_EXPORT int ImmutableStylePropertySet::FindPropertyIndex(
|
| CSSPropertyID) const;
|
| -template CORE_EXPORT int ImmutableStylePropertySet::findPropertyIndex(
|
| +template CORE_EXPORT int ImmutableStylePropertySet::FindPropertyIndex(
|
| AtomicString) const;
|
|
|
| DEFINE_TRACE_AFTER_DISPATCH(ImmutableStylePropertySet) {
|
| @@ -178,9 +178,9 @@ String StylePropertySet::getPropertyValue(T property) const {
|
| return serializeShorthand(*this, property);
|
| }
|
| template CORE_EXPORT String
|
| - StylePropertySet::getPropertyValue<CSSPropertyID>(CSSPropertyID) const;
|
| + StylePropertySet::GetPropertyValue<CSSPropertyID>(CSSPropertyID) const;
|
| template CORE_EXPORT String
|
| - StylePropertySet::getPropertyValue<AtomicString>(AtomicString) const;
|
| + StylePropertySet::GetPropertyValue<AtomicString>(AtomicString) const;
|
|
|
| template <typename T>
|
| const CSSValue* StylePropertySet::getPropertyCSSValue(T property) const {
|
| @@ -190,9 +190,9 @@ const CSSValue* StylePropertySet::getPropertyCSSValue(T property) const {
|
| return &propertyAt(foundPropertyIndex).value();
|
| }
|
| template CORE_EXPORT const CSSValue*
|
| - StylePropertySet::getPropertyCSSValue<CSSPropertyID>(CSSPropertyID) const;
|
| + StylePropertySet::GetPropertyCSSValue<CSSPropertyID>(CSSPropertyID) const;
|
| template CORE_EXPORT const CSSValue*
|
| - StylePropertySet::getPropertyCSSValue<AtomicString>(AtomicString) const;
|
| + StylePropertySet::GetPropertyCSSValue<AtomicString>(AtomicString) const;
|
|
|
| DEFINE_TRACE(StylePropertySet) {
|
| if (m_isMutable)
|
| @@ -247,9 +247,9 @@ bool MutableStylePropertySet::removeProperty(T property, String* returnText) {
|
| int foundPropertyIndex = findPropertyIndex(property);
|
| return removePropertyAtIndex(foundPropertyIndex, returnText);
|
| }
|
| -template CORE_EXPORT bool MutableStylePropertySet::removeProperty(CSSPropertyID,
|
| +template CORE_EXPORT bool MutableStylePropertySet::RemoveProperty(CSSPropertyID,
|
| String*);
|
| -template CORE_EXPORT bool MutableStylePropertySet::removeProperty(AtomicString,
|
| +template CORE_EXPORT bool MutableStylePropertySet::RemoveProperty(AtomicString,
|
| String*);
|
|
|
| template <typename T>
|
| @@ -259,9 +259,9 @@ bool StylePropertySet::propertyIsImportant(T property) const {
|
| return propertyAt(foundPropertyIndex).isImportant();
|
| return shorthandIsImportant(property);
|
| }
|
| -template bool StylePropertySet::propertyIsImportant<CSSPropertyID>(
|
| +template bool StylePropertySet::PropertyIsImportant<CSSPropertyID>(
|
| CSSPropertyID) const;
|
| -template bool StylePropertySet::propertyIsImportant<AtomicString>(
|
| +template bool StylePropertySet::PropertyIsImportant<AtomicString>(
|
| AtomicString) const;
|
|
|
| bool StylePropertySet::shorthandIsImportant(CSSPropertyID propertyID) const {
|
| @@ -574,9 +574,9 @@ int MutableStylePropertySet::findPropertyIndex(T property) const {
|
|
|
| return (it == end) ? -1 : it - begin;
|
| }
|
| -template CORE_EXPORT int MutableStylePropertySet::findPropertyIndex(
|
| +template CORE_EXPORT int MutableStylePropertySet::FindPropertyIndex(
|
| CSSPropertyID) const;
|
| -template CORE_EXPORT int MutableStylePropertySet::findPropertyIndex(
|
| +template CORE_EXPORT int MutableStylePropertySet::FindPropertyIndex(
|
| AtomicString) const;
|
|
|
| DEFINE_TRACE_AFTER_DISPATCH(MutableStylePropertySet) {
|
|
|