Index: Source/core/css/CSSValue.h |
diff --git a/Source/core/css/CSSValue.h b/Source/core/css/CSSValue.h |
index 8fac4cdab47d162ed6d9ca8c4d733e8de88abe3c..797ad4f5b7ffa7fd91df9316c3b038477b0aad42 100644 |
--- a/Source/core/css/CSSValue.h |
+++ b/Source/core/css/CSSValue.h |
@@ -224,15 +224,15 @@ |
}; |
template<typename CSSValueType, size_t inlineCapacity> |
-inline bool compareCSSValueVector(const WillBeHeapVector<RefPtrWillBeMember<CSSValueType>, inlineCapacity>& firstVector, const WillBeHeapVector<RefPtrWillBeMember<CSSValueType>, inlineCapacity>& secondVector) |
+inline bool compareCSSValueVector(const Vector<RefPtr<CSSValueType>, inlineCapacity>& firstVector, const Vector<RefPtr<CSSValueType>, inlineCapacity>& secondVector) |
{ |
size_t size = firstVector.size(); |
if (size != secondVector.size()) |
return false; |
for (size_t i = 0; i < size; i++) { |
- const RefPtrWillBeMember<CSSValueType>& firstPtr = firstVector[i]; |
- const RefPtrWillBeMember<CSSValueType>& secondPtr = secondVector[i]; |
+ const RefPtr<CSSValueType>& firstPtr = firstVector[i]; |
+ const RefPtr<CSSValueType>& secondPtr = secondVector[i]; |
if (firstPtr == secondPtr || (firstPtr && secondPtr && firstPtr->equals(*secondPtr))) |
continue; |
return false; |
@@ -240,6 +240,25 @@ |
return true; |
} |
+// FIXME: oilpan: this will be merged with the above compareCSSVector method |
+// once CSSValue is moved to the transition types. |
+template<typename CSSValueType, size_t inlineCapacity> |
+inline bool compareCSSValueVector(const HeapVector<Member<CSSValueType>, inlineCapacity>& firstVector, const HeapVector<Member<CSSValueType>, inlineCapacity>& secondVector) |
+{ |
+ size_t size = firstVector.size(); |
+ if (size != secondVector.size()) |
+ return false; |
+ |
+ for (size_t i = 0; i < size; i++) { |
+ const Member<CSSValueType>& firstPtr = firstVector[i]; |
+ const Member<CSSValueType>& secondPtr = secondVector[i]; |
+ if (firstPtr == secondPtr || (firstPtr && secondPtr && firstPtr->equals(*secondPtr))) |
+ continue; |
+ return false; |
+ } |
+ return true; |
+} |
+ |
template<typename CSSValueType> |
inline bool compareCSSValuePtr(const RefPtr<CSSValueType>& first, const RefPtr<CSSValueType>& second) |
{ |